mirror of
https://github.com/sameersbn/docker-gitlab.git
synced 2026-01-25 14:08:09 +00:00
gitlab-workhorse: upgrade to v0.5.1
This commit is contained in:
parent
addf64afbb
commit
a541669f36
@ -8,6 +8,7 @@ This file only reflects the changes that are made in this image. Please refer to
|
||||
- renamed config `GITLAB_HTTPS_HSTS_ENABLED` to `NGINX_HSTS_ENABLED`
|
||||
- renamed config `GITLAB_HTTPS_HSTS_MAXAGE` to `NGINX_HSTS_MAXAGE`
|
||||
- renamed config `GITLAB_BACKUPS` to `GITLAB_BACKUPS_SCHEDULE`
|
||||
- gitlab-workhorse: upgrade to v0.5.1
|
||||
|
||||
**8.2.3**
|
||||
- fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
|
||||
|
||||
@ -3,7 +3,7 @@ MAINTAINER sameer@damagehead.com
|
||||
|
||||
ENV GITLAB_VERSION=8.2.3 \
|
||||
GITLAB_SHELL_VERSION=2.6.8 \
|
||||
GITLAB_WORKHORSE_VERSION=0.4.2 \
|
||||
GITLAB_WORKHORSE_VERSION=0.5.1 \
|
||||
GITLAB_USER="git" \
|
||||
GITLAB_HOME="/home/git" \
|
||||
GITLAB_LOG_DIR="/var/log/gitlab" \
|
||||
|
||||
@ -239,7 +239,9 @@ command=${GITLAB_WORKHORSE_INSTALL_DIR}/gitlab-workhorse
|
||||
-listenUmask 0
|
||||
-listenNetwork unix
|
||||
-listenAddr ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab-workhorse.socket
|
||||
-authBackend http://127.0.0.1:8080
|
||||
-authBackend http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
|
||||
-authSocket ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket
|
||||
-documentRoot ${GITLAB_INSTALL_DIR}/public
|
||||
user=git
|
||||
autostart=true
|
||||
autorestart=true
|
||||
|
||||
@ -243,6 +243,11 @@ gitlab_configure_redis() {
|
||||
REDIS_PORT
|
||||
}
|
||||
|
||||
gitlab_configure_gitlab_workhorse() {
|
||||
echo "Configuring gitlab::gitlab-workhorse..."
|
||||
update_template /etc/supervisor/conf.d/gitlab-workhorse.conf GITLAB_RELATIVE_URL_ROOT
|
||||
}
|
||||
|
||||
gitlab_configure_unicorn() {
|
||||
echo "Configuring gitlab::unicorn..."
|
||||
if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
|
||||
@ -1011,6 +1016,7 @@ configure_gitlab() {
|
||||
gitlab_configure_redis
|
||||
gitlab_configure_secrets
|
||||
gitlab_configure_sidekiq
|
||||
gitlab_configure_gitlab_workhorse
|
||||
gitlab_configure_unicorn
|
||||
gitlab_configure_timezone
|
||||
gitlab_configure_rack_attack
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user