diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-11 20:01:39 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-11 20:01:39 +0000 |
| commit | 40991fc3ce55bbfa87b6ed56515dcceb1e0e8dae (patch) | |
| tree | fdcaa7a99418411f3ef333106bd2d77879e007d7 /scripts | |
| parent | 85cfde8332d9d5d3280fcb0b9de8d56de2d29ed4 (diff) | |
| parent | 069c54a7d7a1d1d6ec1dc48c4212139eff6735df (diff) | |
| download | gitlab-ce-docs-topic-auth.tar.gz | |
fix conflictdocs-topic-auth
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/prepare_build.sh | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 6e3f76b8399..6cacb81b8bc 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -15,21 +15,12 @@ retry() { return 1 } -if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then - cp config/database.yml.mysql config/database.yml - 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 +cp config/database.yml.mysql config/database.yml +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 - cp config/resque.yml.example config/resque.yml - sed -i 's/localhost/redis/g' config/resque.yml +cp config/resque.yml.example config/resque.yml +sed -i 's/localhost/redis/g' config/resque.yml - export FLAGS="--path vendor --retry 3 --quiet" -else - 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 - sed "s/username\:.*$/username\: runner/" -i config/database.yml - sed "s/password\:.*$/password\: 'password'/" -i config/database.yml - sed "s/gitlabhq_test/gitlabhq_test_$rnd/" -i config/database.yml -fi +export FLAGS="--path vendor --retry 3 --quiet" |