From d2f893caf9c3a3642d540969ae5df4d088611830 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 9 Feb 2017 16:32:21 +0100
Subject: [PATCH 1/2] Start webpack-dev-server directly
Starting with `npm run` creates an intermediary `npm` process under
Foreman, which prevents Foreman from shutting down webpack-dev-server.
---
Procfile.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Procfile.example b/Procfile.example
index 5f909c3..971e67f 100644
--- a/Procfile.example
+++ b/Procfile.example
@@ -14,4 +14,4 @@ rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=devel
#sshd: exec /usr/sbin/sshd -e -D -f /home/git/openssh/sshd_config
#nginx: exec nginx -p /home/git/nginx -c conf/nginx.conf
#gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9101 gitaly/bin/gitaly
-webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 support/exec-cd gitlab npm run dev-server
+webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 support/exec-cd gitlab node_modules/.bin/webpack-dev-server --config config/webpack.config.js
--
GitLab
From a75624ea835df97a8d05d7443c0ec15d4646c3c9 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 10 Feb 2017 11:11:05 +0100
Subject: [PATCH 2/2] CI debugging: cat Procfile
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 1bef057..eba81bf 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,7 @@ Procfile:
-e "s|postgres |${postgres_bin_dir}/postgres |"\
-e "s|DEV_SERVER_PORT=3808 |DEV_SERVER_PORT=${webpack_port} |"\
$@.example > $@
+ cat $@
if [ -f .vagrant_enabled ]; then \
echo "0.0.0.0" > host; \
echo "3000" > port; \
--
GitLab