From c66f7db1027315a809557bbbce26d62054c70136 Mon Sep 17 00:00:00 2001 From: jonastheis Date: Sun, 19 Apr 2020 14:35:09 +0200 Subject: [PATCH 1/2] Adjust to mutlistage build --- Dockerfile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99a276e8e..4aed30ba6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,16 @@ -FROM nginx +# Stage 1: Build application +FROM node:13.13.0 AS compile-image -MAINTAINER maintainers@vikunja.io +WORKDIR /build + +COPY . ./ + +RUN yarn install +RUN yarn run build + + +# Stage 2: copy +FROM nginx RUN apt-get update && apt-get install -y apt-utils openssl && \ mkdir -p /etc/nginx/ssl && \ @@ -8,6 +18,9 @@ RUN apt-get update && apt-get install -y apt-utils openssl && \ openssl req -new -key /etc/nginx/ssl/dummy.key -out /etc/nginx/ssl/dummy.csr -subj "/C=DE/L=Berlin/O=Vikunja/CN=Vikunja Snakeoil" && \ openssl x509 -req -days 3650 -in /etc/nginx/ssl/dummy.csr -signkey /etc/nginx/ssl/dummy.key -out /etc/nginx/ssl/dummy.crt -ADD nginx.conf /etc/nginx/nginx.conf +COPY nginx.conf /etc/nginx/nginx.conf -COPY dist /usr/share/nginx/html \ No newline at end of file +# copy compiled files from stage 1 +COPY --from=compile-image /build/dist /usr/share/nginx/html + +LABEL maintainer="maintainers@vikunja.io" \ No newline at end of file -- 2.40.1 From a381cf87efc8391083b1739c1cccf9cf8743fb98 Mon Sep 17 00:00:00 2001 From: jonastheis Date: Sun, 19 Apr 2020 15:38:20 +0200 Subject: [PATCH 2/2] Frozen lockfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4aed30ba6..44f7b729f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /build COPY . ./ -RUN yarn install +RUN yarn install --frozen-lockfile RUN yarn run build -- 2.40.1