From 2997c92579d582b5395fc69d13d984923fc0c26e Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 13 May 2024 20:56:19 +0530 Subject: [PATCH 1/4] base image updated --- CHANGELOG.md | 7 +++++++ Dockerfile | 2 +- README.md | 4 ++-- charts/orchestrator/Chart.yaml | 4 ++-- charts/orchestrator/README.md | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6181a112..849526b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] + + +## [1.5.5] - 2024-05-13 +### Changed - postgresql DB upgrade +### Fixed +- Update base image due to vulnerabilities + ## [1.5.4] - 2024-03-06 ### Fixed - Fixed CVE-2024-22234 and CVE-2024-22243 diff --git a/Dockerfile b/Dockerfile index 7be15d1f..a89b1c80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ COPY ./src ./src # build for release RUN mvn clean install -Dmaven.test.skip=true -FROM eclipse-temurin:17.0.8.1_1-jdk +FROM eclipse-temurin:17.0.11_9-jdk ENV USER=autosetupuser ENV UID=1000 diff --git a/README.md b/README.md index a72f4897..043bbe35 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ This service will help service provider to set up DFT/SDE with EDC and EDC as se ### Software Version ```shell -Application version: 1.5.4 -Helm release version: 1.5.7 +Application version: 1.5.5 +Helm release version: 1.5.8 ``` # Container images diff --git a/charts/orchestrator/Chart.yaml b/charts/orchestrator/Chart.yaml index e841a319..5133b923 100644 --- a/charts/orchestrator/Chart.yaml +++ b/charts/orchestrator/Chart.yaml @@ -38,13 +38,13 @@ sources: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.7 +version: 1.5.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.5.4" +appVersion: "1.5.5" dependencies: - condition: postgresql.enabled diff --git a/charts/orchestrator/README.md b/charts/orchestrator/README.md index 4e3787ca..daed0ea9 100644 --- a/charts/orchestrator/README.md +++ b/charts/orchestrator/README.md @@ -1,6 +1,6 @@ # managed-service-orchestrator -![Version: 1.5.7](https://img.shields.io/badge/Version-1.5.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square) +![Version: 1.5.8](https://img.shields.io/badge/Version-1.5.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.5](https://img.shields.io/badge/AppVersion-1.5.5-informational?style=flat-square) This service will help service provider to set up DFT/SDE with EDC and EDC as service in service provider environment. From 37cacf9a74a56559a90d48276033597d6b0f00b1 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 13 May 2024 20:58:45 +0530 Subject: [PATCH 2/4] updated image version --- DOCKER_NOTICE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DOCKER_NOTICE.md b/DOCKER_NOTICE.md index 555606fe..241b7795 100644 --- a/DOCKER_NOTICE.md +++ b/DOCKER_NOTICE.md @@ -12,7 +12,7 @@ __Managed Service Orchestrator__ **Used base image** -- [eclipse-temurin:17.0.8.1_1-jdk](https://github.com/adoptium/containers) +- [eclipse-temurin:17.0.11_9-jdk](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 @@ -20,4 +20,4 @@ __Managed Service Orchestrator__ As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc. from the base distribution, along with any direct or indirect dependencies of the primary software being contained). -As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within. \ No newline at end of file +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within. From f2d872d6314d3ba063aaa0633caf7953d39877f6 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Mon, 13 May 2024 21:02:53 +0530 Subject: [PATCH 3/4] updated contact details --- CONTACT.md | 5 +++++ README.md | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 CONTACT.md diff --git a/CONTACT.md b/CONTACT.md new file mode 100644 index 00000000..4d1d5956 --- /dev/null +++ b/CONTACT.md @@ -0,0 +1,5 @@ +Contact the Eclipse Tractus-X developers via the developer mailing list + +- https://accounts.eclipse.org/mailing-list/tractusx-dev + +Contact the project developers: [DEVELOPERS](AUTHORS.md) diff --git a/README.md b/README.md index 043bbe35..71262aa7 100644 --- a/README.md +++ b/README.md @@ -77,5 +77,9 @@ Authentication for the backend is handled via an Keycloak. This can be set in th GitHub repository with correct version of the Eclipse DataSpace Connector Project: [repository](https://github.com/catenax-ng/product-edc) ### Licenses -Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) +Distributed under the Apache 2.0 License. See [LICENSE](LICENSE) for more information. + +## Contact + +For contacting regarding the project see [CONTACT](CONTACT.md) From 01d5cb1b306b394d9e6a5b9d0ffedf3fc6b8f963 Mon Sep 17 00:00:00 2001 From: adkumar1 Date: Tue, 14 May 2024 13:40:46 +0530 Subject: [PATCH 4/4] modified year --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a89b1c80..3a1528ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ################################################################################# -# Copyright (c) 2022,2023 T-Systems International GmbH -# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022,2024 T-Systems International GmbH +# Copyright (c) 2022,2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership.