From a5843bedd28249b0a5dfb8be6641e464908998e9 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Mon, 20 Nov 2023 13:28:02 +0100 Subject: [PATCH 1/3] fix(build): Remove apk upgrade to be TRG 4.02 compliant --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 913e1c5e57..f50190a4ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,8 +51,6 @@ RUN --mount=type=cache,target=/root/.m2 mvn -B clean package -pl :$BUILD_TARGET # Copy the jar and build image FROM eclipse-temurin:20-jre-alpine AS irs-api -RUN apk upgrade --no-cache libssl3 libcrypto3 - ARG UID=10000 ARG GID=3000 From 1d93b2cf031dd0be9224cda24aa93dca37d738b3 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Mon, 20 Nov 2023 13:57:11 +0100 Subject: [PATCH 2/3] docs(changelog): Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- charts/irs-helm/CHANGELOG.md | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb4e9a6d81..cfd4c35506 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.0.2] - 2023-11-20 +### Changed +- Remove `apk upgrade --no-cache libssl3 libcrypto3` in Docker base image to be TRG compliant + ## [4.0.1] - 2023-11-10 ### Changed - Added state `STARTED` as acceptable state to complete the EDC transfer process to be compatible with EDC 0.5.1 @@ -405,7 +409,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Unresolved - **Select Aspects you need** You are able to select the needed aspects for which you want to collect the correct endpoint information. -[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.1...HEAD +[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.2...HEAD +[4.0.2]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.1...4.0.2 [4.0.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.4...4.0.0 [3.5.4]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.5.3...3.5.4 diff --git a/charts/irs-helm/CHANGELOG.md b/charts/irs-helm/CHANGELOG.md index 6c4e1d8969..9338ac4051 100644 --- a/charts/irs-helm/CHANGELOG.md +++ b/charts/irs-helm/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.9.2] +### Changed +- Update IRS version to 4.0.2 + ## [6.9.1] ### Changed - Update IRS version to 4.0.1 From ef20c0af576dbf25e184242a9620f3537d26bb53 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Mon, 20 Nov 2023 14:03:39 +0100 Subject: [PATCH 3/3] chore(workflows): Update chart testing version --- .github/workflows/helm-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index a954977931..19b8b5a383 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -52,7 +52,7 @@ jobs: check-latest: true - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed