From c4c3368ed75622674d5377ebeeca6e4ac73cdbea Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Wed, 6 Nov 2024 10:35:35 +0100 Subject: [PATCH 1/5] add release flow for identity provider servicew --- .../release-identity-provider-service.yaml | 14 ++++++++++++++ scripts/identity-provider-service.Dockerfile | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release-identity-provider-service.yaml diff --git a/.github/workflows/release-identity-provider-service.yaml b/.github/workflows/release-identity-provider-service.yaml new file mode 100644 index 000000000..94e57b893 --- /dev/null +++ b/.github/workflows/release-identity-provider-service.yaml @@ -0,0 +1,14 @@ +on: + push: + tags: + - identity-provider-service/* + +jobs: + release-static-libraries-image: + uses: concordium/.github/.github/workflows/docker-release-workflow.yaml@main + with: + SERVICE_NAME: "identity-provider-service" + BUILD_ARGS: | + base_image_tag=rust1.73-ghc9.6.4 + DOCKER_FILE: scripts/identity-provider-service.Dockerfile + secrets: inherit \ No newline at end of file diff --git a/scripts/identity-provider-service.Dockerfile b/scripts/identity-provider-service.Dockerfile index 596a3b86b..2d8b1947c 100644 --- a/scripts/identity-provider-service.Dockerfile +++ b/scripts/identity-provider-service.Dockerfile @@ -6,13 +6,15 @@ WORKDIR /build/identity-provider-service RUN cargo build --release # Collect build artifacts in fresh image. -FROM ubuntu:20.04 +FROM ubuntu:24.04 RUN apt-get update && \ apt-get -y install \ libssl-dev \ ca-certificates \ && rm -rf /var/lib/apt/lists/* +LABEL base_image_tag=${base_image_tag} + COPY --from=builder /build/identity-provider-service/target/release/identity-provider-service /identity-provider-service COPY --from=builder /build/identity-provider-service/target/release/identity-verifier /identity-verifier COPY --from=builder /build/scripts/start.sh /start.sh From 42a8800cc4b1cf571d30bafe8249efe51e74bc15 Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Wed, 6 Nov 2024 10:47:04 +0100 Subject: [PATCH 2/5] add newline --- .github/workflows/release-identity-provider-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-identity-provider-service.yaml b/.github/workflows/release-identity-provider-service.yaml index 94e57b893..dcb909028 100644 --- a/.github/workflows/release-identity-provider-service.yaml +++ b/.github/workflows/release-identity-provider-service.yaml @@ -11,4 +11,4 @@ jobs: BUILD_ARGS: | base_image_tag=rust1.73-ghc9.6.4 DOCKER_FILE: scripts/identity-provider-service.Dockerfile - secrets: inherit \ No newline at end of file + secrets: inherit From f788b90ed82de8bd33a9267274952a2b6a636d3a Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Wed, 6 Nov 2024 10:51:32 +0100 Subject: [PATCH 3/5] release identity provider service --- .github/workflows/release-identity-provider-service.yaml | 1 + identity-provider-service/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-identity-provider-service.yaml b/.github/workflows/release-identity-provider-service.yaml index dcb909028..224b99e34 100644 --- a/.github/workflows/release-identity-provider-service.yaml +++ b/.github/workflows/release-identity-provider-service.yaml @@ -11,4 +11,5 @@ jobs: BUILD_ARGS: | base_image_tag=rust1.73-ghc9.6.4 DOCKER_FILE: scripts/identity-provider-service.Dockerfile + CARGO_FILE_PATH: identity-provider-service/Cargo.toml secrets: inherit diff --git a/identity-provider-service/Cargo.toml b/identity-provider-service/Cargo.toml index e68dc04e0..f386cb23c 100644 --- a/identity-provider-service/Cargo.toml +++ b/identity-provider-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "identity-provider-service" -version = "0.5.6" +version = "0.5.7" authors = ["Concordium AG "] edition = "2018" license-file = "../../LICENSE-APACHE" From ce21ff56fc9a6bb1a9c3e94dd20a4bfb140d8675 Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Wed, 6 Nov 2024 11:44:58 +0100 Subject: [PATCH 4/5] test namings --- .github/workflows/release-identity-provider-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-identity-provider-service.yaml b/.github/workflows/release-identity-provider-service.yaml index 224b99e34..e25c86e3f 100644 --- a/.github/workflows/release-identity-provider-service.yaml +++ b/.github/workflows/release-identity-provider-service.yaml @@ -4,7 +4,7 @@ on: - identity-provider-service/* jobs: - release-static-libraries-image: + release-identity-provider-service: uses: concordium/.github/.github/workflows/docker-release-workflow.yaml@main with: SERVICE_NAME: "identity-provider-service" From 232cb679ab9f2a0c94cd2656d16b258da3ca0d1e Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Wed, 6 Nov 2024 11:48:15 +0100 Subject: [PATCH 5/5] fix path --- .github/workflows/release-identity-provider-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-identity-provider-service.yaml b/.github/workflows/release-identity-provider-service.yaml index e25c86e3f..8b5a8d80b 100644 --- a/.github/workflows/release-identity-provider-service.yaml +++ b/.github/workflows/release-identity-provider-service.yaml @@ -10,6 +10,6 @@ jobs: SERVICE_NAME: "identity-provider-service" BUILD_ARGS: | base_image_tag=rust1.73-ghc9.6.4 - DOCKER_FILE: scripts/identity-provider-service.Dockerfile + DOCKER_FILE_PATH: scripts/identity-provider-service.Dockerfile CARGO_FILE_PATH: identity-provider-service/Cargo.toml secrets: inherit