From ede72d62b0894a38fbf981f46c35feb686619633 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 8 Jan 2018 22:47:14 +0100
Subject: [PATCH] Initial setup for phtantomjs
---
dev.yml | 4 +---
front/Dockerfile | 16 +++++++---------
front/docker/Dockerfile.dev | 13 -------------
front/test/unit/karma.conf.js | 2 ++
4 files changed, 10 insertions(+), 25 deletions(-)
delete mode 100644 front/docker/Dockerfile.dev
diff --git a/dev.yml b/dev.yml
index befc4b24..971e38b6 100644
--- a/dev.yml
+++ b/dev.yml
@@ -3,9 +3,7 @@ version: '2'
services:
front:
- build:
- dockerfile: docker/Dockerfile.dev
- context: ./front
+ build: front
env_file: .env.dev
environment:
- "HOST=0.0.0.0"
diff --git a/front/Dockerfile b/front/Dockerfile
index ad05f72e..b22359b4 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -1,13 +1,11 @@
-FROM node:6-alpine
+FROM node:6
EXPOSE 8080
-
-RUN mkdir /app
-WORKDIR /app
+WORKDIR /app/
ADD package.json .
+RUN npm install --only=production
+RUN npm install --only=dev
+VOLUME ["/app/node_modules"]
+COPY . .
-RUN npm install
-
-ADD . .
-
-RUN npm run build
+CMD ["npm", "run", "dev"]
diff --git a/front/docker/Dockerfile.dev b/front/docker/Dockerfile.dev
deleted file mode 100644
index 1a0c90c9..00000000
--- a/front/docker/Dockerfile.dev
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM node:6-alpine
-
-EXPOSE 8080
-
-RUN mkdir /app
-WORKDIR /app
-ADD package.json .
-
-RUN npm install
-
-VOLUME ["/app/node_modules"]
-
-CMD ["npm", "run", "dev"]
diff --git a/front/test/unit/karma.conf.js b/front/test/unit/karma.conf.js
index 8e4951c9..3fcc5f02 100644
--- a/front/test/unit/karma.conf.js
+++ b/front/test/unit/karma.conf.js
@@ -18,6 +18,8 @@ module.exports = function (config) {
preprocessors: {
'./index.js': ['webpack', 'sourcemap']
},
+ captureTimeout: 5000,
+ retryLimit: 1,
webpack: webpackConfig,
webpackMiddleware: {
noInfo: true
--
GitLab