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

Remove GITALY_ENABLED

Browse Source 
Since the last version Gitaly is now the way to go. So I removed this variable from the image.

Signed-off-by: solidnerd <niclas@mietz.io>
This commit is contained in:
solidnerd 2017-10-26 21:30:18 +02:00
parent 3fc8424bba
commit c570f1c196
No known key found for this signature in database
GPG Key ID: C300D44AB5469BE5
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/build/install.sh
View File

@ -329,7 +329,7 @@ directory=${GITLAB_GITALY_INSTALL_DIR}
environment=HOME=${GITLAB_HOME}
command=/usr/local/bin/gitaly ${GITLAB_GITALY_INSTALL_DIR}/config.toml
user=git
autostart={{GITALY_ENABLED}}
autostart=true
autorestart=true
stdout_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
stderr_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log

1
assets/runtime/config/gitlabhq/gitlab.yml
View File

@ -480,7 +480,6 @@ production: &base
# This setting controls whether GitLab uses Gitaly (new component
# introduced in 9.0). Eventually Gitaly use will become mandatory and
# this option will disappear.
enabled: {{GITALY_ENABLED}}
token: {{GITALY_TOKEN}}
#

1
assets/runtime/env-defaults
View File

@ -382,7 +382,6 @@ GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-}
GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-}
## Gitaly
GITALY_ENABLED=${GITALY_ENABLED:-true}
GITALY_TOKEN=${GITALY_TOKEN:-}
GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket
GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH}

7
assets/runtime/functions
View File

@ -275,14 +275,11 @@ gitlab_configure_redis() {
gitlab_configure_gitaly() {
echo "Configuring gitlab::gitaly..."
update_template /etc/supervisor/conf.d/gitaly.conf GITALY_ENABLED
update_template ${GITLAB_GITALY_CONFIG} \
GITALY_SOCKET_PATH \
GITLAB_REPOS_DIR
update_template ${GITLAB_CONFIG} \
GITALY_ENABLED \
GITALY_TOKEN
}
@ -1411,9 +1408,7 @@ install_configuration_templates() {
fi
fi
if [[ ${GITALY_ENABLED} == true ]]; then
install_template ${GITLAB_USER}: gitaly/config.toml ${GITLAB_GITALY_CONFIG}
fi
install_template ${GITLAB_USER}: gitaly/config.toml ${GITLAB_GITALY_CONFIG}
}
configure_gitlab() {