diff --git a/.github/actions/build-push-kotsadm-image/action.yml b/.github/actions/build-push-kotsadm-image/action.yml index a71419fe21..df0696675a 100644 --- 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 index 0ec2ecb0e0..c07ab8d43b 100644 --- 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 }}