From d60dc5cc314be5d1c3bd3fc3d18870d6b4a538f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Darveau?= <franklebest07@gmail.com>
Date: Sun, 27 Jun 2021 15:28:14 -0400
Subject: [PATCH] optimize Dockerfile cache use for client build

---
 .github/workflows/docker-image.yml |  1 +
 Dockerfile                         | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ba3938a..393fbc0 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -24,6 +24,7 @@ jobs:
             VERSION=${{github.head_ref}}
           fi
           TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${{ steps.date.outputs.date }}"
+          echo ${TAGS}
           echo ::set-output name=tags::${TAGS}
           
       - name: Set up QEMU
diff --git a/Dockerfile b/Dockerfile
index fed0789..b0b5918 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,27 @@ FROM node:14-alpine
 
 RUN apk update && apk add --no-cache nano curl
 
+# Get package.json and install modules
+COPY package*.json /tmp/package.json
+RUN cd /tmp && npm install --production
+RUN mkdir -p /app && cp -a /tmp/node_modules /app/
+
+# Get package.json and install modules
+COPY client/package*.json /tmp_client/package.json
+RUN cd /tmp_client && npm install --production
+RUN mkdir -p /app/client && cp -a /tmp_client/node_modules /app/client/
+
 WORKDIR /app
 
-COPY package*.json ./
+#COPY package*.json ./
 
-RUN npm install --production
+#RUN npm install --production
 
-COPY . .
+COPY . /app
 
 RUN mkdir -p ./public ./data \
     && cd ./client \
-    && npm install --production \
+    #&& npm install --production \
     && npm run build \
     && cd .. \
     && mv ./client/build/* ./public \