From 1732de15fa00b74be4ac8d581481fde1b01141be Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 18 May 2020 14:41:40 +0200
Subject: [PATCH] [CI] Build helper docker images on master only.
---
.gitlab-ci.yml | 4 ++--
scripts/ci/jobs/build_image.yml | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b393a6e3897..d47cfc6667c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,8 @@ variables:
# Docker image names
CONTAINER_GCC_IMAGE: $CI_REGISTRY_IMAGE/gcc:$CI_COMMIT_REF_SLUG
CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY_IMAGE/gcc-gui:$CI_COMMIT_REF_SLUG
- XUNIT_TO_JUNIT_IMAGE: $CI_REGISTRY_IMAGE/xunit-to-junit
- PRECOMMIT_IMAGE: $CI_REGISTRY_IMAGE/pre-commit
+ XUNIT_TO_JUNIT_IMAGE: registry.gitlab.com/opengeosys/ogs/xunit-to-junit
+ PRECOMMIT_IMAGE: registry.gitlab.com/opengeosys/ogs/pre-commit
# Build config
BUILD_TYPE: Release
BUILD_PROCESSES: "" # Empty string: builds all processes
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index aa8a2451134..d2273440b9e 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -11,17 +11,21 @@ build gcc images:
extends: .container-maker-setup
script:
- docker login -u $CI_REGISTRY_USER -p $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
--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
--tag $CONTAINER_GCC_GUI_IMAGE --upload
+### global project images ###
build xunit-to-junit image:
stage: .pre
rules:
- - changes:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
- scripts/docker/saxon/**/*
- scripts/ci/jobs/build_image.yml
tags:
@@ -38,7 +42,8 @@ build xunit-to-junit image:
build pre-commit image:
stage: .pre
rules:
- - changes:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
- scripts/docker/Dockerfile.pre-commit
- scripts/ci/jobs/build_image.yml
tags:
--
GitLab