Merge branch 'improve_makefile' into 'master'

Improve makefile

- Speed-up bundler
- Add instructions on how to run afterwards

See merge request !1

Makefile

@@ -14,7 +14,7 @@ gitlab/.git:
 gitlab-config: gitlab/config/gitlab.yml gitlab/config/database.yml gitlab/config/unicorn.rb gitlab/config/resque.yml
 gitlab/config/gitlab.yml:
-	sed "s|/home/git|${gitlab_development_root}|" gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
+	sed "s|/home/git|${gitlab_development_root}|;s|# user: git|user: $(shell whoami)|" gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
 gitlab/config/database.yml:
 	sed "s|/home/git|${gitlab_development_root}|" database.yml.example > gitlab/config/database.yml
@@ -26,7 +26,7 @@ gitlab/config/resque.yml:
 	sed "s|/home/git|${gitlab_development_root}|" redis/resque.yml.example > $@
 gitlab/.bundle:
-	cd gitlab && bundle install --without mysql --path .bundle
+	cd ${gitlab_development_root}/gitlab && bundle install --without mysql production --jobs 4
 # Set up gitlab-shell
@@ -39,11 +39,25 @@ gitlab-shell/config.yml:
 	sed "s|/home/git|${gitlab_development_root}|" gitlab-shell/config.yml.example > gitlab-shell/config.yml
 gitlab-shell/.bundle:
-	cd gitlab-shell && bundle install --path .bundle
+	cd ${gitlab_development_root}/gitlab-shell && bundle install --without production --jobs 4
 # Set up supporting services
 support-setup: Procfile redis postgresql .bundle
+	@echo ""
+	@echo "*********************************************"
+	@echo "************** Setup finished! **************"
+	@echo "*********************************************"
+	@echo "Post install instructions:"
+	@echo "start Redis & Postgresql by running he command below, and keep it running"
+	@echo "> 'bundle exec foreman start'"
+	@echo ""
+	@echo "Seed the main GitLab database"
+	@echo "> 'cd gitlab && bundle exec rake gitlab:setup'"
+	@echo ""
+	@echo "Finally, start the main GitLab rails application"
+	@echo "> 'bundle exec foreman start'"
+	@echo "***********************************"
 Procfile:
 	sed "s|/home/git|${gitlab_development_root}|g" $@.example > $@
@@ -59,4 +73,4 @@ postgresql/data/PG_VERSION:
 	initdb -E utf-8 postgresql/data
 .bundle:
-	bundle install --path .bundle
+	bundle install --jobs 4
\ No newline at end of file