Commit b09a329f authored by Kamil Trzcinski's avatar Kamil Trzcinski

Use ruby:2.1 and ruby:2.2 images

parent 0b4981e7
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1 image: "ruby:2.1"
services: services:
- mysql:latest - mysql:latest
...@@ -116,7 +116,7 @@ spinach 9 10: *knapsack ...@@ -116,7 +116,7 @@ spinach 9 10: *knapsack
.knapsack-ruby22: &knapsack-ruby22 .knapsack-ruby22: &knapsack-ruby22
<<: *knapsack <<: *knapsack
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.2 image: "ruby:2.2"
only: only:
- master - master
cache: cache:
......
...@@ -12,6 +12,20 @@ retry() { ...@@ -12,6 +12,20 @@ retry() {
} }
if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then 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 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
sed -i 's/password:.*/password:/g' config/database.yml sed -i 's/password:.*/password:/g' config/database.yml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment