Skip to content

Commit

Permalink
Merge pull request #117 from big-data-spaces/feature/2412-release
Browse files Browse the repository at this point in the history
chore: update base images and multi-platform support.
  • Loading branch information
almadigabor authored Nov 24, 2024
2 parents fb8374c + 61b69ed commit 582119b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') ) }}
Expand Down Expand Up @@ -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 }}
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 @@ -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
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sparql-aas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sparql-aas/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 582119b

Please sign in to comment.