-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Temporary remove
geo
from config/database.yml
- Loading branch information
Showing
2 changed files
with
105 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
# HINT: This file is identical to the corresponding configuration file from the | ||
# upstream repository, where the additional defined entries for `geo` had to be | ||
# removed. Otherwise, it is not possible to build the image, since the build | ||
# will fail with the error message: | ||
# | ||
# > rake aborted! | ||
# > ERROR: This installation of GitLab uses unsupported database names in 'config/database.yml': geo. The only supported ones are main, ci. | ||
# | ||
# This adjustment is hopefully only a temporary workaround (see | ||
# <https://github.com/sameersbn/docker-gitlab/pull/2596>). | ||
|
||
# | ||
# PRODUCTION | ||
# | ||
production: | ||
main: | ||
adapter: postgresql | ||
encoding: unicode | ||
database: gitlabhq_production | ||
username: git | ||
password: "secure password" | ||
host: localhost | ||
# load_balancing: | ||
# hosts: | ||
# - host1.example.com | ||
# - host2.example.com | ||
# discover: | ||
# nameserver: 1.2.3.4 | ||
# port: 8600 | ||
# record: secondary.postgresql.service.consul | ||
# interval: 300 | ||
# geo: | ||
# adapter: postgresql | ||
# encoding: unicode | ||
# database: gitlabhq_geo_production | ||
# username: git | ||
# password: "secure password" | ||
# host: localhost | ||
|
||
# | ||
# Development specific | ||
# | ||
development: | ||
main: | ||
adapter: postgresql | ||
encoding: unicode | ||
database: gitlabhq_development | ||
username: postgres | ||
password: "secure password" | ||
host: localhost | ||
variables: | ||
statement_timeout: 15s | ||
# geo: | ||
# adapter: postgresql | ||
# encoding: unicode | ||
# database: gitlabhq_geo_development | ||
# username: postgres | ||
# password: "secure password" | ||
# host: localhost | ||
|
||
# | ||
# Staging specific | ||
# | ||
staging: | ||
main: | ||
adapter: postgresql | ||
encoding: unicode | ||
database: gitlabhq_staging | ||
username: git | ||
password: "secure password" | ||
host: localhost | ||
# geo: | ||
# adapter: postgresql | ||
# encoding: unicode | ||
# database: gitlabhq_geo_staging | ||
# username: git | ||
# password: "secure password" | ||
# host: localhost | ||
|
||
# Warning: The database defined as "test" will be erased and | ||
# re-generated from your development database when you run "rake". | ||
# Do not set this db to the same as development or production. | ||
test: &test | ||
main: | ||
adapter: postgresql | ||
encoding: unicode | ||
database: gitlabhq_test | ||
username: postgres | ||
password: | ||
host: localhost | ||
prepared_statements: false | ||
variables: | ||
statement_timeout: 15s | ||
# geo: | ||
# adapter: postgresql | ||
# encoding: unicode | ||
# database: gitlabhq_geo_test | ||
# username: postgres | ||
# password: | ||
# host: localhost |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters