git 2.36 is needed for safe.directory = '*' to work (#19876)

diff --git a/Dockerfile b/Dockerfile
index f30772afd9203f02ea17bef516992ea997f1c863..8a899b9a72e98b0923b398179ab418c000462579 100644 (file)
--- 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 a247f735f1e1ba28a5b2da422c94a720d4567353..5bcf51647c494ccdc739583cc5dfee1736cfe1d4 100644 (file)
--- 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 && \