diff --git a/.github/actions/build-test-and-deploy/build_multiplatform_docker/action.yml b/.github/actions/build-test-and-deploy/build_multiplatform_docker/action.yml index a1984c2..7ae88cd 100644 --- a/.github/actions/build-test-and-deploy/build_multiplatform_docker/action.yml +++ b/.github/actions/build-test-and-deploy/build_multiplatform_docker/action.yml @@ -25,6 +25,14 @@ inputs: description: App version required: true type: string + docker_registry_username: + description: Docker registry username + required: true + type: string + docker_registry_token: + description: Docker registry token + required: true + type: string # secrets: # HMPPS_QUAYIO_USER: @@ -51,8 +59,8 @@ runs: uses: docker/login-action@v2 with: registry: ${{ inputs.docker_registry }} - username: ${{ github.actor }} - password: ${{ github.token }} + username: ${{ inputs.docker_registry_user }} + password: ${{ inputs.docker_registry_token }} - name: Build Docker images uses: docker/build-push-action@v4 diff --git a/.github/workflows/build_multiplatform_docker.yml b/.github/workflows/build_multiplatform_docker.yml index 1b1886a..01f006b 100644 --- a/.github/workflows/build_multiplatform_docker.yml +++ b/.github/workflows/build_multiplatform_docker.yml @@ -56,6 +56,8 @@ jobs: additional_docker_tag: ${{ inputs.additional_docker_tag }} push: ${{ inputs.push }} app_version: ${{ needs.create_app_version.outputs.version }} + docker_registry_username: ${{ github.actor }} + docker_registry_token: ${{ github.token }} - uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@feat/HEAT-344-share-app-version-across-jobs @@ -68,5 +70,8 @@ jobs: additional_docker_tag: ${{ inputs.additional_docker_tag }} push: ${{ inputs.push }} app_version: ${{ needs.create_app_version.outputs.version }} + docker_registry_username: ${{ secrets.HMPPS_QUAYIO_USER }} + docker_registry_token: ${{ secrets.HMPPS_QUAYIO_TOKEN }} +