From 5b63371c149b042dfaf6ff2be713ea7dbd839783 Mon Sep 17 00:00:00 2001
From: Guillaume Grossetie <g.grossetie@gmail.com>
Date: Sat, 7 Nov 2020 23:22:19 +0100
Subject: [PATCH] Fix docker build (#2348)

* .eslintrc.json is required to build using react-scripts

* Remove the extra "deps" step

This step can be done as part of the build (faster and more reliable).

* Add a GitHub Actions to build the Docker image

Make sure that "docker build" is working on every pull request before landing on master.

* Update package-lock.json

* Add .prettierrc in the Docker image to avoid warnings in the build step

* Revert "Update package-lock.json"

This reverts commit 7ef2eaadfae610771987bc8155670b895c139e7b.

* Make sure that the 'node_modules' layer can be cached

if package and package-lock.json didn't changed
---
 .dockerignore                      |  2 ++
 .github/workflows/build-docker.yml | 15 +++++++++++++++
 Dockerfile                         | 25 +++++++------------------
 3 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/build-docker.yml

diff --git a/.dockerignore b/.dockerignore
index 747089b2..50eee081 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,8 @@
 !public/
 !src/
 !.npmrc
+!.eslintrc.json
+!.prettierrc
 !package-lock.json
 !package.json
 !tsconfig.json
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
new file mode 100644
index 00000000..ffd2ef08
--- /dev/null
+++ b/.github/workflows/build-docker.yml
@@ -0,0 +1,15 @@
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - run: docker build -t excalidraw .
diff --git a/Dockerfile b/Dockerfile
index 298b4407..eb9da172 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,14 @@
-FROM node:14-alpine AS deps
-
-ARG REACT_APP_INCLUDE_GTAG=false
-
-RUN mkdir /opt/node_app && chown node:node /opt/node_app
-WORKDIR /opt/node_app
-
-USER node
-
-COPY package.json package-lock.json ./
-RUN npm install --no-optional && npm cache clean --force
-ENV PATH /opt/node_app/node_modules/.bin:$PATH
-
-WORKDIR /opt/node_app
-COPY . .
-
 FROM node:14-alpine AS build
 
+WORKDIR /opt/node_app
+
+COPY package.json package-lock.json ./
+RUN npm i --no-optional
+
+ARG REACT_APP_INCLUDE_GTAG=false
 ARG NODE_ENV=production
 
-WORKDIR /opt/node_app
-COPY --from=deps /opt/node_app .
+COPY . .
 RUN npm run build:app:docker
 
 FROM nginx:1.17-alpine