fix(*): add secrets from workflows to action (#22)

* fix(*): add secrets from workflows to action * feat(action.yml): remove workflow on and format identation
ministryofjustice · Jan 16, 2025 · 2db42db · 2db42db
1 parent 48ba538
commit 2db42db
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 37 deletions.
diff --git a/.github/actions/build_multiplatform_docker/action.yml b/.github/actions/build_multiplatform_docker/action.yml
@@ -1,37 +1,37 @@
 name: Build and push multi-platform docker image to registry
 description: action to build and push a multi-platform docker image
 
-on:
-  workflow_call:
-    inputs:
-      repository_name:
-        description: Repository name
-        required: true
-      docker_registry:
-        description: Docker registry
-        required: true
-      registry_org:
-        description: Docker registry organisation
-        required: true
-      additional_docker_tag:
-        description: Additional docker tag that can be used to specify stable tags
-        required: false
-      additional_docker_build_args:
-        description: Additional docker build args
-        required: false
-      push:
-        description: Push docker image to registry flag
-        required: true
-      app_version:
-        description: App version
-        required: true
-      HMPPS_QUAYIO_USER:
-        description: Docker registry username
-        required: false
-      HMPPS_QUAYIO_TOKEN:
-        description: Docker registry token
-        required: false
-
+inputs:
+  repository_name:
+    description: Repository name
+    required: true
+  docker_registry:
+    description: Docker registry
+    required: true
+  registry_org:
+    description: Docker registry organisation
+    required: true
+  additional_docker_tag:
+    description: Additional docker tag that can be used to specify stable tags
+    required: false
+  additional_docker_build_args:
+    description: Additional docker build args
+    required: false
+  push:
+    description: Push docker image to registry flag
+    required: true
+  app_version:
+    description: App version
+    required: true
+  HMPPS_QUAYIO_USER:
+    description: Docker registry username
+    required: false
+  HMPPS_QUAYIO_TOKEN:
+    description: Docker registry token
+    required: false
+  certificate:
+    description: secret certificate
+    required: true
 
 runs:
   using: "composite"
@@ -65,6 +65,11 @@ runs:
       # - name: Login to Amazon ECR
       #   if: ${{ inputs.docker_registry  == 'ecr' }}
       #   uses: aws-actions/amazon-ecr-login@v1
+    - name: Write Certificate file
+      shell: bash
+      run: |
+        echo "Decoding the Certificate"
+        echo "${{ inputs.CERTIFICATE }}" | base64 --decode > WebServiceClientCert.pfx
     - name: Build Docker images
       uses: docker/build-push-action@v6
       with:

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -81,11 +81,6 @@ jobs:
           # git_branch_ref: ${{ github.ref_name }}
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Write Certificate file
-        shell: bash
-        run: |
-          echo "Decoding the Certificate"
-          echo "${{ secrets.CERTIFICATE }}" | base64 --decode > WebServiceClientCert.pfx
       - uses: ./.github/actions/build_multiplatform_docker # WORKFLOW_VERSION
         if: ${{ ( inputs.docker_registry  == 'ghcr.io' ) && ( inputs.docker_multiplatform )}}
         with:
@@ -96,6 +91,7 @@ jobs:
           push: ${{ inputs.push }}
           app_version: ${{ steps.app_version.outputs.version }}
           additional_docker_build_args: ${{ inputs.additional_docker_build_args }}
+          certificate: ${{ secrets.CERTIICATE }}
       - uses: ./.github/actions/build_multiplatform_docker # WORKFLOW_VERSION
         if: ${{ ( inputs.docker_registry  == 'quay.io' ) && ( inputs.docker_multiplatform )}}
         with:
@@ -107,4 +103,5 @@ jobs:
           app_version: ${{ steps.app_version.outputs.version }}
           additional_docker_build_args: ${{ inputs.additional_docker_build_args }}
           HMPPS_QUAYIO_USER: ${{ secrets.HMPPS_QUAYIO_USER }}
-          HMPPS_QUAYIO_TOKEN: ${{ secrets.HMPPS_QUAYIO_TOKEN}}
+          HMPPS_QUAYIO_TOKEN: ${{ secrets.HMPPS_QUAYIO_TOKEN}}
+          certificate: ${{ secrets.CERTIICATE }}