From 92c038f36b43da7eb460cb3f32b4f6caa55b8a16 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 15:55:22 +0300 Subject: [PATCH 01/17] Add docker image building using `mvn spring-boot:build-image` --- .github/workflows/maven-release.yml | 36 ++++++++++++++++++++++++++--- put-server/pom.xml | 7 ++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 254c330..cd7717e 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -9,22 +9,52 @@ on: jobs: publish: - runs-on: ubuntu-latest permissions: contents: read packages: write steps: - - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v4 + with: java-version: '17' distribution: 'temurin' settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Publish to GitHub Packages Apache Maven + uses: actions/setup-java@v4 run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml env: GITHUB_TOKEN: ${{ github.token }} + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + #registry: ${{ env.REGISTRY }} + registry: ghcr.io + username: ${{ github.actor }} + #password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ github.token }} + + - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) + uses: actions/setup-java@v4 + run: | + mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ + -f put-server + -Dmaven.test.skip=true \ + -Dspring-boot.build-image.publish=true \ + -Ddocker.publishRegistry.url=ghcr.io \ + -Ddocker.publishRegistry.username=${USERNAME} \ + -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ + -Dspring-boot.build-image.imageName=cdoc2/cdoc2-put-server:${TAG}-${GITHUB_SHA} + + #Note: imageName tag is built from git tag which can be different from module version + env: + USERNAME: ${{ github.actor }} + GITHUB_TOKEN: ${{ github.token }} + # Note: git tag can contain more symbols than Container registry, allowed for docker tag: + # lowercase and uppercase letters, digits, underscores, periods, and hyphens. + TAG: ${{ github.event.release.tag_name }} + + diff --git a/put-server/pom.xml b/put-server/pom.xml index 8276a86..5ea0047 100644 --- a/put-server/pom.xml +++ b/put-server/pom.xml @@ -420,6 +420,13 @@ true + + + ${docker.publishRegistry.url} + ${docker.publishRegistry.username} + ${docker.publishRegistry.password} + + From f207573769149c8112d4e7f4ddcd7d0c23221511 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 15:56:29 +0300 Subject: [PATCH 02/17] suppress UnresolvedMavenProperty for externally initialized properties --- put-server/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/put-server/pom.xml b/put-server/pom.xml index 5ea0047..41e649b 100644 --- a/put-server/pom.xml +++ b/put-server/pom.xml @@ -416,14 +416,18 @@ ${java.version} true + ${bp.dependency.mirror} true + ${docker.publishRegistry.url} + ${docker.publishRegistry.username} + ${docker.publishRegistry.password} From e4175d977dd1f82210cdbab0ce3ec8fdd097e717 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 16:06:41 +0300 Subject: [PATCH 03/17] fix `Set up JDK 17` step --- .github/workflows/maven-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index cd7717e..6c9dd1b 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Set up JDK 17 - + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' From e8d4c205af90b5eabe24fcf50e5c272f6fcbdc90 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 16:09:27 +0300 Subject: [PATCH 04/17] fix `a step cannot have both the `uses` and `run` keys` error --- .github/workflows/maven-release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 6c9dd1b..c73531b 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -23,7 +23,6 @@ jobs: settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Publish to GitHub Packages Apache Maven - uses: actions/setup-java@v4 run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml env: GITHUB_TOKEN: ${{ github.token }} @@ -38,7 +37,6 @@ jobs: password: ${{ github.token }} - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) - uses: actions/setup-java@v4 run: | mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ -f put-server From 6847fb0039f24aedf9c3941bc160b3c396956603 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 16:16:39 +0300 Subject: [PATCH 05/17] Add uses: actions/checkout@v4 --- .github/workflows/maven-release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index c73531b..671e6e1 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -15,6 +15,7 @@ jobs: packages: write steps: + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v4 with: @@ -22,10 +23,10 @@ jobs: distribution: 'temurin' settings-path: ${{ github.workspace }} # location for the settings.xml file - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml - env: - GITHUB_TOKEN: ${{ github.token }} +# - name: Publish to GitHub Packages Apache Maven +# run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml +# env: +# GITHUB_TOKEN: ${{ github.token }} - name: Log in to the Container registry uses: docker/login-action@v3 From d5311928314c2f85b89c086490a4dc42a920aad8 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 17:47:57 +0300 Subject: [PATCH 06/17] Force using "open-eid" maven repo. Use maven-deploy-plugin 3.y.z from cdoc2-shared-crypto --- .github/workflows/maven-release.yml | 9 +++++++++ cdoc2-shared-crypto/pom.xml | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 671e6e1..00161bd 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -37,6 +37,13 @@ jobs: #password: ${{ secrets.GITHUB_TOKEN }} password: ${{ github.token }} + # Fail fast if compilation fails without downloading all docker images + - name: Install packages (temp) + run: mvn install -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true + env: + MAVEN_REPO: open-eid/cdoc2-capsule-server + GITHUB_TOKEN: ${{ github.token }} + - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) run: | mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ @@ -55,5 +62,7 @@ jobs: # Note: git tag can contain more symbols than Container registry, allowed for docker tag: # lowercase and uppercase letters, digits, underscores, periods, and hyphens. TAG: ${{ github.event.release.tag_name }} + #force usage of open-eid repo + MAVEN_REPO: open-eid/cdoc2-capsule-server diff --git a/cdoc2-shared-crypto/pom.xml b/cdoc2-shared-crypto/pom.xml index fc40ad0..6c04449 100644 --- a/cdoc2-shared-crypto/pom.xml +++ b/cdoc2-shared-crypto/pom.xml @@ -111,6 +111,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + + From f26054295046ff74e5f172d65cc6ac9e4171371a Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 17:54:46 +0300 Subject: [PATCH 07/17] add missing '\' for `mvn spring-boot:build-image` --- .github/workflows/maven-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 00161bd..8eac6e6 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -47,7 +47,7 @@ jobs: - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) run: | mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ - -f put-server + -f put-server \ -Dmaven.test.skip=true \ -Dspring-boot.build-image.publish=true \ -Ddocker.publishRegistry.url=ghcr.io \ From a670869b77359bfef1e3f0895856ebb446dc9fb5 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 18:07:49 +0300 Subject: [PATCH 08/17] Use ghcr.io in image name --- .github/workflows/maven-release.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 8eac6e6..7f9b201 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -38,11 +38,11 @@ jobs: password: ${{ github.token }} # Fail fast if compilation fails without downloading all docker images - - name: Install packages (temp) - run: mvn install -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true - env: - MAVEN_REPO: open-eid/cdoc2-capsule-server - GITHUB_TOKEN: ${{ github.token }} +# - name: Install packages (temp) +# run: mvn install -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true +# env: +# MAVEN_REPO: open-eid/cdoc2-capsule-server +# GITHUB_TOKEN: ${{ github.token }} - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) run: | @@ -50,19 +50,20 @@ jobs: -f put-server \ -Dmaven.test.skip=true \ -Dspring-boot.build-image.publish=true \ - -Ddocker.publishRegistry.url=ghcr.io \ + -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=cdoc2/cdoc2-put-server:${TAG}-${GITHUB_SHA} + -Dspring-boot.build-image.imageName=${REGISTRY}/cdoc2/cdoc2-put-server:${TAG}-${GITHUB_SHA} - #Note: imageName tag is built from git tag which can be different from module version env: + REGISTRY: ghcr.io USERNAME: ${{ github.actor }} GITHUB_TOKEN: ${{ github.token }} # Note: git tag can contain more symbols than Container registry, allowed for docker tag: # lowercase and uppercase letters, digits, underscores, periods, and hyphens. + # Note: imageName tag is built from git tag which can be different from module version TAG: ${{ github.event.release.tag_name }} - #force usage of open-eid repo + #force usage of open-eid Maven repo MAVEN_REPO: open-eid/cdoc2-capsule-server From 5246e193934fe24b9a9286f6e16e4a8e663d93d9 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 18:30:54 +0300 Subject: [PATCH 09/17] Try github username in front of imageName --- .github/workflows/maven-release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 7f9b201..fb99b3e 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -31,10 +31,8 @@ jobs: - name: Log in to the Container registry uses: docker/login-action@v3 with: - #registry: ${{ env.REGISTRY }} registry: ghcr.io username: ${{ github.actor }} - #password: ${{ secrets.GITHUB_TOKEN }} password: ${{ github.token }} # Fail fast if compilation fails without downloading all docker images @@ -53,7 +51,7 @@ jobs: -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=${REGISTRY}/cdoc2/cdoc2-put-server:${TAG}-${GITHUB_SHA} + -Dspring-boot.build-image.imageName=${REGISTRY}/jann0k/cdoc2-put-server:${TAG}-${GITHUB_SHA} env: REGISTRY: ghcr.io From 50923ca3d6392fd6975f71317782e1b48ab2554d Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 19:05:06 +0300 Subject: [PATCH 10/17] Use GITHUB_REPOSITORY_OWNER variable, build and publish cdoc2-get-server --- .github/workflows/maven-release.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index fb99b3e..a9c09e2 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -23,11 +23,12 @@ jobs: distribution: 'temurin' settings-path: ${{ github.workspace }} # location for the settings.xml file -# - name: Publish to GitHub Packages Apache Maven -# run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -# env: -# GITHUB_TOKEN: ${{ github.token }} + - name: Publish to GitHub Packages Apache Maven + run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml + env: + GITHUB_TOKEN: ${{ github.token }} + # test if username and password are correct (may still fail if no write access or wrong package name) - name: Log in to the Container registry uses: docker/login-action@v3 with: @@ -35,13 +36,6 @@ jobs: username: ${{ github.actor }} password: ${{ github.token }} - # Fail fast if compilation fails without downloading all docker images -# - name: Install packages (temp) -# run: mvn install -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true -# env: -# MAVEN_REPO: open-eid/cdoc2-capsule-server -# GITHUB_TOKEN: ${{ github.token }} - - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) run: | mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ @@ -51,7 +45,15 @@ jobs: -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=${REGISTRY}/jann0k/cdoc2-put-server:${TAG}-${GITHUB_SHA} + -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-put-server:${TAG}-${GITHUB_SHA} + mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ + -f get-server \ + -Dmaven.test.skip=true \ + -Dspring-boot.build-image.publish=true \ + -Ddocker.publishRegistry.url=${REGISTRY} \ + -Ddocker.publishRegistry.username=${USERNAME} \ + -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ + -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:${TAG}-${GITHUB_SHA} env: REGISTRY: ghcr.io From 40a7a20af36e808165e194cace8f4d092320157f Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Tue, 3 Sep 2024 19:26:28 +0300 Subject: [PATCH 11/17] Build get-server first --- .github/workflows/maven-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index a9c09e2..8e64a1c 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -39,21 +39,21 @@ jobs: - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) run: | mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ - -f put-server \ + -f get-server \ -Dmaven.test.skip=true \ -Dspring-boot.build-image.publish=true \ -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-put-server:${TAG}-${GITHUB_SHA} + -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:${TAG}-${GITHUB_SHA} mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ - -f get-server \ + -f put-server \ -Dmaven.test.skip=true \ -Dspring-boot.build-image.publish=true \ -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:${TAG}-${GITHUB_SHA} + -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-put-server:${TAG}-${GITHUB_SHA} env: REGISTRY: ghcr.io From 3ade17970f9319a05af818cff40a37797f39fc26 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Wed, 4 Sep 2024 11:15:19 +0300 Subject: [PATCH 12/17] Add publishRegistry configuration for get-server --- get-server/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/get-server/pom.xml b/get-server/pom.xml index 107359f..ed46b38 100644 --- a/get-server/pom.xml +++ b/get-server/pom.xml @@ -417,10 +417,21 @@ ${java.version} true + ${bp.dependency.mirror} true + + + + ${docker.publishRegistry.url} + + ${docker.publishRegistry.username} + + ${docker.publishRegistry.password} + + From 95f2faba1e389010da5a9e2ce3a6ceff788babd7 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Wed, 4 Sep 2024 11:39:55 +0300 Subject: [PATCH 13/17] Minimal README.md updates --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 40a4ee6..c5e647f 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,13 @@ by [defining repository variable](https://docs.github.com/en/actions/writing-wor See [getting-started.md](getting-started.md) and [admin-guide.md](admin-guide.md) +### Running pre-built Docker/OCI images + +Download `cdoc2-put-server` and `cdoc2-get-server` images from [open-eid Container registry](https://github.com/open-eid?ecosystem=container&tab=packages) + +[ghcr.io login](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-with-a-personal-access-token-classic) + +TODO: Configuring Docker images ## Releasing and versioning From e1b48601f9789896d14a23c84c4d9711cc62606b Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Wed, 4 Sep 2024 12:04:51 +0300 Subject: [PATCH 14/17] RM-3690: re-arrange `mvn spring-boot:build-image` parameters for better GH workflow view --- .github/workflows/maven-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 8e64a1c..958afb7 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -38,16 +38,16 @@ jobs: - name: Build Docker/OCI images and publish to GH Container registry (ghcr.io) run: | - mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ - -f get-server \ + mvn spring-boot:build-image -f get-server \ + -s $GITHUB_WORKSPACE/settings.xml \ -Dmaven.test.skip=true \ -Dspring-boot.build-image.publish=true \ -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:${TAG}-${GITHUB_SHA} - mvn spring-boot:build-image -s $GITHUB_WORKSPACE/settings.xml \ - -f put-server \ + mvn spring-boot:build-image -f put-server \ + -s $GITHUB_WORKSPACE/settings.xml \ -Dmaven.test.skip=true \ -Dspring-boot.build-image.publish=true \ -Ddocker.publishRegistry.url=${REGISTRY} \ @@ -63,7 +63,7 @@ jobs: # lowercase and uppercase letters, digits, underscores, periods, and hyphens. # Note: imageName tag is built from git tag which can be different from module version TAG: ${{ github.event.release.tag_name }} - #force usage of open-eid Maven repo + # use open-eid Maven repo for dependencies download, see pom.xml MAVEN_REPO: open-eid/cdoc2-capsule-server From 9d2e5a44d70eb70cf9901d4f34d3fe035c87634a Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Wed, 4 Sep 2024 12:36:52 +0300 Subject: [PATCH 15/17] RM-3690: try tagging with latest --- .github/workflows/maven-release.yml | 3 ++- get-server/pom.xml | 2 ++ put-server/pom.xml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 958afb7..82eb40a 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -45,7 +45,8 @@ jobs: -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:${TAG}-${GITHUB_SHA} + -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:${TAG}-${GITHUB_SHA} \ + -Dspring-boot.build-image.tags=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-get-server:latest mvn spring-boot:build-image -f put-server \ -s $GITHUB_WORKSPACE/settings.xml \ -Dmaven.test.skip=true \ diff --git a/get-server/pom.xml b/get-server/pom.xml index ed46b38..63c887d 100644 --- a/get-server/pom.xml +++ b/get-server/pom.xml @@ -421,6 +421,8 @@ ${bp.dependency.mirror} true + + ${spring-boot.build-image.tags} diff --git a/put-server/pom.xml b/put-server/pom.xml index 41e649b..fcaee0f 100644 --- a/put-server/pom.xml +++ b/put-server/pom.xml @@ -420,6 +420,8 @@ ${bp.dependency.mirror} true + + ${spring-boot.build-image.tags} From 9d3efeebffef0450ab1534b0ab851256dea4af4c Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Wed, 4 Sep 2024 12:44:07 +0300 Subject: [PATCH 16/17] RM-3690: add latest tagging to put-server --- .github/workflows/maven-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 82eb40a..b2df34f 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -54,8 +54,8 @@ jobs: -Ddocker.publishRegistry.url=${REGISTRY} \ -Ddocker.publishRegistry.username=${USERNAME} \ -Ddocker.publishRegistry.password=${GITHUB_TOKEN} \ - -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-put-server:${TAG}-${GITHUB_SHA} - + -Dspring-boot.build-image.imageName=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-put-server:${TAG}-${GITHUB_SHA} \ + -Dspring-boot.build-image.tags=${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/cdoc2-put-server:latest env: REGISTRY: ghcr.io USERNAME: ${{ github.actor }} From c98a7cde4b1aaf544ec54ac97114c2f3b2924ec3 Mon Sep 17 00:00:00 2001 From: Janno Kusman Date: Wed, 4 Sep 2024 13:32:10 +0300 Subject: [PATCH 17/17] RM-3690: README.md updates --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c5e647f..540c901 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,9 @@ See [VERSIONING.md](https://github.com/open-eid/cdoc2-java-ref-impl/blob/master/ ### GitHub release -[Create release](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release) on tag done by VERSIONING.md process. It will trigger `maven-release.yml` workflow that -will deploy Maven packages to GitHub Maven package repository. +[Create release](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release) on tag done by [VERSIONING.md](https://github.com/open-eid/cdoc2-java-ref-impl/blob/master/VERSIONING.md) process. +It will trigger `maven-release.yml` workflow that will deploy Maven packages to GitHub Maven package repository +and build & publish Docker/OCI images. ## Related projects