diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-24 05:27:02 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-24 05:27:02 +0800 |
| commit | d0c44ee1e2d3a747a2092d60067cd96578089fb4 (patch) | |
| tree | 668b1008bb733a5c25779fc5b908ac0cccef6132 /scripts | |
| parent | 3e1bd5570f0ca277fb82a45d83f5bf44f3663a0d (diff) | |
| download | gitlab-ce-d0c44ee1e2d3a747a2092d60067cd96578089fb4.tar.gz | |
Note that install knapsack later than bundle install
Otherwise oddly some native gems could not be found
under some circumstance. No idea why, hours wasted.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/prepare_build.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 822bb83e6c4..885b7eabba0 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -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 |