From bf0d29a5afad956d644cda48e758f380c3bddeea Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 28 May 2020 10:32:08 +0200
Subject: [PATCH] [CI] container setup fix.
---
ThirdParty/container-maker | 2 +-
scripts/ci/jobs/build_image.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index c188dfa770c..1260fd50f67 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit c188dfa770c0e299a890da523d70558b35db81f3
+Subproject commit 1260fd50f674c4c00ce719d97c5c2bad275f2765
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index aa17fe50c23..496cba9582e 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -16,11 +16,11 @@ build gcc images:
- docker login -u $OGS_CI_REGISTRY_USER -p $OGS_CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker pull $CONTAINER_GCC_IMAGE:latest || true
- python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
- --ogs off --pm system --cvode --cppcheck --docs --gcovr
+ --pm system --cvode --cppcheck --docs --gcovr
--tag $CONTAINER_GCC_IMAGE --upload
- docker pull $CONTAINER_GCC_GUI_IMAGE:latest || true
- python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
- --ogs off --pm conan --cvode --cppcheck --docs --gcovr --gui
+ --pm conan --cvode --cppcheck --docs --gcovr --gui
--tag $CONTAINER_GCC_GUI_IMAGE --upload
### global project images ###
--
GitLab