From 528f4ed0fd9f133a1962c893fd46e4933a88afc5 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Wed, 15 Aug 2018 02:19:19 +0300
Subject: [PATCH] Remove docker-compose volume

---
 configs/webpack/dev.js | 22 ++++++++++++++++++++--
 docker-compose.yml     |  2 --
 package.json           |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/configs/webpack/dev.js b/configs/webpack/dev.js
index bfc88cc..71c74eb 100644
--- a/configs/webpack/dev.js
+++ b/configs/webpack/dev.js
@@ -3,7 +3,7 @@ const merge = require("webpack-merge");
 const webpack = require("webpack");
 const FaviconsWebpackPlugin = require("favicons-webpack-plugin");
 
-const commonConfig = require("./common");
+const commonConfig = require("./common.js");
 
 module.exports = merge(commonConfig, {
   mode: "development",
@@ -16,7 +16,25 @@ module.exports = merge(commonConfig, {
   devServer: {
     hot: true, // Enable HMR on the server
     historyApiFallback: true,
-    // public: '0.0.0.0:8080',
+    host: '0.0.0.0',
+    port: '8080',
+    allowedHosts: [
+      '.sik.party',
+      '.sahkoinsinoorikilta.fi',
+    ],
+    // clientLogLevel: 'none',
+    // https: settings.dev_server.https,
+    // host: settings.dev_server.host,
+    // port: settings.dev_server.port,
+    // contentBase: output.path,
+    // public: settings.dev_server.public,
+    // publicPath: output.publicPath,
+    // compress: true,
+    // headers: { 'Access-Control-Allow-Origin': '*' },
+    // historyApiFallback: true,
+    // watchOptions: {
+    //   ignored: /node_modules/
+    // }
   },
   devtool: "cheap-module-eval-source-map",
   plugins: [
diff --git a/docker-compose.yml b/docker-compose.yml
index cc7e8ca..aba233a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,5 +6,3 @@ services:
     image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0-frontend
     ports:
       - "3000:8080"
-    volumes:
-     - ./src:/app/src
diff --git a/package.json b/package.json
index e8f980e..b416f0d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "lint:ts:fix": "tslint -p tsconfig.json --format stylish --exclude node_modules --fix",
     "lint:sass": "stylelint ./src/**/**/*.scss ./src/**/*.scss ./src/*.scss",
     "start": "npm run start-dev",
-    "start-dev": "webpack-dev-server --config=configs/webpack/dev.js --host 0.0.0.0",
+    "start-dev": "webpack-dev-server --config=configs/webpack/dev.js",
     "serve": "serve -p 3000 dist",
     "start-prod": "npm run build && npm run serve",
     "mock-backend": "json-server --watch db.json -p 1234",