summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNejc Habjan <nejc.habjan@siemens.com>2020-09-13 23:00:28 +0200
committerNejc Habjan <nejc.habjan@siemens.com>2020-09-15 22:05:48 +0200
commit27109cad0d97114b187ce98ce77e4d7b0c7c3270 (patch)
tree5cb32c6d0700a9dc6c5eeac6fe0d71bdadac9b71 /tools
parentd4ee0a6085d391ed54d715a5ed4b0082783ca8f3 (diff)
downloadgitlab-27109cad0d97114b187ce98ce77e4d7b0c7c3270.tar.gz
chore: allow overriding docker-compose env vars for tag
Diffstat (limited to 'tools')
-rw-r--r--tools/functional/fixtures/docker-compose.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/functional/fixtures/docker-compose.yml b/tools/functional/fixtures/docker-compose.yml
index 5dd9d90..687eeaa 100644
--- a/tools/functional/fixtures/docker-compose.yml
+++ b/tools/functional/fixtures/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3'
services:
gitlab:
- image: 'gitlab/gitlab-ce:latest'
+ image: '${GITLAB_IMAGE}:${GITLAB_TAG}'
container_name: 'gitlab-test'
hostname: 'gitlab.test'
privileged: true # Just in case https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/1350