From 98aeeb379ac87cc88fb71d111bcb946e2db4c16f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 29 Jun 2021 13:41:40 +0200
Subject: [PATCH] [ci] Fixed Docker image build on master.
---
scripts/ci/jobs/ci_images.yml | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/scripts/ci/jobs/ci_images.yml b/scripts/ci/jobs/ci_images.yml
index be87d0d47dd..deb60a51d2c 100644
--- a/scripts/ci/jobs/ci_images.yml
+++ b/scripts/ci/jobs/ci_images.yml
@@ -4,13 +4,22 @@ ci_images:
CONTAINER_REGISTRY: ${CI_REGISTRY}/ogs/ogs
CONTAINER_TAG: latest
rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ changes:
+ - ThirdParty/container-maker
+ - scripts/ci/jobs/ci_images.yml
+ - scripts/docker/saxon/**/*
+ - scripts/docker/Dockerfile.pre-commit
+ - scripts/docker/Dockerfile.web
+ variables:
+ BUILD_CONTAINER: "true"
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
changes:
- - ThirdParty/container-maker
- - scripts/ci/jobs/build_image.yml
- - scripts/docker/saxon/**/*
- - scripts/docker/Dockerfile.pre-commit
- - scripts/docker/Dockerfile.web
+ - ThirdParty/container-maker
+ - scripts/ci/jobs/ci_images.yml
+ - scripts/docker/saxon/**/*
+ - scripts/docker/Dockerfile.pre-commit
+ - scripts/docker/Dockerfile.web
variables:
BUILD_CONTAINER: "true"
CONTAINER_TAG: ${CI_COMMIT_REF_SLUG}
--
GitLab