Merge pull request #84 from calvinbui/master

Dockerfile Improvements
bastienwirtz · Jun 12, 2020 · cad54a5 · cad54a5
2 parents a23914d + e6596ca
commit cad54a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,16 +4,14 @@ FROM node:lts-alpine as build-stage
 WORKDIR /app
 
 COPY package*.json ./
-RUN yarn install
+RUN yarn install --frozen-lockfile
 
 COPY . .
 RUN yarn build
 
 # production stage
 FROM alpine:3.11
 
-COPY --from=build-stage /app/dist /www/
-
 ENV USER darkhttpd
 ENV GROUP darkhttpd
 ENV GID 911
@@ -22,6 +20,8 @@ ENV UID 911
 RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} && \
     apk add -U darkhttpd
 
-USER darkhttpd
+USER ${USER}
+
+COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 
 ENTRYPOINT ["darkhttpd","/www/", "--no-listing"]
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
@@ -4,7 +4,7 @@ FROM node:lts-alpine as build-stage
 WORKDIR /app
 
 COPY package*.json ./
-RUN yarn install
+RUN yarn install --frozen-lockfile
 
 COPY . .
 RUN yarn build
@@ -20,7 +20,6 @@ RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_
 FROM arm32v7/alpine:3.11
 
 COPY --from=qemu qemu-arm-static /usr/bin/
-COPY --from=build-stage /app/dist /www/
 
 ENV USER darkhttpd
 ENV GROUP darkhttpd
@@ -31,6 +30,8 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
     apk add -U darkhttpd && \
     rm /usr/bin/qemu-arm-static
 
-USER darkhttpd
+USER ${USER}
+
+COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 
 ENTRYPOINT ["darkhttpd","/www/","--no-listing"]
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
@@ -4,7 +4,7 @@ FROM node:lts-alpine as build-stage
 WORKDIR /app
 
 COPY package*.json ./
-RUN yarn install
+RUN yarn install --frozen-lockfile
 
 COPY . .
 RUN yarn build
@@ -20,7 +20,6 @@ RUN wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_
 FROM arm64v8/alpine:3.11
 
 COPY --from=qemu qemu-aarch64-static /usr/bin/
-COPY --from=build-stage /app/dist /www/
 
 ENV USER darkhttpd
 ENV GROUP darkhttpd
@@ -31,6 +30,8 @@ RUN addgroup -S ${GROUP} -g ${GID} && adduser -D -S -u ${UID} ${USER} ${GROUP} &
     apk add -U darkhttpd && \
     rm /usr/bin/qemu-aarch64-static
 
-USER darkhttpd
+USER ${USER}
+
+COPY --from=build-stage --chown=${USER}:${GROUP} /app/dist /www/
 
 ENTRYPOINT ["darkhttpd","/www/","--no-listing"]