Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update base images and multi-platform support. #182

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') ) }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-chart-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conforming/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conforming/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion matchmaking/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion matchmaking/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion remoting/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions remoting/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
Loading