split dev and build environnements

README.md

@@ -17,17 +17,23 @@ Le site: https://etudiant-entrepreneur.beta.gouv.fr/
 ### Node+Docker
 
 ```
-docker-compose up api
 npm install
 npm start
 ```
+Seul le backend est "contenerisé", le frontend est accessible via browsersync
+### Build Env with Nginx front
 
+```
+npm install
+npm run build
+```
+Frontend et backend sont dans des conteneurs.  
+Le frontend est build avec npm avant d'être ajouté à un conteneur Nginx.
 ### 100% Docker
 
 ```
-docker-compose up
+docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
 ```
-
 Dans `client/webpack.config.dev.js` modifier:
 
 ```

client/Dockerfile → client/Dockerfile.dev

@@ -1,5 +1,5 @@
 FROM node:6
-EXPOSE 3000
+EXPOSE 80
 WORKDIR /app
 ADD ./package.json /app/
 WORKDIR /app

client/webpack.config.prod.js

@@ -10,7 +10,7 @@ import autoprefixer from 'autoprefixer'
 const GLOBALS = {
   'process.env.NODE_ENV': JSON.stringify('production'),
   __DEV__: false,
-  API_URI: JSON.stringify('https://etudiant-entrepreneur.herokuapp.com/api')
+  API_URI: JSON.stringify('http://localhost:3004/api')
 }
 
 export default {

docker-compose.build.yml

@@ -0,0 +1,9 @@
+version: '2'
+
+services:
+  front:
+    build:
+      context: ./client/
+      dockerfile: Dockerfile.build
+    ports:
+      - 3000:80

docker-compose.dev.yml

@@ -0,0 +1,12 @@
+version: '2'
+
+services:
+  front:
+    build:
+      context: ./client/
+      dockerfile: Dockerfile.dev
+    volumes:
+     - ./client:/app
+    ports:
+      - 3000:3000
+      - 3001:3001

docker-compose.yml

@@ -20,13 +20,6 @@ services:
       - SENDGRID_API_KEY=${SENDGRID_API_KEY}
     depends_on:
       - mongo
-  front:
-    build: ./client
-    volumes:
-     - ./client:/app
-    ports:
-      - 3000:3000
-      - 3001:3001
 
 networks:
   front:

package.json

@@ -7,15 +7,17 @@
     "install:back": "cd server && npm install",
     "install:front": "cd client && npm install",
     "start": "npm-run-all --sequential start:back start:front",
-    "start:back": "docker-compose up -d",
+    "start:back": "docker-compose up -d api",
     "start:front": "cd client && npm run start",
     "test": "npm-run-all --sequential test:back test:front test:docker",
     "test:docker": "./tools/dockerTest.sh",
     "test:back": "cd server && npm test",
     "test:front": "cd client && npm test",
     "lint": "npm-run-all --sequential lint:back lint:front",
     "lint:back": "cd server && npm run lint",
-    "lint:front": "cd client && npm run lint"
+    "lint:front": "cd client && npm run lint",
+    "prebuild" : "cd client && npm run build",
+    "build": "docker-compose -f docker-compose.yml -f docker-compose.build.yml up --build"
   },
   "repository": {
     "type": "git",