From 20b37e5c822df653e1e12ee2cdcf4483dfa09af1 Mon Sep 17 00:00:00 2001 From: Maikel Vlasman Date: Sun, 23 Oct 2016 13:05:28 +0200 Subject: [PATCH] Reuse GITLAB_REGISTRY_KEY_PATH and GITLAB_REGISTRY_CERT_PATH. --- assets/runtime/env-defaults | 2 ++ docs/container_registry.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 95421c9b..c80492ce 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -130,7 +130,9 @@ SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-$GITLAB_DATA_DIR/certs/dhparam.pem} SSL_VERIFY_CLIENT=${SSL_VERIFY_CLIENT:-off} SSL_CIPHERS=${SSL_CIPHERS:-'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4'} +SSL_REGISTRY_KEY_PATH=${SSL_REGISTRY_KEY_PATH:-$GITLAB_REGISTRY_KEY_PATH} SSL_REGISTRY_KEY_PATH=${SSL_REGISTRY_KEY_PATH:-$GITLAB_DATA_DIR/certs/registry.key} +SSL_REGISTRY_CERT_PATH=${SSL_REGISTRY_CERT_PATH:-$GITLAB_REGISTRY_CERT_PATH} SSL_REGISTRY_CERT_PATH=${SSL_REGISTRY_CERT_PATH:-$GITLAB_DATA_DIR/certs/registry.crt} SSL_CA_CERTIFICATES_PATH=${SSL_CA_CERTIFICATES_PATH:-$CA_CERTIFICATES_PATH} # backward compatibility diff --git a/docs/container_registry.md b/docs/container_registry.md index ad6c8634..539fe4f3 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -127,6 +127,7 @@ services: - GITLAB_REGISTRY_HOST=registry.gitlab.example.com - GITLAB_REGISTRY_PORT=5000 - GITLAB_REGISTRY_API_URL=http://registry:5000 + - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key - SSL_REGISTRY_KEY_PATH=/certs/registry.key - SSL_REGISTRY_CERT_PATH=/certs/registry.crt @@ -366,6 +367,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_ENABLED=true' \ --env 'GITLAB_REGISTRY_HOST=registry.gitlab.example.com' \ --env 'GITLAB_REGISTRY_API_URL=http://registry:5000/' \ +--env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry sameersbn/gitlab:8.13.6