Update docker

[yosifkit]

Changes:

• docker-library/docker@843eb46: Merge pull request Add git to dind variants (and make git an alias of dind, for 24.x and 25.x) docker#483 from infosiftr/dind-git
• docker-library/docker@485fefe: Add git to dind variants (and make git an alias of dind, for 24.x and 25.x)

[github-actions]

Diff for b05a2a6:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index cffc90a..ab04955 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -7,9 +7,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: 490fbdcc7ca1b6a303e7c888714a1c51610d1a2f
 Directory: 24/cli
 
-Tags: 24.0.9-dind, 24.0-dind, 24-dind, 24.0.9-dind-alpine3.19, 24.0.9, 24.0, 24, 24.0.9-alpine3.19
+Tags: 24.0.9-dind, 24.0-dind, 24-dind, 24.0.9-dind-alpine3.19, 24.0.9-git, 24.0-git, 24-git, 24.0.9, 24.0, 24, 24.0.9-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: faa16b36dd3257f8b020489d44fd7a339f11701d
+GitCommit: 485fefe743baed5a2dd9e5d22b685c14eda4c61e
 Directory: 24/dind
 
 Tags: 24.0.9-dind-rootless, 24.0-dind-rootless, 24-dind-rootless
@@ -17,11 +17,6 @@ Architectures: amd64, arm64v8
 GitCommit: faa16b36dd3257f8b020489d44fd7a339f11701d
 Directory: 24/dind-rootless
 
-Tags: 24.0.9-git, 24.0-git, 24-git
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 6964fd52030c2e6e9e0943eaac07d78c9841fbb3
-Directory: 24/git
-
 Tags: 24.0.9-windowsservercore-1809, 24.0-windowsservercore-1809, 24-windowsservercore-1809
 SharedTags: 24.0.9-windowsservercore, 24.0-windowsservercore, 24-windowsservercore
 Architectures: windows-amd64
@@ -43,9 +38,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: c0a2a6d85dab907b5a9349f7a25eb7eadbbfa4ea
 Directory: 25/cli
 
-Tags: 25.0.3-dind, 25.0-dind, 25-dind, dind, 25.0.3-dind-alpine3.19, 25.0.3, 25.0, 25, latest, 25.0.3-alpine3.19
+Tags: 25.0.3-dind, 25.0-dind, 25-dind, dind, 25.0.3-dind-alpine3.19, 25.0.3-git, 25.0-git, 25-git, git, 25.0.3, 25.0, 25, latest, 25.0.3-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: de55ce1ae86abd97836f99759ae8badc30d0e0e6
+GitCommit: 485fefe743baed5a2dd9e5d22b685c14eda4c61e
 Directory: 25/dind
 
 Tags: 25.0.3-dind-rootless, 25.0-dind-rootless, 25-dind-rootless, dind-rootless
@@ -53,11 +48,6 @@ Architectures: amd64, arm64v8
 GitCommit: de55ce1ae86abd97836f99759ae8badc30d0e0e6
 Directory: 25/dind-rootless
 
-Tags: 25.0.3-git, 25.0-git, 25-git, git
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: d3e33ac3bc1eab5d436b7ab2981ba539ebbb7275
-Directory: 25/git
-
 Tags: 25.0.3-windowsservercore-1809, 25.0-windowsservercore-1809, 25-windowsservercore-1809, windowsservercore-1809
 SharedTags: 25.0.3-windowsservercore, 25.0-windowsservercore, 25-windowsservercore, windowsservercore
 Architectures: windows-amd64
diff --git a/docker_24-git/Dockerfile b/docker_24-git/Dockerfile
deleted file mode 100644
index 0d64982..0000000
diff --git a/docker_24.0.9-alpine3.19/Dockerfile b/docker_24.0.9-alpine3.19/Dockerfile
index f708556..ab0aa3d 100644
--- a/docker_24.0.9-alpine3.19/Dockerfile
+++ b/docker_24.0.9-alpine3.19/Dockerfile
@@ -6,29 +6,23 @@
 
 FROM docker:24-cli
 
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
 RUN set -eux; \
 	apk add --no-cache \
 		btrfs-progs \
 		e2fsprogs \
 		e2fsprogs-extra \
+		git \
 		ip6tables \
 		iptables \
 		openssl \
+		pigz \
 		shadow-uidmap \
 		xfsprogs \
 		xz \
-# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation)
-		pigz \
-	; \
-# only install zfs if it's available for the current architecture
-# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01)
-# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch
-	if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \
-		apk add --no-cache zfs; \
-	fi
-
-# TODO aufs-tools
+		zfs \
+	;
 
 # dind might be used on systems where the nf_tables kernel module isn't available. In that case,
 # we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463
diff --git a/docker_25.0.3-alpine3.19/Dockerfile b/docker_25.0.3-alpine3.19/Dockerfile
index d1fce46..88837de 100644
--- a/docker_25.0.3-alpine3.19/Dockerfile
+++ b/docker_25.0.3-alpine3.19/Dockerfile
@@ -6,29 +6,23 @@
 
 FROM docker:25-cli
 
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
 RUN set -eux; \
 	apk add --no-cache \
 		btrfs-progs \
 		e2fsprogs \
 		e2fsprogs-extra \
+		git \
 		ip6tables \
 		iptables \
 		openssl \
+		pigz \
 		shadow-uidmap \
 		xfsprogs \
 		xz \
-# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation)
-		pigz \
-	; \
-# only install zfs if it's available for the current architecture
-# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01)
-# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch
-	if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \
-		apk add --no-cache zfs; \
-	fi
-
-# TODO aufs-tools
+		zfs \
+	;
 
 # dind might be used on systems where the nf_tables kernel module isn't available. In that case,
 # we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463
diff --git a/docker_git/Dockerfile b/docker_git/Dockerfile
deleted file mode 100644
index 028d09d..0000000

Relevant Maintainers:

• docker: @tianon @yosifkit