MAN-227 - update build

ministryofjustice · Dec 20, 2024 · 4aa68e4 · 4aa68e4
1 parent 488a5fe
commit 4aa68e4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/actions/build_multiplatform_docker/action.yml b/.github/actions/build_multiplatform_docker/action.yml
@@ -27,7 +27,9 @@ inputs:
   HMPPS_QUAYIO_TOKEN:
     description: Docker registry token
     required: false
-
+  SENTRY_AUTH_TOKEN:
+    description: Docker registry token
+    required: true
 
 runs:
   using: "composite"
@@ -65,7 +67,7 @@ runs:
 
     - name: Build Docker images
       env:
-        SENTRY_AUTH_TOKEN: ${{ inputs.additional_docker_tag }}
+        SENTRY_AUTH_TOKEN: ${{ inputs.SENTRY_AUTH_TOKEN }}
       uses: docker/build-push-action@v6
       with:
         cache-from: type=gha

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -24,6 +24,14 @@ on:
         required: true
         type: boolean
 
+    secrets:
+      HMPPS_QUAYIO_USER:
+        required: false
+      HMPPS_QUAYIO_TOKEN:
+        required: false
+      SENTRY_AUTH_TOKEN:
+        required: true
+
     outputs:
       app_version:
         description: The version of the app as generated by create_app_version
@@ -41,13 +49,6 @@ jobs:
       version: ${{ steps.app_version.outputs.version }}
       token: ${{ steps.sentry_auth.outputs.token }}
     steps:
-      - id: sentry_auth
-        name: output token
-        shell: bash
-        run: |
-          echo "token=$SENTRY_AUTH_TOKEN" >> $GITHUB_OUTPUT
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - uses: actions/checkout@v4
       - id: app_version
         name: Application version creators