Update docker_build.yml

dockerstuff · Oct 31, 2023 · 6b09647 · 6b09647
1 parent 6e29ebc
commit 6b09647
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -58,12 +58,6 @@ jobs:
         name: Checkout
         uses: actions/checkout@v4
 
-      # - # Add ISIS_OUTPUT_TAG var to env
-      #   name: Workaround to define base-image for ASP
-      #   run: |
-      #     ISIS_OUTPUT_TAG=$(echo "${DOCKER_METADATA_OUTPUT_TAGS}" | head -n1 | cut -d" " -f1)
-      #     echo "ISIS_OUTPUT_TAG=${ISIS_OUTPUT_TAG}" >> "$GITHUB_ENV"
-
       - name: Build image
         run: |
           docker compose -f compose.build.yml build jupyter-gispy
@@ -74,7 +68,7 @@ jobs:
       - name: Tag image
         if: ${{ github.event_name == 'push' }}
         env:
-          USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
         run: |
           NEW_IMAGE=`docker compose -f compose.build.yml config --images jupyter-gispy`
           docker tag $NEW_IMAGE ${USERNAME}/jupyter-gispy:$GITHUB_REF_NAME
@@ -93,8 +87,9 @@ jobs:
 
       - name: Push image
         env:
-          USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
         run: >
           docker image ls
-          | sort "${USERNAME}/jupyter-gispy"
+          | tail -n+2 | awk '{print $1":"$2}' 
+          | grep "${USERNAME}/jupyter-gispy"
           | xargs -I'{}' docker push {}