kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Note that install knapsack later than bundle install

Browse source 
Otherwise oddly some native gems could not be found
under some circumstance. No idea why, hours wasted.
This commit is contained in:
Lin Jen-Shin 2017-03-24 05:27:02 +08:00
parent 3e1bd5570f
commit d0c44ee1e2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/prepare_build.sh
View file

@ -11,7 +11,7 @@ if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
if [ "$GITLAB_DATABASE" = 'postgresql' ]; then
sed -i 's/# host:.*/host: postgres/g' config/database.yml
else # assume it's mysql
else # Assume it's mysql
sed -i 's/username:.*/username: root/g' config/database.yml
sed -i 's/password:.*/password:/g' config/database.yml
sed -i 's/# socket:.*/host: mysql/g' config/database.yml
@ -36,6 +36,8 @@ if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
retry bundle install --without production --jobs $(nproc) --clean $FLAGS
fi
# Only install knapsack after bundle install! Otherwise oddly some native
# gems could not be found under some circumstance. No idea why, hours wasted.
retry gem install knapsack
if [ "$SETUP_DB" != "false" ]; then