docker login before

replicatedhq · Nov 27, 2023 · 222dc63 · 222dc63
1 parent b24a7f0
commit 222dc63
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/.github/actions/build-push-kotsadm-image/action.yml b/.github/actions/build-push-kotsadm-image/action.yml
@@ -9,6 +9,16 @@ inputs:
     description: 'Git tag'
     required: true
 
+  registry-username:
+    description: 'Username to login to registry'
+    default: ''
+    required: false
+
+  registry-password:
+    description: 'Password to login to registry'
+    default: ''
+    required: false
+
 runs:
   using: "composite"
   steps:
@@ -36,3 +46,5 @@ runs:
         archs: x86_64
         tag: ${{ inputs.image-name }}
         vcs-url: true
+        generic-user: ${{ inputs.registry-username }}
+        generic-pass: ${{ inputs.registry-password }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -186,16 +186,18 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - uses: ./.github/actions/build-push-kotsadm-image
-      with:
-        image-name: kotsadm/kotsadm:${{ needs.generate-tag.outputs.tag }}
-        git-tag: ${{ needs.generate-tag.outputs.tag }}
     - uses: azure/docker-login@v1
       env:
         DOCKER_CONFIG: ./.docker
       with:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
+    - uses: ./.github/actions/build-push-kotsadm-image
+      with:
+        image-name: kotsadm/kotsadm:${{ needs.generate-tag.outputs.tag }}
+        git-tag: ${{ needs.generate-tag.outputs.tag }}
+        # registry-username: ${{ secrets.DOCKERHUB_USER }}
+        # registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
     - name: Build tagged release
       env:
         GIT_TAG: ${{ needs.generate-tag.outputs.tag }}