From baee1e7744e556a8162fd4f685773fbccb441c9e Mon Sep 17 00:00:00 2001
From: Clemens Lange <clemens.lange@cern.ch>
Date: Tue, 18 Feb 2020 09:46:31 +0100
Subject: [PATCH] Update base image
---
.gitlab-ci.yml | 2 +-
.gitlab/build.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8083505..d6ee720 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,5 +20,5 @@ build_docker:
- docker tag ${SHA256} ${TO}
- docker push ${TO}
variables:
- FROM: clelange/cc7-cms # Override the image specified in the Dockerfile
+ FROM: gitlab-registry.cern.ch/clange/cmssw-docker/cc7-cms:latest
TO: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}
diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index c16867e..1361535 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# exit when any command fails, but allow variables not set (no -u); verbose
+# exit when any command fails; be verbose
set -ex
# make cmsrel etc. work
--
GitLab