From c7849f3f76677533a8bf668f925575211d071e16 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Tue, 21 Aug 2018 22:12:15 +0300
Subject: [PATCH] npm ci and node:alpine in use for Gitlab CI

---
 .gitlab-ci.yml | 14 ++++++--------
 Dockerfile     |  2 ++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65dbe8e..7e70320 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-# image: node:7.10.0
-
 stages:
     - setup
     # - test
@@ -12,31 +10,31 @@ cache:
         - node_modules/
 
 setup:
-    image: node
+    image: node:alpine
     stage: setup
     script:
-        - npm install
+        - npm ci
 
 # test:unit:
-#     image: node
+#     image: node:alpine
 #     stage: test
 #     script:
 #         - npm run test:unit
 
 # test:e2e:
-#     image: node
+#     image: node:alpine
 #     stage: test
 #     script:
 #         - npm run test:e2e
 
 ts:lint:
-    image: node
+    image: node:alpine
     stage: lint
     script:
         - npm run lint:ts
 
 sass:lint:
-    image: node
+    image: node:alpine
     stage: lint
     script:
         - npm run lint:sass
diff --git a/Dockerfile b/Dockerfile
index b62377b..65fe7a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,8 @@ FROM node:alpine
 RUN apk add --no-cache libpng-dev gcc make g++ zlib-dev bash lcms2-dev autoconf automake libtool nasm
 WORKDIR /app
 COPY package.json package-lock.json ./
+COPY .env.sample .env
+RUN source .env
 RUN npm ci
 
 COPY . ./