From b80d20ad941fef4a51e4225b9b9e6db2861ee9b5 Mon Sep 17 00:00:00 2001
From: Clemens Lange <clemens.lange@cern.ch>
Date: Thu, 13 Feb 2020 20:25:18 +0100
Subject: [PATCH] Consistenly use shared-mounts

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69a422c..8083505 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,12 +14,11 @@ build_docker:
     - docker run -d --name cvmfs --pid=host --user 0 --privileged --restart always -v /shared-mounts:/cvmfsmounts:rshared gitlab-registry.cern.ch/vcs/cvmfs-automounter:master
   script:
     # ls /cvmfs/cms.cern.ch/ won't work, but from the container it will
-    # If you want to automount CVMFS on a new docker container add the volume config /cvmfsmounts/cvmfs:/cvmfs:rslave
-    - docker run -v /cvmfsmounts/cvmfs:/cvmfs:rslave -v $(pwd):$(pwd) -w $(pwd) --name ${CI_PROJECT_NAME} ${FROM} /bin/bash ./.gitlab/build.sh
+    # If you want to automount CVMFS on a new docker container add the volume config /shared-mounts/cvmfs:/cvmfs:rslave
+    - docker run -v /shared-mounts/cvmfs:/cvmfs:rslave -v $(pwd):$(pwd) -w $(pwd) --name ${CI_PROJECT_NAME} ${FROM} /bin/bash ./.gitlab/build.sh
     - SHA256=$(docker commit ${CI_PROJECT_NAME})
     - docker tag ${SHA256} ${TO}
     - docker push ${TO}
   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