diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 172fbaf52b69a693d1103ac0edc561de8680fe63..23bc2c2f8370167b702526f30ed47e63ad83adfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1 +image: "ruby:2.1" services: - mysql:latest @@ -116,7 +116,7 @@ spinach 9 10: *knapsack .knapsack-ruby22: &knapsack-ruby22 <<: *knapsack - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.2 + image: "ruby:2.2" only: - master cache: diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 9540d7d128f209472dec915b1803f788a97946f9..247383aa46c6423486d9f864b6908a24129b27e1 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -12,6 +12,20 @@ retry() { } if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then + mkdir -p vendor + + # Install phantomjs package + pushd vendor + if [ ! -e phantomjs_1.9.8-0jessie_amd64.deb ]; then + wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb + fi + dpkg -i phantomjs_1.9.8-0jessie_amd64.deb + popd + + # Try to install packages + retry 'apt-get update -yqqq; apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \ + 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 sed -i 's/password:.*/password:/g' config/database.yml