Merge branch 'webpack' into 'master'

Added webpack to Procfile

See merge request !237

.gitignore

@@ -26,6 +26,7 @@
 /.vagrant_enabled
 /host
 /port
+/webpack_port
 /.ruby-version
 /.ruby-gemset
 /localhost.*
@@ -44,6 +45,7 @@
 /nginx/uwsgi_temp
 /.gitlab-shell-bundle
 /.gitlab-bundle
+/.gitlab-npm
 /gem/*.gem
 /gitlab-runner-config.toml
 /.gdk-install-root

CHANGELOG.md

@@ -4,6 +4,10 @@ This Changelog tracks major changes to the GitLab Development Kit,
 such as dependency updates (those not handled by Bundler) and new
 features.
+## 2017-02-01
+
+- Add webpack process to Procfile configure it within gitlab.yml !237
+
 ## 2016-10-31
 - Add root check to catch root move problems. Requires gem 0.2.3 or

Makefile

@@ -13,6 +13,7 @@ port = $(shell cat port 2>/dev/null)
 username = $(shell whoami)
 sshd_bin = $(shell which sshd)
 git_bin = $(shell which git)
+webpack_port = $(shell cat webpack_port 2>/dev/null || echo '3808')
 all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup support-setup gitaly-setup
@@ -29,7 +30,7 @@ gitlab/config/gitlab.yml:
 	sed -e "s|/home/git|${gitlab_development_root}|"\
 	  -e "s|/usr/bin/git|${git_bin}|"\
 	  gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
-	port=${port} support/edit-gitlab.yml gitlab/config/gitlab.yml
+	port=${port} webpack_port=${webpack_port} support/edit-gitlab.yml gitlab/config/gitlab.yml
 gitlab/config/database.yml:
 	sed "s|/home/git|${gitlab_development_root}|" database.yml.example > gitlab/config/database.yml
@@ -142,9 +143,10 @@ support-setup: .ruby-version foreman Procfile redis postgresql openssh-setup ngi
 Procfile:
 	sed -e "s|/home/git|${gitlab_development_root}|g"\
-      -e "s|/usr/sbin/sshd|${sshd_bin}|"\
-	  -e "s|postgres |${postgres_bin_dir}/postgres |"\
-	  $@.example > $@
+		-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} |"\
+		$@.example > $@
 	if [ -f .vagrant_enabled ]; then \
 		echo "0.0.0.0" > host; \
 		echo "3000" > port; \

Procfile.example

@@ -14,3 +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

doc/set-up-gdk.md

@@ -63,6 +63,7 @@ gem install gitlab-development-kit
 gdk init gdk-ee
 cd gdk-ee
 echo 3001 > port
+echo 3809 > webpack_port
 gdk install gitlab_repo=https://gitlab.com/gitlab-org/gitlab-ee.git
 ```

run

@@ -50,7 +50,7 @@ foreman_start() {
 }
 db() {
-  foreman_start -c all=0,redis=1,postgresql=1,openldap=1,influxdb=1
+  foreman_start -c all=0,redis=1,postgresql=1,openldap=1,influxdb=1,webpack=1
 }
 app() {

support/edit-gitlab.yml

@@ -12,5 +12,12 @@ a
     ssh_port: 2222
     ssh_host: localhost
 .
+/  webpack:/
+a
+    dev_server:
+      enabled: true
+      host: localhost
+      port: ${webpack_port:-3808}
+.
 wq
 EOF