From 3e3065c4a4d52079562cc3f8b0266b8bc677065e Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 4 Jan 2019 19:46:07 -0200
Subject: [PATCH] Refactor multistage build names, copy locales in base

---
 Dockerfile                  | 21 ++++++++++-----------
 docker-compose.override.yml |  2 +-
 docker-compose.travis.yml   |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03a572077..8e06ecbd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,13 +11,14 @@ WORKDIR $WORKDIR
 # See: https://github.com/nodejs/docker-node/pull/367#issuecomment-430807898
 RUN apk --no-cache add git
 
-COPY package.json yarn.lock ./
-COPY styleguide/ ./styleguide
-COPY server/ ./server
+COPY locales ./locales
+COPY styleguide ./styleguide
+COPY server ./server
+COPY package.json yarn.lock nuxt.config.js ./
 CMD ["yarn", "run", "start"]
 
-FROM base as builder
-RUN yarn install --frozen-lockfile --non-interactive
+FROM base as build-and-test
+RUN yarn install --production=false --frozen-lockfile --non-interactive
 RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive \
     && cd .. \
     && yarn run styleguide:build
@@ -26,11 +27,9 @@ RUN yarn run build
 
 FROM base as production
 ENV NODE_ENV=production
-ADD package.json ./
-ADD nuxt.config.js ./
-COPY --from=builder ./nitro-web/plugins ./plugins/
-COPY --from=builder ./nitro-web/node_modules ./node_modules/
-COPY --from=builder /nitro-web/.nuxt/ ./.nuxt
-COPY --from=builder ./nitro-web/static ./static/
+COPY --from=build-and-test ./nitro-web/node_modules ./node_modules
+COPY --from=build-and-test ./nitro-web/plugins ./plugins
+COPY --from=build-and-test ./nitro-web/.nuxt ./.nuxt
+COPY --from=build-and-test ./nitro-web/static ./static
 
 EXPOSE 3000
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 0438f5fbb..bb7a6c1d1 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -4,7 +4,7 @@ services:
   webapp:
     build:
       context: .
-      target: builder
+      target: build-and-test
     volumes:
       - .:/nitro-web
       - node_modules:/nitro-web/node_modules
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index 0c3293127..ced9719a2 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -4,4 +4,4 @@ services:
   webapp:
     build:
       context: .
-      target: builder
+      target: build-and-test