Merge branch 'master' into docker-nodejs16-upgrade

This commit is contained in:
Glassed Silver
2022-05-07 11:36:27 +02:00
committed by GitHub

View File

@@ -5,6 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
COPY ffmpeg-fetch.sh . COPY ffmpeg-fetch.sh .
RUN sh ./ffmpeg-fetch.sh RUN sh ./ffmpeg-fetch.sh
# Create our Ubuntu 22.04 with node 16 # Create our Ubuntu 22.04 with node 16
# Go to 20.04 # Go to 20.04
FROM ubuntu:20.04 AS base FROM ubuntu:20.04 AS base
@@ -22,7 +23,8 @@ RUN groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \
npm -g install npm && \ npm -g install npm && \
apt clean && \ apt clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Build frontend # Build frontend
FROM base as frontend FROM base as frontend
RUN npm install -g @angular/cli RUN npm install -g @angular/cli
@@ -42,6 +44,7 @@ RUN npm config set strict-ssl false && \
npm install --prod && \ npm install --prod && \
ls -al ls -al
# Final image # Final image
FROM base FROM base
RUN npm install -g pm2 && \ RUN npm install -g pm2 && \