Ensure that az-login has been run before docker login and push (#4025)

Azure · May 21, 2024 · 9071bdd · 9071bdd
1 parent c61dfd3
commit 9071bdd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/.github/workflows/create-release-experimental.yml b/.github/workflows/create-release-experimental.yml
@@ -92,16 +92,10 @@ jobs:
             `mcr.microsoft.com/k8s/azureserviceoperator:experimental`, which is always being updated. Test what you want to test and then uninstall the operator. 
             Running the operator for long periods of time on the `experimental` tag is not supported and will likely cause problems eventually.
 
-      - name: Docker login
-        run: |
-          container_id=${{env.container_id}}
-          docker exec -e DOCKER_REGISTRY "$container_id" task VERSION=${{ env.ARTIFACT_VERSION }} LATEST_VERSION_TAG=${{ env.ARTIFACT_VERSION }} docker-login
-        env:
-          DOCKER_REGISTRY: ${{ secrets.REGISTRY_LOGIN }}
-
       - name: Build, tag and push docker image
         run: |
           container_id=${{env.container_id}}
-          docker exec -e DOCKER_PUSH_TARGET "$container_id" task VERSION=${{ env.ARTIFACT_VERSION }} LATEST_VERSION_TAG=${{ env.ARTIFACT_VERSION }} controller:docker-push-multiarch
+          docker exec -e GITHUB_ACTIONS -e DOCKER_REGISTRY -e DOCKER_PUSH_TARGET "$container_id" task VERSION=${{ env.ARTIFACT_VERSION }} LATEST_VERSION_TAG=${{ env.ARTIFACT_VERSION }} controller:docker-push-multiarch
         env:
           DOCKER_PUSH_TARGET: ${{ secrets.REGISTRY_PUBLIC }}
+          DOCKER_REGISTRY: ${{ secrets.REGISTRY_LOGIN }}
diff --git a/.github/workflows/create-release-official.yml b/.github/workflows/create-release-official.yml
@@ -49,19 +49,13 @@ jobs:
           file: "v2/out/release/*"
           file_glob: true
 
-      - name: Docker login
-        run: |
-          container_id=${{env.container_id}}
-          docker exec -e DOCKER_REGISTRY "$container_id" task docker-login
-        env:
-          DOCKER_REGISTRY: ${{ secrets.REGISTRY_LOGIN }}
-
       - name: Build, tag and push docker image
         run: |
           container_id=${{env.container_id}}
-          docker exec -e DOCKER_PUSH_TARGET "$container_id" task controller:docker-push-multiarch
+          docker exec -e GITHUB_ACTIONS -e DOCKER_REGISTRY -e DOCKER_PUSH_TARGET "$container_id" task controller:docker-push-multiarch
         env:
           DOCKER_PUSH_TARGET: ${{ secrets.REGISTRY_PUBLIC }}
+          DOCKER_REGISTRY: ${{ secrets.REGISTRY_LOGIN }}
 
       - name: Protect image
         run: |

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -439,6 +439,7 @@ tasks:
     desc: Builds, tags and pushes the multi architecture controller container image to repository
     deps:
       - controller:bundle-crds
+      - docker-login
     dir: "{{.CONTROLLER_ROOT}}"
     run: always
     cmds:
@@ -1157,6 +1158,8 @@ tasks:
 
   docker-login:
     desc: Docker login
+    deps:
+      - az-login
     cmds:
       - 'if [ -z "{{.DOCKER_REGISTRY}}" ]; then echo "Error: DOCKER_REGISTRY must be set"; exit 1; fi'
       - az acr login --name {{.DOCKER_REGISTRY}}