From cf6694e815c322d861e73d8a2f4ffa56d6028ae5 Mon Sep 17 00:00:00 2001
From: singuliere <35190819+singuliere@users.noreply.github.com>
Date: Fri, 3 Jun 2022 19:33:18 +0200
Subject: [PATCH] git 2.36 is needed for safe.directory = '*' to work (#19876)

---
 Dockerfile          | 3 ++-
 Dockerfile.rootless | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f30772afd9..8a899b9a72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,6 @@ RUN apk --no-cache add \
     ca-certificates \
     curl \
     gettext \
-    git \
     linux-pam \
     openssh \
     s6 \
@@ -41,6 +40,8 @@ RUN apk --no-cache add \
     su-exec \
     gnupg
 
+RUN apk add git --repository=http://dl-cdn.alpinelinux.org/alpine/v3.16/main
+
 RUN addgroup \
     -S -g 1000 \
     git && \
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index a247f735f1..5bcf51647c 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -32,10 +32,11 @@ RUN apk --no-cache add \
     bash \
     ca-certificates \
     gettext \
-    git \
     curl \
     gnupg
 
+RUN apk add git --repository=http://dl-cdn.alpinelinux.org/alpine/v3.16/main
+
 RUN addgroup \
     -S -g 1000 \
     git && \
-- 
2.39.5