diff --git a/.env.template b/.env.template index 684fbdac0bf2feaaa5085aaa15fee53c103955b7..120aad36df7f40771e3e3a117113d21e1c38971c 100644 --- a/.env.template +++ b/.env.template @@ -1,4 +1,4 @@ -# docker-compose components. Append ':devserver.yml' to also run the dev server (default is prod only) +# docker-compose components replace by devserver.yml to run the dev server (default is prod) or append ':devserver.yml' to run both COMPOSE_FILE=docker-compose.yml # prod server host port PORT=8080 diff --git a/devserver.yml b/devserver.yml index 8d6b8bfc03720fcc48a9ebdb23b79a41b9043050..96ba8e7726ada94dc2e70edf7fa17f3dba8ac113 100644 --- a/devserver.yml +++ b/devserver.yml @@ -7,7 +7,9 @@ services: restart: $DEV_RESTART ports: - $DEV_PORT:9000 - volumes: - - ./:/opt environment: + - CORS_ALLOWED_HOSTS - WEBPACK_MODE=development + - HTTP_FOLDER + volumes: + - ./:/opt diff --git a/webpack.config.js b/webpack.config.js index 4fc1dec32c23fef3ecba084c7ffe0cbcc13e5b02..f966fe804e543d875e4f405a379c5e93b2b6f56d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,10 +12,17 @@ module.exports = { devServer: { hot: true, watchFiles: ['src/**/*'], - static: { - directory: path.join(__dirname, 'public'), - watch: true - }, + static: [ + { + directory: path.join(__dirname, 'public'), + watch: true + }, + { + directory: path.join(__dirname, process.env.HTTP_FOLDER ? process.env.HTTP_FOLDER : 'www'), + watch: false, + publicPath: '/data' + }, + ], port: 9000 }, plugins: [