Skip to content
Snippets Groups Projects
Commit d5861558 authored by Eric Eastwood's avatar Eric Eastwood
Browse files

Add option to disable webpack dev server livereload

parent bbac5647
No related branches found
No related tags found
1 merge request!254Add option to disable webpack dev server livereload
Pipeline #
Loading
Loading
@@ -27,6 +27,7 @@
/host
/port
/webpack_port
/webpack_livereload
/.ruby-version
/.ruby-gemset
/localhost.*
Loading
Loading
Loading
Loading
@@ -14,6 +14,8 @@ username = $(shell whoami)
sshd_bin = $(shell which sshd)
git_bin = $(shell which git)
webpack_port = $(shell cat webpack_port 2>/dev/null || echo '3808')
# We count any existance as true
webpack_livereload = $(shell cat webpack_livereload 2>/dev/null || echo 'true')
 
all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup support-setup gitaly-setup
 
Loading
Loading
@@ -146,6 +148,7 @@ Procfile:
-e "s|/usr/sbin/sshd|${sshd_bin}|"\
-e "s|postgres |${postgres_bin_dir}/postgres |"\
-e "s|DEV_SERVER_PORT=3808 |DEV_SERVER_PORT=${webpack_port} |"\
-e "s|DEV_SERVER_LIVERELOAD=true |DEV_SERVER_LIVERELOAD=${webpack_livereload} |"\
$@.example > $@
if [ -f .vagrant_enabled ]; then \
echo "0.0.0.0" > host; \
Loading
Loading
Loading
Loading
@@ -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 DEV_SERVER_LIVERELOAD=true support/exec-cd gitlab npm run dev-server
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment