diff --git a/.env.sample b/.env.sample index 2a64815..d970302 100644 --- a/.env.sample +++ b/.env.sample @@ -8,6 +8,7 @@ DOMAIN=gitlab.example.com LETS_ENCRYPT_ENV=production GITLAB_CONF_VERSION=v1 +ENTRYPOINT_VERSION=v1 GITLAB_ROOT_EMAIL="gitlab_admin@example.com" SECRET_INITIAL_ROOT_PASSWORD_VERSION=v1 diff --git a/compose.yml b/compose.yml index 1bc2fad..0096438 100644 --- a/compose.yml +++ b/compose.yml @@ -9,7 +9,11 @@ services: - internal configs: - source: gitlab_conf - target: /etc/gitlab/gitlab.rb + target: /gitlab.rb + - source: entrypoint + target: /entrypoint.sh + entrypoint: + /entrypoint.sh volumes: - 'gitlabconfig:/etc/gitlab' - 'gitlablogs:/var/log/gitlab' @@ -54,6 +58,10 @@ configs: name: ${STACK_NAME}_gitlab_conf_${GITLAB_CONF_VERSION} file: gitlab.rb.tmpl template_driver: golang + entrypoint: + name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION} + file: entrypoint.sh.tmpl + template_driver: golang networks: proxy: diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl new file mode 100644 index 0000000..56ecc86 --- /dev/null +++ b/entrypoint.sh.tmpl @@ -0,0 +1,5 @@ +#!/bin/sh + +cp /gitlab.rb /etc/gitlab/gitlab.rb + +"$@" \ No newline at end of file