From bee3197c73e09974071e17ee5b5b39d98c824bae Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 22 May 2021 14:12:17 +0000 Subject: [PATCH 1/2] chore(deps): update gitlab/gitlab-ce docker tag to v13.12.0-ce.0 --- tools/functional/fixtures/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/functional/fixtures/.env b/tools/functional/fixtures/.env index eacfb2880..d57c43c3a 100644 --- a/tools/functional/fixtures/.env +++ b/tools/functional/fixtures/.env @@ -1,2 +1,2 @@ GITLAB_IMAGE=gitlab/gitlab-ce -GITLAB_TAG=13.11.4-ce.0 +GITLAB_TAG=13.12.0-ce.0 From 55067b791d62619a17829b392be4c9549aa49653 Mon Sep 17 00:00:00 2001 From: Nejc Habjan Date: Mon, 24 May 2021 22:39:49 +0200 Subject: [PATCH 2/2] chore(fixtures): configure token in environment, not omnibus config --- tools/functional/fixtures/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/functional/fixtures/docker-compose.yml b/tools/functional/fixtures/docker-compose.yml index a0794d6d6..134f2663f 100644 --- a/tools/functional/fixtures/docker-compose.yml +++ b/tools/functional/fixtures/docker-compose.yml @@ -11,10 +11,10 @@ services: hostname: 'gitlab.test' privileged: true # Just in case https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/1350 environment: + GITLAB_ROOT_PASSWORD: 5iveL!fe + GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN: registration-token GITLAB_OMNIBUS_CONFIG: | external_url 'http://gitlab.test' - gitlab_rails['initial_root_password'] = '5iveL!fe' - gitlab_rails['initial_shared_runners_registration_token'] = 'registration-token' registry['enable'] = false nginx['redirect_http_to_https'] = false nginx['listen_port'] = 80