Commit 5018bdcd authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'make-prepare-build-sh-compat' into 'master'

Remove bashism from scripts/prepare_build.sh

Make `scripts/prepare_build.sh` an sh, rather than bash, script

Write once, run everywhere. Even alpine.

See merge request !7561
parents 220c258c c3adf40f
#!/bin/bash #!/bin/sh
retry() { retry() {
if eval "$@"; then if eval "$@"; then
...@@ -24,11 +24,12 @@ if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then ...@@ -24,11 +24,12 @@ if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then
cp config/resque.yml.example config/resque.yml cp config/resque.yml.example config/resque.yml
sed -i 's/localhost/redis/g' config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml
export FLAGS=(--path vendor --retry 3 --quiet) export FLAGS="--path vendor --retry 3 --quiet"
else else
export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin rnd=$(awk 'BEGIN { srand() ; printf("%d\n",rand()*5) }')
export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/bin"
cp config/database.yml.mysql config/database.yml cp config/database.yml.mysql config/database.yml
sed "s/username\:.*$/username\: runner/" -i config/database.yml sed "s/username\:.*$/username\: runner/" -i config/database.yml
sed "s/password\:.*$/password\: 'password'/" -i config/database.yml sed "s/password\:.*$/password\: 'password'/" -i config/database.yml
sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml sed "s/gitlabhq_test/gitlabhq_test_$rnd/" -i config/database.yml
fi fi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment