summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2019-02-22 11:50:05 +0100
committerMichel Dänzer <michel.daenzer@amd.com>2019-02-22 11:50:05 +0100
commit7753fd9989e280783daeee1994d019155735dee5 (patch)
tree016df3b2c65ea9bdae39f8a3a74633fc175d8ff3
parent524104e15c7169114e4fa3dd832990c58ee563a4 (diff)
gitlab: Skip the docker-in-docker step
No idea which cult's cargo I was looking at there. Cuts about a minute off the build time. Signed-off-by: Adam Jackson <ajax@redhat.com> (Cherry picked from commit a41ccaa0857146e986f11360d4f2aeb3913af9a6)
-rw-r--r--.gitlab-ci.yml12
1 files changed, 2 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d66bb0b62..092f3427f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,5 @@
-image: docker:latest
-services:
- - docker:dind
-
-before_script:
- - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
- - echo ADD . /root >> Dockerfile
- - echo WORKDIR /root >> Dockerfile
- - docker build -t withgit .
+image: nwnk/xserver-travis-rawhide:v5
job:
script:
- - docker run --volume $HOME/.ccache:/root/.ccache withgit ./test/scripts/build-travis-deps.sh
+ - ./test/scripts/build-travis-deps.sh