better caching docker steps

This commit is contained in:
dave 2020-11-15 16:49:22 -08:00
parent bec8013365
commit 41ef49293e
1 changed files with 4 additions and 5 deletions

View File

@ -1,8 +1,8 @@
FROM ubuntu:bionic AS frontend FROM ubuntu:focal AS frontend
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y wget software-properties-common && \ apt-get install -y wget software-properties-common && \
echo "deb https://deb.nodesource.com/node_10.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list && \ echo "deb https://deb.nodesource.com/node_10.x focal main" | tee /etc/apt/sources.list.d/nodesource.list && \
wget -q -O- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ wget -q -O- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
apt-get update && \ apt-get update && \
apt-get install -y nodejs apt-get install -y nodejs
@ -13,13 +13,12 @@ RUN cd /tmp/code && \
npm install && \ npm install && \
./node_modules/.bin/grunt ./node_modules/.bin/grunt
FROM ubuntu:disco AS app FROM ubuntu:focal AS app
ADD . /tmp/code/
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y python3-pip apt-get install -y python3-pip
ADD . /tmp/code/
COPY --from=frontend /tmp/code/styles/dist/style.css /tmp/code/styles/dist/style.css COPY --from=frontend /tmp/code/styles/dist/style.css /tmp/code/styles/dist/style.css
RUN cd /tmp/code && \ RUN cd /tmp/code && \