Merge remote-tracking branch 'origin/master'

This commit is contained in:
zadam 2022-12-02 22:07:41 +01:00
commit aaa69f696b

View file

@ -4,6 +4,9 @@ FROM node:16.18.0-alpine
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app
# Bundle app source
COPY . .
COPY server-package.json package.json COPY server-package.json package.json
# Install app dependencies # Install app dependencies
@ -18,20 +21,19 @@ RUN set -x \
nasm \ nasm \
libpng-dev \ libpng-dev \
python3 \ python3 \
&& npm install --production \ && npm install \
&& apk del .build-dependencies && apk del .build-dependencies \
&& npm run webpack \
&& npm prune --omit=dev \
# Set the path to the newly created webpack bundle
&& sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' src/views/desktop.ejs \
&& sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' src/views/mobile.ejs \
&& sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' src/views/setup.ejs \
&& sed -i -e 's/app\/share.js/app-dist\/share.js/g' src/views/share/*.ejs
# Some setup tools need to be kept # Some setup tools need to be kept
RUN apk add --no-cache su-exec shadow RUN apk add --no-cache su-exec shadow
# Bundle app source
COPY . .
RUN sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' src/views/desktop.ejs && \
sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' src/views/mobile.ejs && \
sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' src/views/setup.ejs && \
sed -i -e 's/app\/share.js/app-dist\/share.js/g' src/views/share/*.ejs
# Add application user and setup proper volume permissions # Add application user and setup proper volume permissions
RUN adduser -s /bin/false node; exit 0 RUN adduser -s /bin/false node; exit 0