From 872b1115f3aba89f413e0b5516feb1d47998456e Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <mail@manuelkieweg.de>
Date: Mon, 19 Oct 2020 13:17:08 +0100
Subject: [PATCH] More flow control
---
build/ci/.build-container.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index b7bc345ef..0e21b40e8 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -5,11 +5,14 @@ build:docker:
stage: build
tags:
- baremetal
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script:
- >
docker build \
- --build-arg <GITLAB_USER>=<$GO_MODULES_USER> \
- --build-arg <GITLAB_TOKEN>=<$GO_MODULES_ACCESS_TOKEN> \
+ --build-arg GITLAB_USER=$GO_MODULES_USER \
+ --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN \
-t $DOCKER_IMAGE_SHA .
.deploy: &deploy
--
GitLab