diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-01-25 09:59:53 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-01-25 09:59:53 +0000 |
| commit | b6600debd036519bd23a3612bd1f2dc0034e4470 (patch) | |
| tree | 61451d826050604b1076040ff368a3abf47b7eb9 | |
| parent | 0f2a906211dcbf4978b465d342521dda14ade729 (diff) | |
| parent | 25bde645d8fb0176ccc78e257ac876f667c857b9 (diff) | |
| download | gitlab-ce-b6600debd036519bd23a3612bd1f2dc0034e4470.tar.gz | |
Merge branch 'install-unzip' into 'master'
Install unzip in build environment [ci skip]
See merge request !2593
| -rwxr-xr-x | scripts/prepare_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index b5d15847bca..5987988dc8e 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -10,7 +10,7 @@ if [ -f /.dockerinit ]; then apt-get update -qq apt-get -o dir::cache::archives="/cache/apt" install -y -qq --force-yes \ - libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client + libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip cp config/database.yml.mysql config/database.yml sed -i 's/username:.*/username: root/g' config/database.yml |