Skip to content

Commit d1923c2

Browse files
Merge pull request #398 from FraunhoferISST/fix/frontend-publish-workflow
Fix: update rights and copying of legal files in frontend Dockerfile.prebuilt
2 parents fa824e5 + 55d9ba6 commit d1923c2

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

NOTICE.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,27 @@ in the GitHub organization https://github.com/eclipse-tractusx:
2929

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

32-
3332
## Third-party Content
3433

3534
This project leverages the following third party content.
3635

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

40-
Keycloak initial realm setup
39+
[Keycloak initial realm setup](./local/miw/keycloak-setup.json)
40+
4141
* SPDX-License-Identifier: Apache-2.0
4242
* SPDX-FileCopyrightText: https://github.com/eclipse-tractusx/managed-identity-wallet/blob/main/LICENSE
4343
* Source URL: https://github.com/eclipse-tractusx/managed-identity-wallet
4444

45+
[Frontend license information substitution script](./frontend/scripts/legal-notice.sh)
46+
47+
* SPDX-License-Identifier: Apache-2.0
48+
* SPDX-FileCopyrightText: https://github.com/eclipse-tractusx/portal-frontend/blob/v2.0.0-RC8/scripts/legal-notice.sh
49+
* Source URL: https://github.com/eclipse-tractusx/portal-frontend/
4550

4651
feather (4.29)
52+
4753
* License: MIT License
4854
* Licence Path: https://github.com/feathericons/feather/blob/master/LICENSE
4955
* Project URL: https://feathericons.com/

frontend/Dockerfile.prebuilt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# uses 101 restricted user
2323
FROM nginxinc/nginx-unprivileged:alpine
2424
# Copy Legal information for distributions, the star ones are copied by workflow
25-
COPY DOCKER_NOTICE.md README.md NOTICE.md* SECURITY.md* LICENSE* DEPENDENCIES* /dist/
25+
COPY DOCKER_NOTICE.md README.md NOTICE.md* SECURITY.md* LICENSE* DEPENDENCIES* /usr/share/nginx/html/
2626

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

37+
WORKDIR /usr/share/nginx/html
38+
COPY ./dist .
39+
RUN chmod -R 777 ./
40+
RUN ls -la ./
41+
3742
# use non-root user
3843
USER 101
3944

4045
HEALTHCHECK --interval=30s --timeout=3s CMD wget -O /dev/null http://localhost:8080 || exit 1
4146

42-
WORKDIR /usr/share/nginx/html
43-
COPY ./dist .
4447
ENTRYPOINT [ "start-nginx.sh" ]
4548
# nginx exposes at port 80
4649
# nginx-unpriviledged exposes at port 8080

0 commit comments

Comments
 (0)