Use Ubuntu 22.04, use nodejs from ubuntu repo

pull/595/head
GlassedSilver 4 years ago
parent 93ce498e94
commit 4d4bc76549

@ -1,23 +1,25 @@
FROM ubuntu:21.10 AS ffmpeg FROM ubuntu:22.04 AS ffmpeg
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
COPY docker-build.sh . COPY docker-build.sh .
RUN sh ./docker-build.sh RUN sh ./docker-build.sh
FROM ubuntu:21.10 as frontend FROM ubuntu:22.04 as frontend
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
curl \ curl \
gnupg && \ gnupg \
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ # Ubuntu 22.04 ships Node.JS 12 by default :)
apt-get -y install \
nodejs \ nodejs \
# YARN: brings along npm, solves dependency conflicts, # YARN: brings along npm, solves dependency conflicts,
# spares us this spaghetti approach: https://stackoverflow.com/a/60547197 # spares us this spaghetti approach: https://stackoverflow.com/a/60547197
yarn && \ yarn && \
apt-get install -f && \ apt-get install -f && \
apt-get autoremove --purge && \
apt-get autoremove && \
apt-get clean && \
npm config set strict-ssl false && \ npm config set strict-ssl false && \
npm install -g @angular/cli npm install -g @angular/cli
@ -31,7 +33,7 @@ RUN npm run build
#--------------# #--------------#
FROM ubuntu:21.10 FROM ubuntu:22.04
ENV UID=1000 \ ENV UID=1000 \
GID=1000 \ GID=1000 \
@ -42,7 +44,6 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
npm \ npm \
python2 \ python2 \

Loading…
Cancel
Save