From 5e6f27fcacc3d063d7e1acaced00919f22d05c32 Mon Sep 17 00:00:00 2001 From: --show-origin Date: Wed, 21 Feb 2024 08:56:54 -0800 Subject: [PATCH 1/4] ci(frontend/Dockerfile): change from stable-alpine to alpine for nginx --- frontend/Dockerfile | 2 +- frontend/README.md | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index ee1e03be..cb79dbb8 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -47,7 +47,7 @@ COPY NOTICE.md /app/dist/NOTICE.md COPY DEPENDENCIES /app/dist/DEPENDENCIES # uses 101 restricted user -FROM nginxinc/nginx-unprivileged:stable-alpine +FROM nginxinc/nginx-unprivileged:alpine #FROM nginx:stable-alpine # commly it would be .../html/js/.*js, but due to the project structure the JS files are in .../html/assets diff --git a/frontend/README.md b/frontend/README.md index 5bcbe97b..a5d8099c 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -4,12 +4,13 @@ ## Table of Contents + - [Prerequirements](#prerequirements) - [Getting Started](#getting-started) - [License](#license) - ## Prerequirements + The following things are needed to start PURIS: - `npm` or an equivalent Docker setup @@ -20,10 +21,12 @@ The following things are needed to start PURIS: See the [installation instructions](INSTALL.md) for information on how to start the application. ## License + The project is licensed under the [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). For details on the licensing terms, see the `LICENSE` file. ## Notice for Docker Image + This application provides container images for demonstration purposes. Eclipse Tractus-X product(s) installed within the image: @@ -34,10 +37,18 @@ Eclipse Tractus-X product(s) installed within the image: - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/puris/blob/main/frontend/LICENSE) **Used Base Image [Frontend]** -- `node:lts-alpine` +`node:lts-alpine` + - DockerHub: https://hub.docker.com/_/node/ - GitHub project: https://github.com/nodejs/docker-node -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). +`nginxinc/nginx-unprivileged:alpine` + +- DockerHub: https://hub.docker.com/r/nginxinc/nginx-unprivileged +- GitHub project: https://github.com/nginxinc/docker-nginx-unprivileged + +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. +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 6105c4ce9eb58dbbbb5ee02f65d8704f98c9397a Mon Sep 17 00:00:00 2001 From: --show-origin Date: Wed, 21 Feb 2024 09:12:21 -0800 Subject: [PATCH 2/4] chore(frontend/Dockerfile): updated license header --- frontend/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index cb79dbb8..9b6b0913 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,7 +1,7 @@ # -# Copyright (c) 2022,2023 Volkswagen AG -# Copyright (c) 2022,2023 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer ISST) -# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation +# Copyright (c) 2022-2024 Volkswagen AG +# Copyright (c) 2022-2024 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer ISST) +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. From c27644292d64e9bf1343c4acb394772cad7cb300 Mon Sep 17 00:00:00 2001 From: --show-origin Date: Wed, 21 Feb 2024 09:22:22 -0800 Subject: [PATCH 3/4] feat(frontend/Dockerfile): added healthcheck --- frontend/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 9b6b0913..3157922a 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -64,6 +64,8 @@ RUN apk --no-cache add moreutils # use non-root user USER 101 +HEALTHCHECK --interval=30s --timeout=3s CMD wget -O /dev/null http://localhost:8080 || exit 1 + WORKDIR /usr/share/nginx/html COPY --from=build /app/dist . ENTRYPOINT [ "start-nginx.sh" ] From ec5820b55630dbc95a69ba12d36eb5cc363c7567 Mon Sep 17 00:00:00 2001 From: --show-origin Date: Wed, 21 Feb 2024 22:24:30 -0800 Subject: [PATCH 4/4] chore(docker-notice): updated notice to contain only running environment --- README.md | 23 +++++++++++++++-------- backend/README.md | 19 ++++++++++++------- frontend/README.md | 5 ----- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d4de3634..1203a3f4 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,12 @@ The project is made of a backend and a frontend. Look into the respective folder information about prerequirements and getting started guides. ## License + The project is licensed under the [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). For details on the licensing terms, see the `LICENSE` file. ## Notice for Docker Image + This application provides container images for demonstration purposes. Eclipse Tractus-X product(s) installed within the image: @@ -25,15 +27,20 @@ Eclipse Tractus-X product(s) installed within the image: - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/puris/blob/main/LICENSE) **Used Base Image [Frontend]** -- `node:lts-alpine` -- DockerHub: https://hub.docker.com/_/node/ -- GitHub project: https://github.com/nodejs/docker-node + +`nginxinc/nginx-unprivileged:alpine` + +- DockerHub: https://hub.docker.com/r/nginxinc/nginx-unprivileged +- GitHub project: https://github.com/nginxinc/docker-nginx-unprivileged **Used Base Image [Backend]** -- `maven:3.8.7-eclipse-temurin-17` -- DockerHub: https://hub.docker.com/_/maven/ -- GitHub project: https://github.com/carlossg/docker-maven +`eclipse-temurin:17-jre-alpine` + +- DockerHub: https://hub.docker.com/_/eclipse-temurin +- GitHub project: https://github.com/adoptium/containers -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 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. +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. diff --git a/backend/README.md b/backend/README.md index 32279223..b47b1745 100644 --- a/backend/README.md +++ b/backend/README.md @@ -4,12 +4,13 @@ ## Table of Contents + - [Prerequirements](#prerequirements) - [Getting Started](#getting-started) - [License](#license) - ## Prerequirements + The following things are needed to start PURIS: - A Java Runtime Environment + Maven or an equivalent Docker setup @@ -21,10 +22,12 @@ The following things are needed to start PURIS: See the [installation instructions](INSTALL.md) for information on how to start the application. ## License + The project is licensed under the [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). For details on the licensing terms, see the `LICENSE` file. ## Notice for Docker Image + This application provides container images for demonstration purposes. Eclipse Tractus-X product(s) installed within the image: @@ -34,12 +37,14 @@ Eclipse Tractus-X product(s) installed within the image: - Dockerfile Backend: https://github.com/eclipse-tractusx/puris/blob/main/backend/Dockerfile - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/puris/blob/main/backend/LICENSE) - **Used Base Image [Backend]** -- `maven:3.8.7-eclipse-temurin-17` -- DockerHub: https://hub.docker.com/_/maven/ -- GitHub project: https://github.com/carlossg/docker-maven +`eclipse-temurin:17-jre-alpine` + +- DockerHub: https://hub.docker.com/_/eclipse-temurin +- GitHub project: https://github.com/adoptium/containers -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 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. +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. diff --git a/frontend/README.md b/frontend/README.md index a5d8099c..f4df5dfd 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -37,11 +37,6 @@ Eclipse Tractus-X product(s) installed within the image: - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/puris/blob/main/frontend/LICENSE) **Used Base Image [Frontend]** -`node:lts-alpine` - -- DockerHub: https://hub.docker.com/_/node/ -- GitHub project: https://github.com/nodejs/docker-node - `nginxinc/nginx-unprivileged:alpine` - DockerHub: https://hub.docker.com/r/nginxinc/nginx-unprivileged