From f1e2387e2851009cf2091ab22b3d6a70a27dfa1e Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Mon, 10 Apr 2017 19:09:02 +0800 Subject: Use GITLAB_DATABASE: $CI_JOB_NAME[1] so that we reduce variables definitions. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26811996 --- scripts/prepare_build.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index b8d8cc2851a..2b041892eab 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -6,6 +6,10 @@ export SETUP_DB=${SETUP_DB:-true} export GITLAB_DATABASE=${GITLAB_DATABASE:-postgresql} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} +if [ "$GITLAB_DATABASE" = 'pg' ]; then + export GITLAB_DATABASE='postgresql' +fi + if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then cp config/database.yml.$GITLAB_DATABASE config/database.yml -- cgit v1.2.1