Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FDP-2849: Adding organisation certs to container #1516

Merged
merged 3 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -130,13 +133,31 @@ 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: pushWithFile
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
if: ${{ matrix.file == null }}
with:
subject-name: ${{ matrix.image }}
subject-digest: ${{ steps.push.outputs.digest }}
- name: Generate artifact attestation
uses: actions/attest-build-provenance@v1
if: ${{ matrix.file != null }}
with:
subject-name: ${{ matrix.image }}
subject-digest: ${{ steps.pushWithFile.outputs.digest }}
3 changes: 2 additions & 1 deletion integration-tests/cucumber-tests-platform-common/Dockerfile
Original file line number Diff line number Diff line change
@@ -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\
Expand Down
Original file line number Diff line number Diff line change
@@ -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\
Expand Down
Original file line number Diff line number Diff line change
@@ -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\
Expand Down
Loading