diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9aee21a..bda030e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,6 +99,10 @@ jobs: distribution: 'temurin' cache: 'maven' + # Needed to create multi-platform image + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 #(v3.7.1) + # Enable deployment access (on demand or main branch and version tags only) - name: Login to GitHub Container Registry if: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }} @@ -151,6 +155,8 @@ jobs: with: context: conforming/. file: conforming/src/main/docker/Dockerfile + # Needed to create multi-platform image + platforms: linux/amd64, linux/arm64 # Build image for verification purposes on every trigger event. Only push if event is not a PR push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }} tags: ${{ steps.meta-conf.outputs.tags }} @@ -190,6 +196,8 @@ jobs: with: context: remoting/. file: remoting/src/main/docker/Dockerfile + # Needed to create multi-platform image + platforms: linux/amd64, linux/arm64 # Build image for verification purposes on every trigger event. Only push if event is not a PR push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }} tags: ${{ steps.meta-remote.outputs.tags }} @@ -229,6 +237,8 @@ jobs: with: context: provisioning/. file: provisioning/src/main/docker/Dockerfile + # Needed to create multi-platform image, there is no jre 11 on arm yet + platforms: linux/amd64 # Build image for verification purposes on every trigger event. Only push if event is not a PR push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }} tags: ${{ steps.meta-prov.outputs.tags }} @@ -268,6 +278,8 @@ jobs: with: context: matchmaking/. file: matchmaking/src/main/docker/Dockerfile + # Needed to create multi-platform image + platforms: linux/amd64, linux/arm64 # Build image for verification purposes on every trigger event. Only push if event is not a PR push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }} tags: ${{ steps.meta-match.outputs.tags }} diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml index 87de4af..a48a669 100644 --- a/.github/workflows/helm-chart-lint.yml +++ b/.github/workflows/helm-chart-lint.yml @@ -86,7 +86,7 @@ jobs: uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1 - name: Run chart-testing (lint) - run: ct lint --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml + run: ct lint --all --target-branch ${{ github.base_ref || github.ref_name }} --config charts/config/chart-testing-config.yaml - name: Run chart-testing (list-changed) id: list-changed diff --git a/CHANGELOG.md b/CHANGELOG.md index fbf2b88..b712201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,15 @@ All notable changes to this product will be documented in this file. # Released +## [1.14.24] - 2024-11-25 + +### Added + +### Changed + +- Update Base Images +- Multi-Platform Support + ## [1.13.22] - 2024-07-29 ### Added diff --git a/conforming/README.md b/conforming/README.md index 6849542..2adc10e 100644 --- a/conforming/README.md +++ b/conforming/README.md @@ -124,7 +124,7 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:23-jre-alpine](https://github.com/adoptium/containers) - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin diff --git a/conforming/src/main/docker/Dockerfile b/conforming/src/main/docker/Dockerfile index 84b8cf4..ef41bfd 100644 --- a/conforming/src/main/docker/Dockerfile +++ b/conforming/src/main/docker/Dockerfile @@ -15,7 +15,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM eclipse-temurin:22-jre-alpine +FROM eclipse-temurin:23-jre-alpine ARG JAR ARG LIB diff --git a/matchmaking/README.md b/matchmaking/README.md index 4bba36a..7c6d1bc 100644 --- a/matchmaking/README.md +++ b/matchmaking/README.md @@ -107,7 +107,7 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:23-jre-alpine](https://github.com/adoptium/containers) - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin diff --git a/matchmaking/src/main/docker/Dockerfile b/matchmaking/src/main/docker/Dockerfile index d2d1c2e..9944ef2 100644 --- a/matchmaking/src/main/docker/Dockerfile +++ b/matchmaking/src/main/docker/Dockerfile @@ -15,7 +15,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM eclipse-temurin:22-jre-alpine +FROM eclipse-temurin:23-jre-alpine ARG JAR ARG LIB diff --git a/remoting/README.md b/remoting/README.md index 12bf395..93aa8d9 100644 --- a/remoting/README.md +++ b/remoting/README.md @@ -205,7 +205,7 @@ Eclipse Tractus-X product(s) installed within the image: **Used base image** -- [eclipse-temurin:22-jre-alpine](https://github.com/adoptium/containers) +- [eclipse-temurin:23-jre-alpine](https://github.com/adoptium/containers) - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin - Additional information about the Eclipse Temurin images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin diff --git a/remoting/src/main/docker/Dockerfile b/remoting/src/main/docker/Dockerfile index 22d9552..2a7bd8a 100644 --- a/remoting/src/main/docker/Dockerfile +++ b/remoting/src/main/docker/Dockerfile @@ -19,7 +19,7 @@ # Build Container: Fixes diverse vulnerabilities in guava <32, netty, jetty, spring-framework <5.3.28 and spring-web (all 5 versions - need to exclude a deprecated package from the jar) ## -FROM eclipse-temurin:22-jdk-alpine AS build +FROM eclipse-temurin:23-jdk-alpine AS build COPY target/original-remoting-agent-*.jar /opt/lib/ #COPY target/lib/guava-*.jar /opt/lib/ @@ -76,7 +76,7 @@ COPY resources/web/callback.xml /tmp/rdf4j-server/WEB-INF/callback.xml # Target Container: Use a valid base image ## -FROM eclipse-temurin:22-jre-alpine +FROM eclipse-temurin:23-jre-alpine ARG APP_USER=tomcat ARG APP_UID=10001