Skip to content

Commit

Permalink
Merge pull request #398 from FraunhoferISST/fix/frontend-publish-work…
Browse files Browse the repository at this point in the history
…flow

Fix: update rights and copying of legal files in frontend Dockerfile.prebuilt
  • Loading branch information
tom-rm-meyer-ISST authored May 23, 2024
2 parents fa824e5 + 55d9ba6 commit d1923c2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
10 changes: 8 additions & 2 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,27 @@ in the GitHub organization https://github.com/eclipse-tractusx:

* https://github.com/eclipse-tractusx/puris


## Third-party Content

This project leverages the following third party content.

See `DEPENDENCIES_FRONTEND` and `DEPENDENCIES_BACKEND` file. Further, the following third-party content is used that
isn't listed in any DEPENDENCIES file:

Keycloak initial realm setup
[Keycloak initial realm setup](./local/miw/keycloak-setup.json)

* SPDX-License-Identifier: Apache-2.0
* SPDX-FileCopyrightText: https://github.com/eclipse-tractusx/managed-identity-wallet/blob/main/LICENSE
* Source URL: https://github.com/eclipse-tractusx/managed-identity-wallet

[Frontend license information substitution script](./frontend/scripts/legal-notice.sh)

* SPDX-License-Identifier: Apache-2.0
* SPDX-FileCopyrightText: https://github.com/eclipse-tractusx/portal-frontend/blob/v2.0.0-RC8/scripts/legal-notice.sh
* Source URL: https://github.com/eclipse-tractusx/portal-frontend/

feather (4.29)

* License: MIT License
* Licence Path: https://github.com/feathericons/feather/blob/master/LICENSE
* Project URL: https://feathericons.com/
Expand Down
9 changes: 6 additions & 3 deletions frontend/Dockerfile.prebuilt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# uses 101 restricted user
FROM nginxinc/nginx-unprivileged:alpine
# Copy Legal information for distributions, the star ones are copied by workflow
COPY DOCKER_NOTICE.md README.md NOTICE.md* SECURITY.md* LICENSE* DEPENDENCIES* /dist/
COPY DOCKER_NOTICE.md README.md NOTICE.md* SECURITY.md* LICENSE* DEPENDENCIES* /usr/share/nginx/html/

# commly it would be .../html/js/.*js, but due to the project structure the JS files are in .../html/assets
ENV JSFOLDER=/usr/share/nginx/html/assets/*.js
Expand All @@ -34,13 +34,16 @@ COPY ./nginx.conf /etc/nginx/nginx.conf
RUN chmod 777 /etc/nginx/nginx.conf
COPY ./start-nginx.sh /usr/bin/start-nginx.sh

WORKDIR /usr/share/nginx/html
COPY ./dist .
RUN chmod -R 777 ./
RUN ls -la ./

# 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 ./dist .
ENTRYPOINT [ "start-nginx.sh" ]
# nginx exposes at port 80
# nginx-unpriviledged exposes at port 8080

0 comments on commit d1923c2

Please sign in to comment.