Merged
Conversation
Changes: - docker-library/docker@e14d4bd: Merge pull request docker-library/docker#543 from robmry/add_slirp4netns - docker-library/docker@a916243: Add Alpine package slirp4netns to dind-rootless - docker-library/docker@bddecb4: Update 28 to compose 2.38.1
Diff for 3d50af5:diff --git a/_bashbrew-cat b/_bashbrew-cat
index af674b5..c796882 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 28.3.0-cli, 28.3-cli, 28-cli, cli, 28.3.0-cli-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 6aa52b1fc58b28a25a377b620928f2be8efe2f67
+GitCommit: bddecb43d9f238232a55ce93807533116955afc5
Directory: 28/cli
Tags: 28.3.0-dind, 28.3-dind, 28-dind, dind, 28.3.0-dind-alpine3.22, 28.3.0, 28.3, 28, latest, 28.3.0-alpine3.22
@@ -14,13 +14,13 @@ Directory: 28/dind
Tags: 28.3.0-dind-rootless, 28.3-dind-rootless, 28-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 6aa52b1fc58b28a25a377b620928f2be8efe2f67
+GitCommit: a916243e36b818461dc38c36a28dfa74d9cdf8bd
Directory: 28/dind-rootless
Tags: 28.3.0-windowsservercore-ltsc2022, 28.3-windowsservercore-ltsc2022, 28-windowsservercore-ltsc2022, windowsservercore-ltsc2022
SharedTags: 28.3.0-windowsservercore, 28.3-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 6aa52b1fc58b28a25a377b620928f2be8efe2f67
+GitCommit: bddecb43d9f238232a55ce93807533116955afc5
Directory: 28/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
@@ -28,7 +28,7 @@ Constraints: windowsservercore-ltsc2022
Tags: 28.3.0-windowsservercore-ltsc2025, 28.3-windowsservercore-ltsc2025, 28-windowsservercore-ltsc2025, windowsservercore-ltsc2025
SharedTags: 28.3.0-windowsservercore, 28.3-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 6aa52b1fc58b28a25a377b620928f2be8efe2f67
+GitCommit: bddecb43d9f238232a55ce93807533116955afc5
Directory: 28/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
diff --git a/docker_28.3.0-cli-alpine3.22/Dockerfile b/docker_28.3.0-cli-alpine3.22/Dockerfile
index 09e0978..7b82a65 100644
--- a/docker_28.3.0-cli-alpine3.22/Dockerfile
+++ b/docker_28.3.0-cli-alpine3.22/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.37.3
+ENV DOCKER_COMPOSE_VERSION 2.38.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64'; \
- sha256='522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-x86_64'; \
+ sha256='d94a60549c6916499ce41959941e6c88b67c23ed98d1c5eee2cfc4a2d58aa24b'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6'; \
- sha256='06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv6'; \
+ sha256='1025f08f0a91bac695376a118dc95c50bc8a7bb77558bd486a12eeff1aac63b9'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7'; \
- sha256='2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv7'; \
+ sha256='f9d95a3bf756be4c6be661ab5799e9cb62423d24fd4bf65d9c59fa6ffbc1a525'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64'; \
- sha256='15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-aarch64'; \
+ sha256='f7e9ed22cf330018cdc3e802e59cacb7fff3520d62aa111ac6640e00597a0ebc'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le'; \
- sha256='1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-ppc64le'; \
+ sha256='d4994e1b0d5d00c6f09f9f88a7ad135a96d8e48f8fc4238896a152def0a0c65b'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64'; \
- sha256='1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-riscv64'; \
+ sha256='316569c1e2fb518ea141a1995b4de475ae12332a7e72bfb5a2fe25fa2feaa46b'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x'; \
- sha256='82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea'; \
+ url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-s390x'; \
+ sha256='421afc85b17ad6ae4667f209db337d18a8c74f567f99fac6bca0aa0f787697db'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index abc0870..cfa67b5 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -8,7 +8,8 @@ FROM docker:28-dind
# busybox "ip" is insufficient:
# [rootlesskit:child ] error: executing [[ip tuntap add name tap0 mode tap] [ip link set tap0 address 02:50:00:00:00:01]]: exit status 1
-RUN apk add --no-cache iproute2 fuse-overlayfs
+# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns"
+RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns
# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR
RUN mkdir /run/user && chmod 1777 /run/user
diff --git a/docker_windowsservercore-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index c446ed7..a4b113b 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2022/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.37.3
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804
+ENV DOCKER_COMPOSE_VERSION 2.38.1
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \
diff --git a/docker_windowsservercore-ltsc2025/Dockerfile b/docker_windowsservercore-ltsc2025/Dockerfile
index a241fb9..9dc280f 100644
--- a/docker_windowsservercore-ltsc2025/Dockerfile
+++ b/docker_windowsservercore-ltsc2025/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.37.3
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804
+ENV DOCKER_COMPOSE_VERSION 2.38.1
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \Relevant Maintainers: |
yosifkit
approved these changes
Jul 1, 2025
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
3 participants
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: