diff options
Diffstat (limited to 'scripts/prepare_build.sh')
| -rw-r--r-- | scripts/prepare_build.sh | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 0950ec272a5..e80d752f09f 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -16,37 +16,21 @@ retry gem install knapsack --no-document cp config/gitlab.yml.example config/gitlab.yml sed -i 's/bin_path: \/usr\/bin\/git/bin_path: \/usr\/local\/bin\/git/' config/gitlab.yml -# Determine the database by looking at the job name. -# This would make the default database postgresql. -if [[ "${CI_JOB_NAME#*mysql}" != "$CI_JOB_NAME" ]]; then - export GITLAB_DATABASE='mysql' -else - export GITLAB_DATABASE='postgresql' -fi - -cp config/database.yml.$GITLAB_DATABASE config/database.yml +cp config/database.yml.postgresql config/database.yml -if [ -f config/database_geo.yml.$GITLAB_DATABASE ]; then - cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml +if [ -f config/database_geo.yml.postgresql ]; then + cp config/database_geo.yml.postgresql config/database_geo.yml fi # Set user to a non-superuser to ensure we test permissions 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 - sed -i 's/username: git/username: postgres/g' config/database_geo.yml - fi -else # Assume it's mysql - sed -i 's/localhost/mysql/g' config/database.yml +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/mysql/g' config/database_geo.yml - fi +if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/postgres/g' config/database_geo.yml + sed -i 's/username: git/username: postgres/g' config/database_geo.yml fi cp config/resque.yml.example config/resque.yml @@ -63,6 +47,6 @@ sed -i 's|url:.*$|url: redis://redis:6379/12|g' config/redis.shared_state.yml if [ "$SETUP_DB" != "false" ]; then setup_db -elif getent hosts postgres || getent hosts mysql; then +elif getent hosts postgres; then setup_db_user_only fi |