[WIP] First try to support both CE and EE in gdk

I tested it on a fresh installation.

• CE and EE are stored in the ce and ee subdirs respectively, each having its own repositories, gitlab-shell and authorized_keys
• One postgres and redis instance
• I removed some references to gitlab-runner as it was using the deprecated one.

Caveats

• currently it is duplicated code :/ but works
• gitlab-workhorse in the Procfile uses ce/gitlab/public as the document root dir, which seems to work with EE as well

Tree structure

.
├── Gemfile
├── Gemfile.lock
├── LICENSE
├── Makefile
├── Procfile
├── Procfile.example
├── README.md
├── Vagrantfile
├── ce
│   ├── gitlab
│   ├── gitlab-shell
│   └── repositories
├── database.yml.example
├── docker
│   ├── Dockerfile
│   ├── README.md
│   └── assets
├── ee
│   ├── gitlab
│   ├── gitlab-shell
│   └── repositories
├── gitlab-openldap
│   ├── Makefile
│   ├── README.md
│   ├── bin
│   ├── bootstrap.ldif
│   ├── etc
│   ├── frontend.alt.example.com.ldif
│   ├── frontend.example.com.ldif
│   ├── include
│   ├── lib
│   ├── libexec
│   ├── openldap-2.4.40
│   ├── openldap-2.4.40.tgz
│   ├── run-slapd
│   ├── run-slapd-alt
│   ├── sbin
│   ├── share
│   ├── slapd.d
│   └── var
├── gitlab-workhorse
│   ├── CHANGELOG
│   ├── LICENSE
│   ├── Makefile
│   ├── README.md
│   ├── VERSION
│   ├── archive.go
│   ├── artifacts.go
│   ├── authorization.go
│   ├── authorization_test.go
│   ├── deploy_page.go
│   ├── deploy_page_test.go
│   ├── development.go
│   ├── development_test.go
│   ├── error_pages.go
│   ├── error_pages_test.go
│   ├── git-http.go
│   ├── gitlab-workhorse
│   ├── handlers.go
│   ├── handlers_test.go
│   ├── helpers.go
│   ├── helpers_test.go
│   ├── lfs.go
│   ├── logging.go
│   ├── main.go
│   ├── main_test.go
│   ├── proxy.go
│   ├── proxy_test.go
│   ├── sendfile.go
│   ├── sendfile_test.go
│   ├── servefile.go
│   ├── servefile_test.go
│   ├── support
│   ├── test
│   ├── uploads.go
│   ├── uploads_test.go
│   └── upstream.go
├── gitlab.socket
├── postgresql
│   └── data
├── redis
│   ├── redis.conf
│   ├── redis.conf.example
│   ├── redis.socket
│   └── resque.yml.example
└── support
    └── edit-gitlab.yml

28 directories, 59 files

cc @jacobvosmaer @sytses @dzaporozhets

Makefile

@@ -10,6 +10,7 @@ all: ce ee gitlab-workhorse-setup support-setup
 #-------------------------------
 # Set up the GitLab CE Rails app
+#-------------------------------
 ce: ce/gitlab-setup ce/gitlab-shell-setup
@@ -41,8 +42,6 @@ ce/gitlab/config/resque.yml:
 ce/gitlab/.bundle:
 	cd ${gitlab_development_root}/ce/gitlab && bundle install --without mysql production --jobs 4
-# Set up gitlab-shell
-
 ce/gitlab-shell-setup: ce/gitlab-shell/.git ce/gitlab-shell/config.yml ce/gitlab-shell/.bundle
 ce/gitlab-shell/.git:
@@ -60,6 +59,7 @@ ce/gitlab-shell/.bundle:
 #-------------------------------
 # Set up the GitLab EE Rails app
+#-------------------------------
 ee: ee/gitlab-setup ee/gitlab-shell-setup
@@ -91,8 +91,6 @@ ee/gitlab/config/resque.yml:
 ee/gitlab/.bundle:
 	cd ${gitlab_development_root}/ee/gitlab && bundle install --without mysql production --jobs 4
