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
This commit is contained in:
Dmitriy Zaporozhets 2015-06-30 11:56:31 +00:00
commit 16c71a3bab

View file

@ -4,7 +4,7 @@ if [ -f /.dockerinit ]; then
dpkg -i phantomjs_1.9.0-1+b1_amd64.deb dpkg -i phantomjs_1.9.0-1+b1_amd64.deb
apt-get update -qq 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 cp config/database.yml.mysql config/database.yml
sed -i 's/username:.*/username: root/g' config/database.yml sed -i 's/username:.*/username: root/g' config/database.yml