Merge branch 'release/1.4.0'

chronotruck · Sep 16, 2020 · 11ad235 · 11ad235
2 parents 1a2ef7f + c9c40a5
commit 11ad235
Show file tree

Hide file tree

Showing 6 changed files with 4,945 additions and 6,523 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:12
 
     working_directory: ~/mjml2html
 
@@ -33,7 +33,7 @@ jobs:
 
   misc:
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:12
 
     working_directory: ~/mjml2html
 

diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,3 @@
 .git
 test/
+node_modules
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,20 @@
-FROM node:10
+# Base
+FROM node:lts-alpine as base
 
 WORKDIR /app
 
-COPY . .
+COPY package.json .
+
+COPY package-lock.json .
+
+RUN npm ci --only=production
 
-RUN npm install
+# Release
+FROM node:lts-alpine as release
+
+COPY --from=base /app/node_modules ./node_modules
+
+COPY . .
 
 EXPOSE 80
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,6 +2,8 @@ version: '2'
 services:
   mjml2html:
     build: .
+    volumes:
+      - ./:/app
     environment:
       - PORT=3001
     ports: