diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-04-05 13:07:25 +0300 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-04-05 13:18:37 +0300 |
| commit | f86edca66c2baa9fd8b0cdb0d89e961a30c78716 (patch) | |
| tree | 9679c9e77d31f05026fb3cc1c39b912d58a401c3 | |
| parent | bb51062ed76c0a831edaf885c34f62b861678784 (diff) | |
| download | gitlab-ce-f86edca66c2baa9fd8b0cdb0d89e961a30c78716.tar.gz | |
Remove unused code from the scripts/prepare_build.sh file
| -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" |