archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2025-12-08 17:36:24 +00:00
Code Issues Projects Releases Wiki Activity

Hide unused envvar DB_COLLATION

Browse Source 
MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961
and PostgreSQL doesn't support it anyway.
This commit is contained in:
Peter Leitzen 2019-10-22 10:41:14 +02:00 committed by Niclas Mietz
parent 7e86b54241
commit aa10ebcf01
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/runtime/env-defaults
View File

@ -37,7 +37,6 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000}
## DATABASE
DB_ADAPTER=${DB_ADAPTER:-postgresql}
DB_ENCODING=${DB_ENCODING:-}
DB_COLLATION=${DB_COLLATION:-}
DB_HOST=${DB_HOST:-}
DB_PORT=${DB_PORT:-}
DB_NAME=${DB_NAME:-}

4
assets/runtime/functions
View File

@ -138,11 +138,9 @@ gitlab_finalize_database_parameters() {
fi
# set default port number if not specified
DB_ENCODING=${DB_ENCODING:-unicode}
# DB_COLLATION: Not supported for postgresql and will be removed below.
DB_PORT=${DB_PORT:-5432}
DB_ENCODING=${DB_ENCODING:-unicode}
# set default user and database
DB_USER=${DB_USER:-root}