summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeLutin <gabster@lelutin.ca>2017-06-22 13:11:01 +0000
committerLeLutin <gabster@lelutin.ca>2017-06-22 13:11:01 +0000
commitf3db3309f3a3fc5ee0f621593ed83805798f7890 (patch)
tree148db0a87c34663b0d30160c2ff184539c81a2fe
parent3a8b7f42f7e45a78a8a1465be451589963b08bad (diff)
parentc21d3592ace74cd10e84f3cf712bea719805e1be (diff)
Merge branch 'custom_dockerimage' into 'master'
Use official ruby docker image See merge request !63
-rw-r--r--.gitlab-ci.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49bf2e3..05430fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,5 @@
-image: leapcode/ruby
+image: ruby:2.1
before_script:
- - "[ -d /var/cache/gitlab-runner ] || sudo mkdir /var/cache/gitlab-runner"
- - sudo chown cirunner:cirunner -R /var/cache/gitlab-runner
- bundle install --jobs $(nproc) --without system_tests --path=/var/cache/gitlab-runner/ "${FLAGS[@]}"
.job_template: &job_definition
@@ -39,4 +37,3 @@ test:puppet4x:
PUPPET_VERSION: "> 4"
FACTER_VERSION: '> 2'
<<: *job_definition
-