archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

Pass {{GITLAB_INSTALL_DIR}} to gitlab-pages/config

Browse Source
This commit is contained in:
sue445 2021-07-21 09:38:37 +09:00
parent 50bad15845
commit 73dae28e31
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/runtime/config/gitlab-pages/config
View File

@ -5,4 +5,4 @@ auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
internal-gitlab-server=http://localhost:8181
api-secret-key=/home/git/gitlab/.gitlab_pages_secret
api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret

3
assets/runtime/functions
View File

@ -1792,7 +1792,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
GITLAB_PAGES_ACCESS_CLIENT_SECRET \
GITLAB_PAGES_ACCESS_REDIRECT_URI \
GITLAB_PAGES_ACCESS_SECRET \
GITLAB_PAGES_ACCESS_CONTROL_SERVER
GITLAB_PAGES_ACCESS_CONTROL_SERVER \
GITLAB_INSTALL_DIR
if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL