summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-02-01 13:05:52 -0600
committerMike Greiling <mike@pixelcog.com>2017-02-01 16:23:26 -0600
commit6b2e5e344cb81070ec69efd0f7029abe1db8163d (patch)
treea9e894c3aefd686e3a72d36a48215d635c393b4b
parenta2d837a3719187a906b60b9212b0dbf02396cb59 (diff)
downloadgitlab-ce-6b2e5e344cb81070ec69efd0f7029abe1db8163d.tar.gz
configure webpack dev server port via environment variable
-rw-r--r--config/webpack.config.js12
1 files changed, 2 insertions, 10 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index bddd181b452..db4ce84f376 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -6,18 +6,10 @@ var webpack = require('webpack');
var StatsPlugin = require('stats-webpack-plugin');
var CompressionPlugin = require("compression-webpack-plugin");
+var ROOT_PATH = path.resolve(__dirname, '..');
var IS_PRODUCTION = process.env.NODE_ENV === 'production';
var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
-var ROOT_PATH = path.resolve(__dirname, '..');
-
-// must match config.webpack.dev_server.port
-var DEV_SERVER_PORT;
-
-try {
- DEV_SERVER_PORT = parseInt(fs.readFileSync('../webpack_port'), 10);
-} catch (e) {
- DEV_SERVER_PORT = 3808;
-}
+var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
var config = {
context: path.join(ROOT_PATH, 'app/assets/javascripts'),