Simplify docker hub login

OctopusDeployLabs · Sep 27, 2023 · 3e606e9 · 3e606e9
1 parent 08f80aa
commit 3e606e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/octo.yml b/.github/workflows/octo.yml
@@ -86,8 +86,8 @@ jobs:
         env:
           USERNAME: ${{ secrets.DOCKER_HUB_USER }}
           PASSWORD: ${{ secrets.DOCKER_HUB_PAT }}
-        run: |
-             docker login --username $USERNAME --password "$PASSWORD"
+        run: docker login --username $USERNAME --password "$PASSWORD"
+        if: ${{ needs.get-octo-cli-version.outputs.CONTINUE == 'Yes' }}             
 
       - name: Build the alpine docker image
         env: 
@@ -113,7 +113,8 @@ jobs:
           USERNAME: ${{ secrets.DOCKER_HUB_USER }}
           PASSWORD: ${{ secrets.DOCKER_HUB_PAT }}
         run: docker login --username $USERNAME --password "$PASSWORD"
-
+        if: ${{ needs.get-octo-cli-version.outputs.CONTINUE == 'Yes' }}
+
       - name: Build manifests
         env:
           VERSION_NUMBER: ${{ needs.get-octo-cli-version.outputs.VERSION }}

diff --git a/.github/workflows/octopus-cli.yml b/.github/workflows/octopus-cli.yml
@@ -84,8 +84,8 @@ jobs:
         env:
           USERNAME: ${{ secrets.DOCKER_HUB_USER }}
           PASSWORD: ${{ secrets.DOCKER_HUB_PAT }}
-        run: |
-             docker login --username $USERNAME --password "$PASSWORD"
+        run: docker login --username $USERNAME --password "$PASSWORD"
+        if: ${{ needs.get-octopus-cli-version.outputs.CONTINUE == 'Yes' }}
 
       # Build ubuntu images
       - name: Build the alpine docker image
@@ -112,6 +112,7 @@ jobs:
           USERNAME: ${{ secrets.DOCKER_HUB_USER }}
           PASSWORD: ${{ secrets.DOCKER_HUB_PAT }}
         run: docker login --username $USERNAME --password "$PASSWORD"
+        if: ${{ needs.get-octopus-cli-version.outputs.CONTINUE == 'Yes' }}
 
       - name: Build manifests
         env: