diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-27 15:42:35 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-27 15:42:35 +0100 |
| commit | 683770f35d8ef691d8bcc828aa958b3619081d37 (patch) | |
| tree | db61ef12bbbe56a21a51f2eace53d45ad8389dc2 /scripts/prepare_build.sh | |
| parent | b8ed5789c03961444fc40baca31f870b30a73766 (diff) | |
| parent | a93f7099fa2ed98746ebfb5e55322d0afb5068f8 (diff) | |
| download | gitlab-ce-683770f35d8ef691d8bcc828aa958b3619081d37.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4
Diffstat (limited to 'scripts/prepare_build.sh')
| -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 |