feat(update): minor changes

This commit is contained in:
Olivier Louvignes
2018-06-12 00:53:09 +02:00
parent 7e8214ef1a
commit d9eae1d72c
3 changed files with 6 additions and 2 deletions

View File

@ -5,6 +5,7 @@ REDIS_VERSION=3-alpine
NGINX_PROXY_NETWORK_NAME=nginxproxy_default
GITLAB_HOST=gitlab.mydomain.io
REGISTRY_HOST=registry.mydomain.io
GITLAB_SSH_IP=5.6.7.8
GITLAB_SSH_PORT=22
GITLAB_TRUSTED_PROXY=172.18.0.0/16

View File

@ -10,9 +10,9 @@ services:
hostname: "${GITLAB_HOST}"
environment:
- TZ=${TZ}
- VIRTUAL_HOST=${GITLAB_HOST}
- VIRTUAL_HOST=${GITLAB_HOST},${REGISTRY_HOST}
- VIRTUAL_PORT=80
- LETSENCRYPT_HOST=${GITLAB_HOST}
- LETSENCRYPT_HOST=${GITLAB_HOST},${REGISTRY_HOST}
- LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
ports:
- ${GITLAB_SSH_IP}:${GITLAB_SSH_PORT}:22

View File

@ -11,6 +11,7 @@
##! For more details on configuring external_url see:
##! https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab
external_url 'https://${GITLAB_HOST}'
registry_external_url 'https://${REGISTRY_HOST}'
### Trusted proxies
###! Customize if you have GitLab behind a reverse proxy which is running on a
@ -55,7 +56,9 @@ redis['enable'] = false
##! **Override only if you use a reverse proxy**
##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#setting-the-nginx-listen-port
nginx['listen_port'] = 80
registry_nginx['listen_port'] = 80
##! **Override only if your reverse proxy internally communicates over HTTP**
##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#supporting-proxied-ssl
nginx['listen_https'] = false
registry_nginx['listen_https'] = false