From fc892ef504b842cbf557b3cd412bc78370ddd251 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Wed, 13 Nov 2024 01:41:27 +0100
Subject: [PATCH] All docker build specific jobs should define git safe
 directory

---
 templates/docker_image_jobs.gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/templates/docker_image_jobs.gitlab-ci.yml b/templates/docker_image_jobs.gitlab-ci.yml
index 7eb206e..f3f473f 100644
--- a/templates/docker_image_jobs.gitlab-ci.yml
+++ b/templates/docker_image_jobs.gitlab-ci.yml
@@ -14,6 +14,9 @@ include:
   image: registry.gitlab.syncad.com/hive/common-ci-configuration/docker-builder:${DOCKER_BUILDER_TAG}
   before_script:
     - |
+      echo -e "\e[0Ksection_start:$(date +%s):git[collapsed=true]\r\e[0KDisabling Git directory permission check"
+      git config --global --add safe.directory '*'
+      echo -e "\e[0Ksection_end:$(date +%s):git\r\e[0K"
       echo -e "\e[0Ksection_start:$(date +%s):buildkit_config[collapsed=true]\r\e[0KConfiguring Docker BuildKit..."
       docker context create builder-context
       docker buildx create --driver docker-container --name docker-container-builder --use builder-context
@@ -57,12 +60,6 @@ include:
   variables:
     DOCKER_HUB_USER: $DOCKER_HUB_USER
     DOCKER_HUB_PASSWORD: $DOCKER_HUB_PASSWORD
-  before_script:
-    - !reference [.docker_image_builder_job_template, before_script]
-    - |
-      echo -e "\e[0Ksection_start:$(date +%s):git[collapsed=true]\r\e[0KDisabling Git directory permission check"
-      git config --global --add safe.directory '*'
-      echo -e "\e[0Ksection_end:$(date +%s):git\r\e[0K"
   rules:
     - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
-- 
GitLab