FDP-2849: Adding organisation certs to container

OSGP · Jan 22, 2025 · dc19f51 · dc19f51
1 parent 827145a
commit dc19f51
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -103,11 +103,14 @@ jobs:
           - image: ghcr.io/osgp/osgp-web-device-simulator
             context: ./osgp/protocol-adapter-oslp/web-device-simulator
           - image: ghcr.io/osgp/osgp-cucumber-tests-platform-common
-            context: ./integration-tests/cucumber-tests-platform-common
+            context: ./integration-tests
+            file: /cucumber-tests-platform-common/Dockerfile
           - image: ghcr.io/osgp/osgp-cucumber-tests-platform-publiclighting
-            context: ./integration-tests/cucumber-tests-platform-publiclighting
+            context: ./integration-tests
+            file: /cucumber-tests-platform-publiclighting/Dockerfile
           - image: ghcr.io/osgp/osgp-cucumber-tests-platform-smartmetering
-            context: ./integration-tests/cucumber-tests-platform-smartmetering
+            context: ./integration-tests
+            file: /cucumber-tests-platform-smartmetering/Dockerfile
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -130,11 +133,22 @@ jobs:
       - name: Build and push Docker image
         id: push
         uses: docker/build-push-action@v6
+        if: ${{ matrix.file == null }}
         with:
           context: ${{ matrix.context }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push Docker image with file path
+        id: push
+        uses: docker/build-push-action@v6
+        if: ${{ matrix.file != null }}
+        with:
+          context: ${{ matrix.context }}
+          file: ${{ matrix.context }}${{ matrix.file }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:

diff --git a/integration-tests/cucumber-tests-platform-common/Dockerfile b/integration-tests/cucumber-tests-platform-common/Dockerfile
@@ -1,6 +1,7 @@
 FROM eclipse-temurin:17
 WORKDIR /
-COPY target/cucumber-*-test-jar-with-dependencies.jar /
+COPY cucumber-tests-platform-common/target/cucumber-*-test-jar-with-dependencies.jar /
+COPY certificates /etc/ssl/certs/organisations/
 RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
 CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
      -Dcucumber.execution.strict=true\

diff --git a/integration-tests/cucumber-tests-platform-publiclighting/Dockerfile b/integration-tests/cucumber-tests-platform-publiclighting/Dockerfile
@@ -1,6 +1,7 @@
 FROM eclipse-temurin:17
 WORKDIR /
-COPY target/cucumber-*-test-jar-with-dependencies.jar /
+COPY cucumber-tests-platform-publiclighting/target/cucumber-*-test-jar-with-dependencies.jar /
+COPY certificates /etc/ssl/certs/organisations/
 RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
 CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
      -Dcucumber.execution.strict=true\

diff --git a/integration-tests/cucumber-tests-platform-smartmetering/Dockerfile b/integration-tests/cucumber-tests-platform-smartmetering/Dockerfile
@@ -1,6 +1,7 @@
 FROM eclipse-temurin:17
 WORKDIR /
-COPY target/cucumber-*-test-jar-with-dependencies.jar /
+COPY cucumber-tests-platform-smartmetering/target/cucumber-*-test-jar-with-dependencies.jar /
+COPY certificates /etc/ssl/certs/organisations/
 RUN wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
 CMD java -javaagent:org.jacoco.agent-0.8.12-runtime.jar=destfile=/target/code-coverage/jacoco-it.exec \
      -Dcucumber.execution.strict=true\