Update docker#21641
Merged
Merged
Conversation
Changes: - docker-library/docker@b22f4bd: Merge pull request docker-library/docker#577 from jnoordsij/alpine3.24 - docker-library/docker@e9c27b5: Update to Alpine 3.24
Diff for b319581:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ba1b68f..576cdfe 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,14 +2,14 @@ Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 29.5.3-cli, 29.5-cli, 29-cli, cli, 29.5.3-cli-alpine3.23
+Tags: 29.5.3-cli, 29.5-cli, 29-cli, cli, 29.5.3-cli-alpine3.24
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: f3c8a6a2fa4b39191a6911a6d1a674d9c8d3e312
+GitCommit: e9c27b5271d20314cf67d83c1b27bb7c7dd87fc9
Directory: 29/cli
-Tags: 29.5.3-dind, 29.5-dind, 29-dind, dind, 29.5.3-dind-alpine3.23, 29.5.3, 29.5, 29, latest, 29.5.3-alpine3.23
+Tags: 29.5.3-dind, 29.5-dind, 29-dind, dind, 29.5.3-dind-alpine3.24, 29.5.3, 29.5, 29, latest, 29.5.3-alpine3.24
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: f3c8a6a2fa4b39191a6911a6d1a674d9c8d3e312
+GitCommit: e9c27b5271d20314cf67d83c1b27bb7c7dd87fc9
Directory: 29/dind
Tags: 29.5.3-dind-rootless, 29.5-dind-rootless, 29-dind-rootless, dind-rootless
diff --git a/_bashbrew-list b/_bashbrew-list
index d1fd908..c0133c9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -13,11 +13,11 @@ docker:29.5-windowsservercore
docker:29.5-windowsservercore-ltsc2022
docker:29.5-windowsservercore-ltsc2025
docker:29.5.3
-docker:29.5.3-alpine3.23
+docker:29.5.3-alpine3.24
docker:29.5.3-cli
-docker:29.5.3-cli-alpine3.23
+docker:29.5.3-cli-alpine3.24
docker:29.5.3-dind
-docker:29.5.3-dind-alpine3.23
+docker:29.5.3-dind-alpine3.24
docker:29.5.3-dind-rootless
docker:29.5.3-windowsservercore
docker:29.5.3-windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 609c5f6..8339fb5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-docker:29.5.3-cli-alpine3.23
+docker:29.5.3-cli-alpine3.24
docker:windowsservercore-ltsc2022
docker:windowsservercore-ltsc2025
-docker:29.5.3-alpine3.23
+docker:29.5.3-alpine3.24
docker:dind-rootless
diff --git a/docker_29.5.3-alpine3.23/Dockerfile b/docker_29.5.3-alpine3.24/Dockerfile
similarity index 98%
rename from docker_29.5.3-alpine3.23/Dockerfile
rename to docker_29.5.3-alpine3.24/Dockerfile
index 6b5cd1c..ba2ed7f 100644
--- a/docker_29.5.3-alpine3.23/Dockerfile
+++ b/docker_29.5.3-alpine3.24/Dockerfile
@@ -40,7 +40,7 @@ RUN set -eux; \
ip6tables-restore \
; do \
# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc.
-# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64
+# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64
b="$(command -v "${f/tables/tables-legacy}")"; \
"$b" --version; \
ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \
diff --git a/docker_29.5.3-alpine3.23/dockerd-entrypoint.sh b/docker_29.5.3-alpine3.24/dockerd-entrypoint.sh
similarity index 100%
rename from docker_29.5.3-alpine3.23/dockerd-entrypoint.sh
rename to docker_29.5.3-alpine3.24/dockerd-entrypoint.sh
diff --git a/docker_29.5.3-cli-alpine3.23/Dockerfile b/docker_29.5.3-cli-alpine3.24/Dockerfile
similarity index 99%
rename from docker_29.5.3-cli-alpine3.23/Dockerfile
rename to docker_29.5.3-cli-alpine3.24/Dockerfile
index 847b92d..e44f031 100644
--- a/docker_29.5.3-cli-alpine3.23/Dockerfile
+++ b/docker_29.5.3-cli-alpine3.24/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.23
+FROM alpine:3.24
RUN apk add --no-cache \
ca-certificates \
diff --git a/docker_29.5.3-cli-alpine3.23/docker-entrypoint.sh b/docker_29.5.3-cli-alpine3.24/docker-entrypoint.sh
similarity index 100%
rename from docker_29.5.3-cli-alpine3.23/docker-entrypoint.sh
rename to docker_29.5.3-cli-alpine3.24/docker-entrypoint.sh
diff --git a/docker_29.5.3-cli-alpine3.23/modprobe.sh b/docker_29.5.3-cli-alpine3.24/modprobe.sh
similarity index 100%
rename from docker_29.5.3-cli-alpine3.23/modprobe.sh
rename to docker_29.5.3-cli-alpine3.24/modprobe.shRelevant Maintainers: |
yosifkit
approved these changes
Jun 10, 2026
This file contains hidden or 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
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: