Merge 8e56088 into f0436ef

ministryofjustice · Jan 16, 2025 · 6ad37d5 · 6ad37d5
2 parents f0436ef + 8e56088
commit 6ad37d5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/detect_changes_to_app_job.yml b/.github/workflows/detect_changes_to_app_job.yml
@@ -4,7 +4,7 @@ on:
   workflow_call:
     outputs:
       changes_detected:
-        description: "Boolean value for changes detected in /cmd, /cypress, /internal, /web, /lang or /lambda"
+        description: "Boolean value for changes detected in /cmd, /cypress, /internal, /web, /lang /lambda docker/event-received docker/mlpa or docker/mock-pay"
         value: ${{ jobs.compare_changes.outputs.changes_detected }}
 
 jobs:
@@ -23,12 +23,12 @@ jobs:
           echo "Build status of ${{github.event.before}}: $BEFORE_STATUS"
           if [[ "$BEFORE_STATUS" == "success" ]]; then
             echo "Checking against ${{github.event.before}}"
-            (git diff --quiet ${{github.event.before}} ${{github.event.after}} -- cmd cypress internal lang web lambda docker/event-received docker/mlpa package.json yarn.lock go.mod && \
+            (git diff --quiet ${{github.event.before}} ${{github.event.after}} -- cmd cypress internal lang web lambda docker/event-received docker/mlpa docker/mock-pay package.json yarn.lock go.mod && \
             echo "changes=${{ false }}" || \
             echo "changes=${{ true }}") | tee -a "${GITHUB_OUTPUT}"
           else
             echo "Checking against origin/main"
-            (git diff --quiet HEAD origin/main -- cmd cypress internal lang web lambda docker/event-received docker/mlpa package.json yarn.lock go.mod && \
+            (git diff --quiet HEAD origin/main -- cmd cypress internal lang web lambda docker/event-received docker/mlpa docker/mock-pay package.json yarn.lock go.mod && \
             echo "changes=${{ false }}" || \
             echo "changes=${{ true }}") | tee -a "${GITHUB_OUTPUT}"
           fi
@@ -44,7 +44,7 @@ jobs:
     steps:
       - name: Previous build on this branch will be deployed
         run: |
-          echo '### No Changes Detected in /cmd, /cypress, /internal, /web, /lang or /lambda since the previous build!' >> $GITHUB_STEP_SUMMARY
+          echo '### No Changes Detected in /cmd, /cypress, /internal, /web, /lang /lambda docker/event-received docker/mlpa or docker/mock-pay since the previous build!' >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY # this is a blank line
           echo "The previous build will be deployed and the following jobs will be skipped" >> $GITHUB_STEP_SUMMARY
           echo "- Create Tags" >> $GITHUB_STEP_SUMMARY

diff --git a/cmd/trigger_build b/cmd/trigger_build
@@ -0,0 +1 @@
+trigger a build
diff --git a/docker/docker-compose.ci.yml b/docker/docker-compose.ci.yml
@@ -1,3 +1,9 @@
 services:
   app:
     image: ${ECR_REGISTRY}/modernising-lpa/app:${TAG}
+
+  mock-pay:
+    build:
+      context: ..
+      dockerfile: docker/mock-pay/Dockerfile
+    container_name: mock-pay
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -149,8 +149,8 @@ services:
       context: ..
       dockerfile: docker/mock-pay/Dockerfile
     container_name: mock-pay
-    volumes:
-      - ./mock-pay/:/opt/imposter/config/
+    # volumes:
+    #   - ./mock-pay/:/opt/imposter/config/
 
   mock-uid:
     image: outofcoffee/imposter:latest

diff --git a/docker/mock-pay/Dockerfile b/docker/mock-pay/Dockerfile
@@ -2,6 +2,8 @@ FROM outofcoffee/imposter:4.5.0
 
 COPY ./docker/mock-pay /opt/imposter/config/
 
+ADD https://raw.githubusercontent.com/alphagov/pay-publicapi/master/openapi/publicapi_spec.json /opt/imposter/config/publicapi_spec.json
+
 USER imposter
 
 EXPOSE 8080
diff --git a/docker/mock-pay/mock-pay-config.yaml b/docker/mock-pay/mock-pay-config.yaml
@@ -1,5 +1,5 @@
 plugin: openapi
-specFile: https://raw.githubusercontent.com/alphagov/pay-publicapi/master/openapi/publicapi_spec.json
+specFile: publicapi_spec.json
 response:
   scriptFile: payments.js