diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cdac217..77b8658 100644 --- 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@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') ) }} @@ -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/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml index 076e6ba..01f1eb9 100644 --- a/.github/workflows/helm-chart-lint.yml +++ b/.github/workflows/helm-chart-lint.yml @@ -88,7 +88,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 66cc7e4..fb821c6 100644 --- 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 index 9b678f4..fca9926 100644 --- 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 index 67d0c3b..dd7b707 100644 --- 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