-# Set up gitlab-shell
-
 ee/gitlab-shell-setup: ee/gitlab-shell/.git ee/gitlab-shell/config.yml ee/gitlab-shell/.bundle
 ee/gitlab-shell/.git:
@@ -108,25 +106,17 @@ ee/gitlab-shell/config.yml:
 ee/gitlab-shell/.bundle:
 	cd ${gitlab_development_root}/ee/gitlab-shell && bundle install --without production --jobs 4
-#-------------------------------
-# Set up gitlab-runner
-gitlab-runner-setup: gitlab-runner/.git gitlab-runner/.bundle
-gitlab-runner/.git:
-	git clone ${gitlab_runner_repo} gitlab-runner
-gitlab-runner/.bundle:
-	cd ${gitlab_development_root}/gitlab-runner && bundle install --jobs 4
-gitlab-runner-clean:
-	rm -rf gitlab-runner
-
-# Update gitlab, gitlab-shell and gitlab-runner
-
-update: ce/gitlab-update ce/gitlab-shell-update gitlab-runner-update gitlab-workhorse-update
-
-ce/gitlab-update: gitlab/.git/pull
+# ------------------------------------------------
+# Update gitlab, gitlab-shell and gitlab-workhorse
+# ------------------------------------------------
+update: ce/update ee/update gitlab-workhorse-update
+ce/update: ce/gitlab-update ce/gitlab-shell-update
+ee/update: ee/gitlab-update ee/gitlab-shell-update
+ce/gitlab-update: ce/gitlab/.git/pull
 	cd ${gitlab_development_root}/ce/gitlab && \
 	bundle install --without mysql production --jobs 4 && \
 	bundle exec rake db:migrate
@@ -135,10 +125,6 @@ ce/gitlab-shell-update: ce/gitlab-shell/.git/pull
 	cd ${gitlab_development_root}/ce/gitlab-shell && \
 	bundle install --without production --jobs 4
-gitlab-runner-update: gitlab-runner/.git/pull
-	cd ${gitlab_development_root}/gitlab-runner && \
-	bundle install
-
 ce/gitlab/.git/pull:
 	cd ${gitlab_development_root}/ce/gitlab && \
 		git checkout -- Gemfile.lock db/schema.rb && \
@@ -150,10 +136,51 @@ ce/gitlab-shell/.git/pull:
 		git stash && git checkout master && \
 		git pull --ff-only
+ee/gitlab-update: ce/gitlab/.git/pull
+	cd ${gitlab_development_root}/ee/gitlab && \
+	bundle install --without mysql production --jobs 4 && \
+	bundle exec rake db:migrate
+
+ee/gitlab-shell-update: ce/gitlab-shell/.git/pull
+	cd ${gitlab_development_root}/ee/gitlab-shell && \
+	bundle install --without production --jobs 4
+
+ee/gitlab/.git/pull:
+	cd ${gitlab_development_root}/ee/gitlab && \
+		git checkout -- Gemfile.lock db/schema.rb && \
+		git stash && git checkout master && \
+		git pull --ff-only
+
+ee/gitlab-shell/.git/pull:
+	cd ${gitlab_development_root}/ee/gitlab-shell && \
+		git stash && git checkout master && \
+		git pull --ff-only
+
+#---------------------
+# Set up gitlab-runner
+#---------------------
+
+gitlab-runner-setup: gitlab-runner/.git gitlab-runner/.bundle
+
+gitlab-runner/.git:
+	git clone ${gitlab_runner_repo} gitlab-runner
+
+gitlab-runner/.bundle:
+	cd ${gitlab_development_root}/gitlab-runner && bundle install --jobs 4
+
+gitlab-runner-clean:
+	rm -rf gitlab-runner
+
+gitlab-runner-update: gitlab-runner/.git/pull
+	cd ${gitlab_development_root}/gitlab-runner && \
+	bundle install
+
 gitlab-runner/.git/pull:
 	cd ${gitlab_development_root}/gitlab-runner && git pull --ff-only
+# --------------------------
 # Set up supporting services
+# --------------------------
 support-setup: Procfile redis postgresql .bundle
 	@echo ""