xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit a41ccaa0857146e986f11360d4f2aeb3913af9a6
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Sep 12 15:45:52 2018 -0400

    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 at redhat.com>

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