summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-01-23 21:08:41 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-01-23 21:08:41 +0000
commit3ef59c8de0f48ad3b58dc3677fde396dd711d1e0 (patch)
tree38524b0d3eb18db1102a7a025c3c24f93ed00d4a
parentdc78ee4e8b4911edf04949e2aa036997623d60ae (diff)
parent2c28c11df5496dac4804c2dedcb27c51ca50483e (diff)
downloadgitlab-ce-3ef59c8de0f48ad3b58dc3677fde396dd711d1e0.tar.gz
Merge branch 'forcefully-install-apt-packages' into 'master'
Forcefully install apt packages See merge request !2577
-rwxr-xr-xscripts/prepare_build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index fb648d27621..b5d15847bca 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -9,7 +9,7 @@ if [ -f /.dockerinit ]; then
dpkg -i /cache/phantomjs_1.9.8-0jessie_amd64.deb
apt-get update -qq
- apt-get -o dir::cache::archives="/cache/apt" install -y -qq \
+ apt-get -o dir::cache::archives="/cache/apt" install -y -qq --force-yes \
libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client
cp config/database.yml.mysql config/database.yml