From 0bef114208023ecc63b17c7f68e485747abbf699 Mon Sep 17 00:00:00 2001
From: Robert Prehn <3952444+prehnRA@users.noreply.github.com>
Date: Mon, 19 Jul 2021 12:54:28 -0500
Subject: [PATCH] fix: Only run docker build on default branch or when
 Dockerfile changes

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb5817ac..7e7b6d93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,9 +42,12 @@ build_image_for_commit:
   stage: test
   image: "docker:20.10"
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - changes:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      when: on_success
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
         - Dockerfile
+      when: on_success
   services:
     - name: docker:20.10-dind
   before_script: