chore: update base images and multi-platform support.

eclipse-tractusx · Nov 22, 2024 · a652515 · a652515
1 parent 505c4f0
commit a652515
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -100,6 +100,10 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
+      # Needed to create multi-platform image
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       # 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') ) }}
@@ -152,6 +156,8 @@ jobs:
         with:
           context: sparql-aas/.
           file: sparql-aas/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-aas.outputs.tags }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,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.7] - 2024-07-15
 
 ### Added

diff --git a/sparql-aas/README.md b/sparql-aas/README.md
@@ -119,7 +119,7 @@ Project license: Apache License, Version 2.0
 
 **Used base image**
 
-- [eclipse-temurin:17-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/sparql-aas/src/main/docker/Dockerfile b/sparql-aas/src/main/docker/Dockerfile
@@ -24,10 +24,10 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.10.1-r0 --no-cache
+RUN apk update && apk add curl=8.11.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:22-jre-alpine
+FROM eclipse-temurin:23-jre-alpine
 
 ARG APP_USER=faaast
 ARG APP_UID=10100