From 89e70e16e01d59fc5613123dca2d10b42740fe78 Mon Sep 17 00:00:00 2001
From: Clemens Lange <clemens.lange@cern.ch>
Date: Thu, 13 Feb 2020 19:57:54 +0100
Subject: [PATCH] Add changes required since GitLab 12.5
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0c034b..129dac3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,12 +2,12 @@ build_docker:
only:
- pushes
- merge_requests
- except:
- - triggers
tags:
- docker-privileged
- - docker-machine
- image: docker:latest
+ image: docker:19.03.1
+ services:
+ # To obtain a Docker daemon, request a Docker-in-Docker service
+ - docker:19.03.1-dind
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_BUILD_TOKEN $CI_REGISTRY
# Need to start the automounter for CVMFS:
@@ -22,3 +22,4 @@ build_docker:
variables:
FROM: clelange/cc7-cms # Override the image specified in the Dockerfile
TO: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}
+ DOCKER_TLS_CERTDIR: "/certs"
--
GitLab