diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-06-08 08:17:56 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-06-08 08:17:56 +0000 |
| commit | 324f8ea6aa1778fcd1bfc65f47e63d0df5ce08ed (patch) | |
| tree | c3e3c69594d67a1de93f0263ff3ba30667c0cf30 | |
| parent | b55d8c02fade229327c3347472125a0705fafeea (diff) | |
| parent | 354c4d28ee10ddb5f5a35839ef18f0d1ef0b5dae (diff) | |
| download | gitlab-ci-324f8ea6aa1778fcd1bfc65f47e63d0df5ce08ed.tar.gz | |
Merge branch 'fix-gitlab-example-docker-db' into 'master'
Fix DB configuration for Docker in GitLab CE build script example
The DB host was set to 'postgres' while the rest of the build script is
set up to work with MySQL. This caused builds to fail with:
Mysql2::Error: Unknown MySQL server host 'postgres' (25)
See merge request !126
| -rw-r--r-- | doc/examples/build_script_gitlab_ce.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/examples/build_script_gitlab_ce.md b/doc/examples/build_script_gitlab_ce.md index bfbfcdd..e14d045 100644 --- a/doc/examples/build_script_gitlab_ce.md +++ b/doc/examples/build_script_gitlab_ce.md @@ -18,7 +18,7 @@ if [ -f /.dockerinit ]; then cp config/database.yml.mysql config/database.yml sed -i 's/username:.*/username: root/g' config/database.yml sed -i 's/password:.*/password:/g' config/database.yml - sed -i 's/# socket:.*/host: postgres/g' config/database.yml + sed -i 's/# socket:.*/host: mysql/g' config/database.yml cp config/resque.yml.example config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml @@ -90,4 +90,3 @@ or ``` export LANG=en_US.UTF-8 ``` - |