Merge pull request #43 from catenax-ng/qg4

QG4

CHANGELOG.md

@@ -8,6 +8,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
  - Updated README.md
  - a figure for arc42
 
+
+## [2.0.7] - 2023-05-09
+
+### Added
+- Added Container images section in the README.md file that contains information about the used base image
+
+### Changed
+- Specified runAsUser for the deployment
+- Specified USER command in Dockerfile using IDs instead of just name
 
 ## [2.0.6] - 2023-05-02
 

Dockerfile

@@ -18,10 +18,25 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
 COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
 
-RUN adduser -DH sdfuser && addgroup sdfuser sdfuser
-
+ENV USER=sdfuser
+ENV UID=1000
+ENV GID=1000
+
+RUN addgroup --gid $GID $USER
+
+RUN adduser \
+    --disabled-password \
+    --gecos "" \
+    --home "$(pwd)" \
+    --ingroup "$USER" \
+    --no-create-home \
+    --uid "$UID" \
+    "$USER"
+
 USER sdfuser
 
+WORKDIR /
+
 ENTRYPOINT ["java", "-cp", "app:app/lib/*", "org.eclipse.tractusx.selfdescriptionfactory.SelfDescriptionFactoryApplication"]
 
 EXPOSE 8080

README.md

@@ -13,8 +13,8 @@ further processing.
 ## Software Version
 
 ```shell
-Software version: 2.0.6
-Helm Chart version: 2.0.6
+Software version: 2.0.7
+Helm Chart version: 2.0.7
 
 ```
 
@@ -251,6 +251,19 @@ SD-Factory can be fired up locally in Docker environment. Before that the image
 to be created. Do not forget to provide necessary configuration parameters in `application.yml`
 for keycloak and the Custodian Wallet.
 
+# Container images
+
+This application provides container images for demonstration purposes. The base image used, to build this demo application image is eclipse-temurin:17-jdk-alpine
+
+Docker Hub:
+
+ - eclipse-temurin(https://hub.docker.com/_/eclipse-temurin)
+ - 17-jdk-alpine(https://hub.docker.com/layers/library/eclipse-temurin/17.0.6_10-jdk-alpine/images/sha256-c093675e143dc8023fb218c144e06491154491a7965d0664a93f99ada5259ec7?context=explore)
+
+Source:
+
+ - temurin-build(https://github.com/adoptium/temurin-build)
+ - temurin docker repo info(https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin)
 
 ## Installation Steps
 

charts/SDFactory/Chart.yaml

@@ -37,13 +37,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: 2.0.6
+version: 2.0.7
 
 # 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: "2.0.6"
+appVersion: "2.0.7"
 
 
 

charts/SDFactory/README.md

@@ -1,6 +1,6 @@
 # sdfactory
 
-![Version: 2.0.6](https://img.shields.io/badge/Version-2.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.6](https://img.shields.io/badge/AppVersion-2.0.6-informational?style=flat-square)
+![Version: 2.0.7](https://img.shields.io/badge/Version-2.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.7](https://img.shields.io/badge/AppVersion-2.0.7-informational?style=flat-square)
 
 Helm Charts for SD Factory application. Self-Description Factory component is responsible for the creation of Self Descriptions.
 
@@ -49,6 +49,7 @@ Helm Charts for SD Factory application. Self-Description Factory component is re
 | sdfactory.secret.realm | string | `""` | Keycloak Realm detail |
 | sdfactory.secret.resource | string | `""` | Keycloak Resource detail |
 | securityContext.allowPrivilegeEscalation | bool | `false` | Controls whether a process can gain more privileges |
+| securityContext.runAsUser | int | `1000` |  |
 | service.port | int | `80` | Port details for sevice |
 | service.targetPort | int | `8080` | Container Port details for sevice |
 | service.type | string | `"ClusterIP"` | Type of service |

charts/SDFactory/values.yaml

@@ -61,7 +61,7 @@ securityContext:
   #   - ALL
   # readOnlyRootFilesystem: true
   # runAsNonRoot: true
-  # runAsUser: 1000
+  runAsUser: 1000
 
 sdfactory:
   secret: