mirror of
https://github.com/sameersbn/docker-gitlab.git
synced 2026-01-18 13:58:25 +00:00
parent
c66977a738
commit
2d3435787c
@ -2,6 +2,9 @@
|
||||
|
||||
This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab.
|
||||
|
||||
**latest**
|
||||
- set default value of `DB_TYPE` to `postgres`
|
||||
|
||||
**7.14.3**
|
||||
- gitlab: upgrade to CE v.7.14.3
|
||||
|
||||
|
||||
@ -752,7 +752,7 @@ Below is the complete list of available options that can be used to customize yo
|
||||
- **SIDEKIQ_CONCURRENCY**: The number of concurrent sidekiq jobs to run. Defaults to `25`
|
||||
- **SIDEKIQ_SHUTDOWN_TIMEOUT**: Timeout for sidekiq shutdown. Defaults to `4`
|
||||
- **SIDEKIQ_MEMORY_KILLER_MAX_RSS**: Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html)
|
||||
- **DB_TYPE**: The database type. Possible values: `mysql`, `postgres`. Defaults to `mysql`.
|
||||
- **DB_TYPE**: The database type. Possible values: `mysql`, `postgres`. Defaults to `postgres`.
|
||||
- **DB_HOST**: The database server hostname. Defaults to `localhost`.
|
||||
- **DB_PORT**: The database server port. Defaults to `3306` for mysql and `5432` for postgresql.
|
||||
- **DB_NAME**: The database database name. Defaults to `gitlabhq_production`
|
||||
|
||||
@ -210,6 +210,9 @@ if [[ -z ${DB_HOST} ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# DB_TYPE defaults to postgres
|
||||
DB_TYPE=${DB_TYPE:-postgres}
|
||||
|
||||
# use default port number if it is still not set
|
||||
case ${DB_TYPE} in
|
||||
mysql) DB_PORT=${DB_PORT:-3306} ;;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user