From 24ae89f5c435f0e1b59a06ec94ba10e4615c1c19 Mon Sep 17 00:00:00 2001 From: marlon Date: Wed, 2 Oct 2024 16:51:07 -0400 Subject: [PATCH] add runner_token secret --- .env.sample | 1 + compose.yml | 5 +++++ gitlab.rb.tmpl | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index d970302..22477aa 100644 --- a/.env.sample +++ b/.env.sample @@ -12,6 +12,7 @@ ENTRYPOINT_VERSION=v1 GITLAB_ROOT_EMAIL="gitlab_admin@example.com" SECRET_INITIAL_ROOT_PASSWORD_VERSION=v1 +SECRET_RUNNER_TOKEN_VERSION=v1 SSO=false ## Authentik Configuration diff --git a/compose.yml b/compose.yml index dbb081c..90c43e8 100644 --- a/compose.yml +++ b/compose.yml @@ -34,9 +34,11 @@ services: #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "backupbot.backup=true" - "backupbot.backup.path=/etc/gitlab/,/var/log/gitlab/,/var/opt/gitlab/" + - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-180}" - "coop-cloud.${STACK_NAME}.version=1.0.0+15.8.0" secrets: - initial_root_password + - runner_token healthcheck: test: ["CMD", "curl", "-f", "http://localhost"] interval: 30s @@ -48,6 +50,9 @@ secrets: initial_root_password: external: true name: ${STACK_NAME}_initial_root_password_${SECRET_INITIAL_ROOT_PASSWORD_VERSION} + runner_token: + external: true + name: ${STACK_NAME}_runner_token_${SECRET_RUNNER_TOKEN_VERSION} volumes: gitlabconfig: diff --git a/gitlab.rb.tmpl b/gitlab.rb.tmpl index a5eec80..6282e5a 100644 --- a/gitlab.rb.tmpl +++ b/gitlab.rb.tmpl @@ -713,7 +713,7 @@ gitlab_rails['omniauth_providers'] = [ ####! **Only applicable on initial setup, changing these settings after database ####! is created and seeded won't yield any change.** gitlab_rails['initial_root_password'] = "{{ secret "initial_root_password" }}" -# gitlab_rails['initial_shared_runners_registration_token'] = "token" +gitlab_rails['initial_shared_runners_registration_token'] = "{{ secret "runner_token" }}" #### Toggle if root password should be printed to STDOUT during initialization # gitlab_rails['display_initial_root_password'] = false