diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-28 15:55:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-06-28 15:55:54 +0000 |
| commit | 7c38c0b4b2e43ae86ca32ea3363707e89544152f (patch) | |
| tree | 3c56ac3ef0a25368929a6d9453ff92ccc8955ddc /scripts/prepare_build.sh | |
| parent | fd5772a8ff96e576a640edcc8dc49fd8625ab002 (diff) | |
| download | gitlab-ce-7c38c0b4b2e43ae86ca32ea3363707e89544152f.tar.gz | |
Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"
This reverts merge request !30031
Diffstat (limited to 'scripts/prepare_build.sh')
| -rw-r--r-- | scripts/prepare_build.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index c1cade0a820..9b0d5d4f719 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -35,7 +35,6 @@ sed -i 's/username: root/username: gitlab/g' config/database.yml if [ "$GITLAB_DATABASE" = 'postgresql' ]; then sed -i 's/localhost/postgres/g' config/database.yml - sed -i 's/username: git/username: postgres/g' config/database.yml if [ -f config/database_geo.yml ]; then sed -i 's/localhost/postgres/g' config/database_geo.yml @@ -49,16 +48,16 @@ else # Assume it's mysql fi cp config/resque.yml.example config/resque.yml -sed -i 's|url:.*$|url: redis://redis:6379|g' config/resque.yml +sed -i 's/localhost/redis/g' config/resque.yml cp config/redis.cache.yml.example config/redis.cache.yml -sed -i 's|url:.*$|url: redis://redis:6379/10|g' config/redis.cache.yml +sed -i 's/localhost/redis/g' config/redis.cache.yml cp config/redis.queues.yml.example config/redis.queues.yml -sed -i 's|url:.*$|url: redis://redis:6379/11|g' config/redis.queues.yml +sed -i 's/localhost/redis/g' config/redis.queues.yml cp config/redis.shared_state.yml.example config/redis.shared_state.yml -sed -i 's|url:.*$|url: redis://redis:6379/12|g' config/redis.shared_state.yml +sed -i 's/localhost/redis/g' config/redis.shared_state.yml if [ "$SETUP_DB" != "false" ]; then setup_db |