Merge branch 'test-cluster-update' into 'master'

Update docker compose setup to use networked gitlab-shell

See merge request !333

5 files changed, 24 insertions, 6 deletions

diff --git a/_support/test-cluster/README.md b/_support/test-cluster/README.md
index e1e010cf7..0da46b576 100644
--- a/_support/test-cluster/README.md
+++ b/_support/test-cluster/README.md
@@ -3,10 +3,13 @@
 This directory contains a
 [docker-compose.yml](https://docs.docker.com/compose/) and Omnibus
 GitLab configuration files to boot GitLab with multiple Gitaly servers
-behind it. This is meant for testing purposes.
+behind it. This setup is meant for testing purposes only and SHOULD NOT be used
+in production environments because it handles secrets in an unsafe way.
 
 Boot the cluster with `docker-compose up`. After some time you can log
 in to your GitLab instance at `localhost:8080`.
 
-Edit `docker-compose.yml` if you want to use a different GitLab
-version from what is currently in there.
+This template uses nightly docker images. To see what GitLab version you are
+currently running, run
+`docker-compose exec app1 grep gitlab-ce /opt/gitlab/version-manifest.txt`. To
+update to the latest nightly images run `docker-compose pull`.
diff --git a/_support/test-cluster/app1/etc-gitlab/gitlab.rb b/_support/test-cluster/app1/etc-gitlab/gitlab.rb
index 49b3fdf67..30f03892e 100644
--- a/_support/test-cluster/app1/etc-gitlab/gitlab.rb
+++ b/_support/test-cluster/app1/etc-gitlab/gitlab.rb
@@ -14,3 +14,6 @@ git_data_dirs({
   'default' => {'path' => '/mnt/data1', 'gitaly_address' => 'tcp://gitaly1:6666'},
   'gitaly2' => {'path' => '/mnt/data2', 'gitaly_address' => 'tcp://gitaly2:6666'},
 })
+
+# We have to use the same token in all hosts for internal API authentication
+gitlab_shell['secret_token'] = 'f4kef1xedt0ken'
diff --git a/_support/test-cluster/docker-compose.yml b/_support/test-cluster/docker-compose.yml
index 1544af567..12e392196 100644
--- a/_support/test-cluster/docker-compose.yml
+++ b/_support/test-cluster/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   app1:
-    image: gitlab/gitlab-ce:9.5.3-ce.0
+    image: gitlab/gitlab-ce:nightly
     ports:
       - "8080:80"
       - "2222:22"
@@ -13,14 +13,14 @@ services:
       - ./gitaly1/data:/mnt/data1
       - ./gitaly2/data:/mnt/data2
   gitaly1:
-    image: gitlab/gitlab-ce:9.5.3-ce.0
+    image: gitlab/gitlab-ce:nightly
     expose:
       - 6666
     volumes:
       - ./gitaly1/data:/var/opt/gitlab/git-data
       - ./gitaly1/etc-gitlab:/etc/gitlab
   gitaly2:
-    image: gitlab/gitlab-ce:9.5.3-ce.0
+    image: gitlab/gitlab-ce:nightly
     expose:
       - 6666
     volumes:
diff --git a/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb b/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb
index 258dfcb04..68b317ccc 100644
--- a/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb
+++ b/_support/test-cluster/gitaly1/etc-gitlab/gitlab.rb
@@ -20,3 +20,9 @@ gitlab_rails['auto_migrate'] = false
 
 gitlab_rails['redis_host'] = 'app1'
 gitlab_rails['redis_port'] = 6379
+
+# Use the remote internal API
+gitlab_rails['internal_api_url'] = 'http://app1:80'
+
+# We have to use the same token in all hosts for internal API authentication
+gitlab_shell['secret_token'] = 'd07589078736b802db1b8aae2e61d8ba694c15837a7a015909c34b3f456417c231fffdb21352052620f9539c77a4ffb5d7c7050eb14d5f336585e9796df7bc1e'
diff --git a/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb b/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb
index dff87a391..1e660273e 100644
--- a/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb
+++ b/_support/test-cluster/gitaly2/etc-gitlab/gitlab.rb
@@ -23,3 +23,9 @@ gitlab_rails['auto_migrate'] = false
 
 gitlab_rails['redis_host'] = 'app1'
 gitlab_rails['redis_port'] = 6379
+
+# Use the remote internal API
+gitlab_rails['internal_api_url'] = 'http://app1:80'
+
+# We have to use the same token in all hosts for internal API authentication
+gitlab_shell['secret_token'] = 'd07589078736b802db1b8aae2e61d8ba694c15837a7a015909c34b3f456417c231fffdb21352052620f9539c77a4ffb5d7c7050eb14d5f336585e9796df7bc1e'