Skip to content

Commit b61b1d7

Browse files
DorfieeeeFragger
andauthored
UI: all assets stored in one place (#1166)
* Remove public directories from tracking - assets now copied at build time * Change tests to new map image location (#1168) * remove remaining assets from rcongui_public --------- Co-authored-by: Kevin Brasier <wonderfulweb@gmail.com>
1 parent 4d60372 commit b61b1d7

File tree

408 files changed

+58
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

408 files changed

+58
-31
lines changed

Dockerfile-frontend

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ COPY rcongui/ .
1010
RUN npm ci
1111
ENV REACT_APP_API_URL=/api/
1212
COPY .git/ .git/
13+
COPY assets/images/ /code/public
14+
COPY assets/rcongui/ /code/public
1315
RUN git describe --tags > /code/tag_version && rm -rf .git
1416
RUN npx browserslist@latest --update-db
1517
RUN npm run build
@@ -18,15 +20,19 @@ RUN mv /code/dist /www
1820
FROM $buildImage AS publicbuild
1921

2022
WORKDIR /code_public
23+
2124
COPY rcongui_public/ .
2225
RUN npm ci
26+
COPY assets/images/ /code_public/public
27+
COPY assets/rcongui_public/ /code_public/public
2328
RUN npm run build
2429
RUN mv /code_public/dist /www_public
2530

2631
FROM nginx:mainline-alpine
2732

2833
RUN apk add --no-cache openssl
2934
COPY rcongui/nginx.conf /etc/nginx/conf.d/default.conf
35+
3036
WORKDIR /var/www
3137

3238
RUN mkdir /var/www_public/
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)