fix docker publish (pyth-network -> pythfoundation); cleanup workflow

Author: tony-ricciardi

.github/workflows/docker.yaml

@@ -7,7 +7,12 @@ on:
 
 env:
   SOLANA_VERSION: 1.7.12
-  DOCKER_SERVER: docker.io
+  DOCKER_HUB: docker.io
+  DOCKER_USER: ${{ secrets.DOCKER_IO_USER }}
+  IS_RELEASE: ${{
+    startsWith( github.ref, 'refs/tags/devnet-' ) ||
+    startsWith( github.ref, 'refs/tags/testnet-' ) ||
+    startsWith( github.ref, 'refs/tags/mainnet-' ) }}
 
 jobs:
   build:
@@ -19,41 +24,27 @@ jobs:
       - name: Initialize Environment
         run: |
           set -eux
-          DOCKER_IMAGE="${GITHUB_REPOSITORY}:${GITHUB_REF##*/}"
-          echo "DOCKER_IMAGE=${DOCKER_IMAGE}" >> "${GITHUB_ENV}"
+          REPO_NAME="$( basename "${GITHUB_REPOSITORY}" )"
+          REF_NAME="$( basename "${GITHUB_REF}" )"
+          echo "DOCKER_IMAGE=${REPO_NAME}:${REF_NAME}" >> "${GITHUB_ENV}"
 
       - name: Build Docker Image
         run: |
           set -eux
-
-          # GITHUB_WORKSPACE may be relative to "/".
-          cd /
-          cd "${GITHUB_WORKSPACE}"
-
           docker build \
             --file docker/Dockerfile \
-            --build-arg SOLANA_VERSION="${{ env.SOLANA_VERSION }}" \
-            --tag "${{ env.DOCKER_IMAGE }}" \
+            --build-arg SOLANA_VERSION="${SOLANA_VERSION}" \
+            --tag "${DOCKER_IMAGE}" \
             .
 
       - name: Publish Docker Image
+        if: env.IS_RELEASE == 'true'
         run: |
-          # Do not set -x before referencing secrets.
-          set -eu
-
-          echo "${{ secrets.DOCKER_IO_PASS }}" | docker login \
-            "${{ env.DOCKER_SERVER }}" \
-            -u "${{ secrets.DOCKER_IO_USER }}" \
-            --password-stdin
-
-          set -x
-          SRC="${{ env.DOCKER_IMAGE }}"
-          DST="${{ env.DOCKER_SERVER }}/${SRC}"
-          docker image tag "${SRC}" "${DST}"
-          docker image push "${DST}"
-
-        # Only publish if tagged as a release.
-        if: |
-          startsWith( github.ref, 'refs/tags/devnet-' )
-          || startsWith( github.ref, 'refs/tags/testnet-' )
-          || startsWith( github.ref, 'refs/tags/mainnet-' )
+          function publish() {
+            set -eux
+            PUB_IMAGE="${DOCKER_HUB}/${DOCKER_USER}/${DOCKER_IMAGE}"
+            docker login "${DOCKER_HUB}" -u "${DOCKER_USER}" --password-stdin
+            docker image tag "${DOCKER_IMAGE}" "${PUB_IMAGE}"
+            docker image push "${PUB_IMAGE}"
+          }
+          echo "${{ secrets.DOCKER_IO_PASS }}" | publish