Add git to dind variants (and make git an alias of dind, for 24.x and 25.x)
#483
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…24.x and 25.x) This also does some minor cleanup of our installation of other dependencies.
Useful Diffs (before I actually committed, so commit IDs are more stable and the diff is smaller):$ diff -u <(bashbrew list docker | cut -d: -f2 | sort) <(bashbrew list <(./generate-stackbrew-library.sh) | cut -d: -f2 | sort
$ $ 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 |
yosifkit
approved these changes
Feb 24, 2024
thaJeztah
reviewed
Feb 26, 2024
| fi | ||
|
|
||
| # TODO aufs-tools | ||
| zfs \ |
There was a problem hiding this comment.
Actually never really realised we're including zfs and btrfs in these images. With our "best effort" move towards overlayfs on all underlying filesystems, I'm also wondering how common it is to run DIND with zfs or btrfs.
There was a problem hiding this comment.
Yeah, as I changed this I was thinking about how zfs is probably going away entirely. 😂
I think things break if we don't have these and users are using them though, so 🤷
Both of these together are still smaller than Git 😂
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Feb 27, 2024
Changes: - docker-library/docker@843eb46: Merge pull request docker-library/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)
Closed
martin-g
pushed a commit
to martin-g/docker-official-images
that referenced
this pull request
Apr 3, 2024
Changes: - docker-library/docker@843eb46: Merge pull request docker-library/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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #482 (comment)
Closes #482
(with apologies to @thaJeztah ❤️)
This also does some minor cleanup of our installation of other dependencies.