-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update docker #17111
Merged
Merged
Update docker #17111
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
Changes: - docker-library/docker@b34caac: Merge pull request docker-library/docker#504 from infosiftr/git-cli - docker-library/docker@b348a31: Add `git` to CLI variants
Diff for 702899b:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 27253e1..94e1f92 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 24.0.9-cli, 24.0-cli, 24-cli, 24.0.9-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 581ac7f48197b1b82993873d04de0a6c6431df22
+GitCommit: b348a31fc955dd6500a4aa9537bbef51688a181e
Directory: 24/cli
Tags: 24.0.9-dind, 24.0-dind, 24-dind, 24.0.9-dind-alpine3.20, 24.0.9-git, 24.0-git, 24-git, 24.0.9, 24.0, 24, 24.0.9-alpine3.20
@@ -35,7 +35,7 @@ Constraints: windowsservercore-ltsc2022
Tags: 25.0.5-cli, 25.0-cli, 25-cli, 25.0.5-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 0de39b0b5c83f4f2d849f2e41b91a2eec7645f83
+GitCommit: b348a31fc955dd6500a4aa9537bbef51688a181e
Directory: 25/cli
Tags: 25.0.5-dind, 25.0-dind, 25-dind, 25.0.5-dind-alpine3.20, 25.0.5-git, 25.0-git, 25-git, 25.0.5, 25.0, 25, 25.0.5-alpine3.20
@@ -66,7 +66,7 @@ Constraints: windowsservercore-ltsc2022
Tags: 26.1.4-cli, 26.1-cli, 26-cli, 26.1.4-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: ab4a58f46763f976f9eb9d0c3379c389c0211928
+GitCommit: b348a31fc955dd6500a4aa9537bbef51688a181e
Directory: 26/cli
Tags: 26.1.4-dind, 26.1-dind, 26-dind, 26.1.4-dind-alpine3.20, 26.1.4, 26.1, 26, 26.1.4-alpine3.20
@@ -97,7 +97,7 @@ Constraints: windowsservercore-ltsc2022
Tags: 27.0.3-cli, 27.0-cli, 27-cli, cli, 27.0.3-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 75c73110b6ee739dab28c30b757eec51484968c1
+GitCommit: b348a31fc955dd6500a4aa9537bbef51688a181e
Directory: 27/cli
Tags: 27.0.3-dind, 27.0-dind, 27-dind, dind, 27.0.3-dind-alpine3.20, 27.0.3, 27.0, 27, latest, 27.0.3-alpine3.20
diff --git a/docker_24.0.9-cli-alpine3.20/Dockerfile b/docker_24.0.9-cli-alpine3.20/Dockerfile
index 7ebc951..719cf6c 100644
--- a/docker_24.0.9-cli-alpine3.20/Dockerfile
+++ b/docker_24.0.9-cli-alpine3.20/Dockerfile
@@ -9,7 +9,9 @@ FROM alpine:3.20
RUN apk add --no-cache \
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
- openssh-client
+ openssh-client \
+# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408
+ git
# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111
diff --git a/docker_25.0.5-cli-alpine3.20/Dockerfile b/docker_25.0.5-cli-alpine3.20/Dockerfile
index 25a9fcf..4eeb1c4 100644
--- a/docker_25.0.5-cli-alpine3.20/Dockerfile
+++ b/docker_25.0.5-cli-alpine3.20/Dockerfile
@@ -9,7 +9,9 @@ FROM alpine:3.20
RUN apk add --no-cache \
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
- openssh-client
+ openssh-client \
+# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408
+ git
# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111
diff --git a/docker_26.1.4-cli-alpine3.20/Dockerfile b/docker_26.1.4-cli-alpine3.20/Dockerfile
index 3a93add..c8a83d7 100644
--- a/docker_26.1.4-cli-alpine3.20/Dockerfile
+++ b/docker_26.1.4-cli-alpine3.20/Dockerfile
@@ -9,7 +9,9 @@ FROM alpine:3.20
RUN apk add --no-cache \
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
- openssh-client
+ openssh-client \
+# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408
+ git
# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111
diff --git a/docker_27.0.3-cli-alpine3.20/Dockerfile b/docker_27.0.3-cli-alpine3.20/Dockerfile
index 1471fb1..6c57a56 100644
--- a/docker_27.0.3-cli-alpine3.20/Dockerfile
+++ b/docker_27.0.3-cli-alpine3.20/Dockerfile
@@ -9,7 +9,9 @@ FROM alpine:3.20
RUN apk add --no-cache \
ca-certificates \
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
- openssh-client
+ openssh-client \
+# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408
+ git
# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses)
# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 Relevant Maintainers: |
yosifkit
approved these changes
Jul 3, 2024
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.
Changes:
git
to CLI variants docker#504 from infosiftr/git-cligit
to CLI variants