From b09a329fd8b314fc48114ce15d451a18d3fcb70f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 10:31:02 +0200
Subject: [PATCH] Use ruby:2.1 and ruby:2.2 images
---
.gitlab-ci.yml | 4 ++--
scripts/prepare_build.sh | 14 ++++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 172fbaf52b6..23bc2c2f837 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 9540d7d128f..247383aa46c 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
--
GitLab