diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-30 11:56:31 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-30 11:56:31 +0000 |
| commit | 16c71a3bab31ab909200fc319f04084e3931e04e (patch) | |
| tree | 6a50a5fda0145c6a2b26b799746dd9a990119ba9 | |
| parent | e489b07d2bc70654728b2c6be903cd8adf090176 (diff) | |
| parent | 213d5fb77306941c2a571138d137b398dfd421c0 (diff) | |
| download | gitlab-ce-16c71a3bab31ab909200fc319f04084e3931e04e.tar.gz | |
Merge branch 'docker-ci' into 'master'
Added missing packages required by docker builds
This fixes backup failed tests, missing commands: `pg_dump` and `mysqldump`.
See merge request !889
| -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 5525ab77435..dca5e1c5db3 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -4,7 +4,7 @@ if [ -f /.dockerinit ]; then dpkg -i phantomjs_1.9.0-1+b1_amd64.deb apt-get update -qq - apt-get install -y -qq libicu-dev libkrb5-dev cmake nodejs + apt-get install -y -qq libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client cp config/database.yml.mysql config/database.yml sed -i 's/username:.*/username: root/g' config/database.yml |