search

docker-library / docker

Docker Official Image packaging for Docker
Apache License 2.0
1.14k stars 582 forks source link

Add `git` to `dind` variants (and make `git` an alias of `dind`, for 24.x and 25.x) #483

Closed tianon closed 7 months ago

tianon commented 7 months ago

See https://github.com/docker-library/docker/issues/482#issuecomment-1955609423 Closes #482

(with apologies to @thaJeztah :heart:)

This also does some minor cleanup of our installation of other dependencies.

tianon commented 7 months ago
Useful Diffs (before I actually committed, so commit IDs are more stable and the diff is smaller): ```diff $ diff -u <(bashbrew list docker | cut -d: -f2 | sort) <(bashbrew list <(./generate-stackbrew-library.sh) | cut -d: -f2 | sort $ ``` ```diff $ diff -u <(bashbrew cat docker) <(bashbrew cat <(./generate-stackbrew-library.sh)) --- /dev/fd/63 2024-02-23 11:49:27.223984671 -0800 +++ /dev/fd/62 2024-02-23 11:49:27.223984671 -0800 @@ -7,7 +7,7 @@ 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 Directory: 25/dind @@ -17,11 +17,6 @@ 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-ltsc2022, 25.0-windowsservercore-ltsc2022, 25-windowsservercore-ltsc2022, windowsservercore-ltsc2022 SharedTags: 25.0.3-windowsservercore, 25.0-windowsservercore, 25-windowsservercore, windowsservercore Architectures: windows-amd64 @@ -43,7 +38,7 @@ 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 Directory: 24/dind @@ -53,11 +48,6 @@ 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-ltsc2022, 24.0-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022 SharedTags: 24.0.9-windowsservercore, 24.0-windowsservercore, 24-windowsservercore Architectures: windows-amd64 ```