summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-04-10 19:09:02 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-04-10 19:15:42 +0800
commitf1e2387e2851009cf2091ab22b3d6a70a27dfa1e (patch)
tree7eaa26a95ce9c7e1a4b52bcc2da3ad4098e0b93d /scripts
parenta9945a6500351331426226efe80631f81cb832aa (diff)
downloadgitlab-ce-f1e2387e2851009cf2091ab22b3d6a70a27dfa1e.tar.gz
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/prepare_build.sh4
1 files changed, 4 insertions, 0 deletions
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