diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-13 14:32:42 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-13 14:32:42 -0600 |
| commit | a183aa3c4776121761376830d1db15caa5aa0dcc (patch) | |
| tree | 7c67f673e4a784af54f0bac44274dff6f37c9724 /scripts | |
| parent | 07e079e8dd336e76986ad001fce79ab9babb00b0 (diff) | |
| download | gitlab-ce-a183aa3c4776121761376830d1db15caa5aa0dcc.tar.gz | |
CE-EE parity for prepare_build script
This removes EE-only directives in favor of file existence checks.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prepare_build.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 75a3cea0448..18dd8dcf1f5 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -6,7 +6,7 @@ export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} export BUNDLE_INSTALL_FLAGS="--without=production --jobs=$(nproc) --path=vendor --retry=3 --quiet" if [ "$USE_BUNDLE_INSTALL" != "false" ]; then - bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check + bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi # Only install knapsack after bundle install! Otherwise oddly some native @@ -23,18 +23,30 @@ export GITLAB_DATABASE=$(echo $CI_JOB_NAME | cut -f1 -d' ' | cut -f2 -d-) # This would make the default database postgresql, and we could also use # pg to mean postgresql. if [ "$GITLAB_DATABASE" != 'mysql' ]; then - export GITLAB_DATABASE='postgresql' + export GITLAB_DATABASE='postgresql' fi cp config/database.yml.$GITLAB_DATABASE config/database.yml +if [ -f config/database_geo.yml.$GITLAB_DATABASE ]; then + cp config/database_geo.yml.$GITLAB_DATABASE 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/localhost/postgres/g' config/database.yml + + if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/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/mysql/g' config/database.yml + + if [ -f config/database_geo.yml ]; then + sed -i 's/localhost/mysql/g' config/database_geo.yml + fi fi cp config/resque.yml.example config/resque.yml @@ -50,7 +62,7 @@ cp config/redis.shared_state.yml.example config/redis.shared_state.yml sed -i 's/localhost/redis/g' config/redis.shared_state.yml if [ "$SETUP_DB" != "false" ]; then - setup_db + setup_db elif getent hosts postgres || getent hosts mysql; then - setup_db_user_only + setup_db_user_only fi |