diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-09-07 20:51:57 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2017-09-11 23:57:23 +0300 |
| commit | 2989f7ea9cdb000a947ad3503113d7c7bb1bc2c4 (patch) | |
| tree | ce068fa480b64093c1b3e3af429929792801a2df | |
| parent | 5cfce5391ef0a9eca5929752d6e16fbd8ca18c84 (diff) | |
Use nightlies for the test-cluster docker mancihes
| -rw-r--r-- | _support/test-cluster/README.md | 6 | ||||
| -rw-r--r-- | _support/test-cluster/docker-compose.yml | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/_support/test-cluster/README.md b/_support/test-cluster/README.md index 7ceb43049..0da46b576 100644 --- a/_support/test-cluster/README.md +++ b/_support/test-cluster/README.md @@ -9,5 +9,7 @@ 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/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: |