From fcb9d855506a0c0394908bf8ff88377b2dda0bb1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 25 Apr 2023 14:09:12 -0700 Subject: [PATCH] Swap "git" variant to be "dind"-based in 23+ Historically, `docker build git://...` would invoke `git` in the client context, but `buildx` does so in the daemon context instead, and given that it is the default in 23+, let's adjust the git-including variant to be dind-based to simplify this for users who desire the 50MiB+ increase this workflow requires. --- 23.0/git/Dockerfile | 2 +- 24-rc/git/Dockerfile | 2 +- Dockerfile-git.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/23.0/git/Dockerfile b/23.0/git/Dockerfile index 51aca7971..6ed0adab8 100644 --- a/23.0/git/Dockerfile +++ b/23.0/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:23.0-cli +FROM docker:23.0-dind RUN apk add --no-cache git diff --git a/24-rc/git/Dockerfile b/24-rc/git/Dockerfile index affa04f89..3ef9022c6 100644 --- a/24-rc/git/Dockerfile +++ b/24-rc/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:24-rc-cli +FROM docker:24-rc-dind RUN apk add --no-cache git diff --git a/Dockerfile-git.template b/Dockerfile-git.template index 40606acc2..189842fc4 100644 --- a/Dockerfile-git.template +++ b/Dockerfile-git.template @@ -1,3 +1,3 @@ -FROM docker:{{ env.version }}-cli +FROM docker:{{ env.version }}-{{ if env.version | rtrimstr("-rc") == "20.10" then "cli" else "dind" end }} RUN apk add --no-cache git