Update docker #15913
Merged
Update docker #15913
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@0411c8f: Merge pull request docker-library/docker#461 from jnoordsij/update-alpine-3.19 - docker-library/docker@18bbfb7: Update to Alpine 3.19 - docker-library/docker@4c2674d: Remove ip_tables in favor of nf_tables in dockerd entrypoint fallback - docker-library/docker@07fb6c2: Load nf_tables in preparation of Alpine 3.19
Diff for e8f8575:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e6d9f47..99ca117 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,14 +2,14 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 24.0.7-cli, 24.0-cli, 24-cli, cli, 24.0.7-cli-alpine3.18
+Tags: 24.0.7-cli, 24.0-cli, 24-cli, cli, 24.0.7-cli-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 71bd9300d17fb5b0722360fa298d9eace51c27c4
+GitCommit: 18bbfb7d201fc854d6bf9ee589f55290a543f209
Directory: 24/cli
-Tags: 24.0.7-dind, 24.0-dind, 24-dind, dind, 24.0.7-dind-alpine3.18, 24.0.7, 24.0, 24, latest, 24.0.7-alpine3.18
+Tags: 24.0.7-dind, 24.0-dind, 24-dind, dind, 24.0.7-dind-alpine3.19, 24.0.7, 24.0, 24, latest, 24.0.7-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 99073a3b6be3aa7e6b5af1e69509e8c532254500
+GitCommit: 4c2674df4f40c965cdb8ccc77b8ce9dbc247a6c9
Directory: 24/dind
Tags: 24.0.7-dind-rootless, 24.0-dind-rootless, 24-dind-rootless, dind-rootless
@@ -38,14 +38,14 @@ Directory: 24/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 25.0.0-beta.2-cli, 25-rc-cli, rc-cli, 25.0.0-beta.2-cli-alpine3.18
+Tags: 25.0.0-beta.2-cli, 25-rc-cli, rc-cli, 25.0.0-beta.2-cli-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: d8b20e0d84b8bac8629e782e0fc779d537eab8d8
+GitCommit: 18bbfb7d201fc854d6bf9ee589f55290a543f209
Directory: 25-rc/cli
-Tags: 25.0.0-beta.2-dind, 25-rc-dind, rc-dind, 25.0.0-beta.2-dind-alpine3.18, 25.0.0-beta.2, 25-rc, rc, 25.0.0-beta.2-alpine3.18
+Tags: 25.0.0-beta.2-dind, 25-rc-dind, rc-dind, 25.0.0-beta.2-dind-alpine3.19, 25.0.0-beta.2, 25-rc, rc, 25.0.0-beta.2-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: d8b20e0d84b8bac8629e782e0fc779d537eab8d8
+GitCommit: 4c2674df4f40c965cdb8ccc77b8ce9dbc247a6c9
Directory: 25-rc/dind
Tags: 25.0.0-beta.2-dind-rootless, 25-rc-dind-rootless, rc-dind-rootless
diff --git a/_bashbrew-list b/_bashbrew-list
index fba5149..8064fe2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -15,11 +15,11 @@ docker:24.0-windowsservercore
docker:24.0-windowsservercore-1809
docker:24.0-windowsservercore-ltsc2022
docker:24.0.7
-docker:24.0.7-alpine3.18
+docker:24.0.7-alpine3.19
docker:24.0.7-cli
-docker:24.0.7-cli-alpine3.18
+docker:24.0.7-cli-alpine3.19
docker:24.0.7-dind
-docker:24.0.7-dind-alpine3.18
+docker:24.0.7-dind-alpine3.19
docker:24.0.7-dind-rootless
docker:24.0.7-git
docker:24.0.7-windowsservercore
@@ -34,11 +34,11 @@ docker:25-rc-windowsservercore
docker:25-rc-windowsservercore-1809
docker:25-rc-windowsservercore-ltsc2022
docker:25.0.0-beta.2
-docker:25.0.0-beta.2-alpine3.18
+docker:25.0.0-beta.2-alpine3.19
docker:25.0.0-beta.2-cli
-docker:25.0.0-beta.2-cli-alpine3.18
+docker:25.0.0-beta.2-cli-alpine3.19
docker:25.0.0-beta.2-dind
-docker:25.0.0-beta.2-dind-alpine3.18
+docker:25.0.0-beta.2-dind-alpine3.19
docker:25.0.0-beta.2-dind-rootless
docker:25.0.0-beta.2-git
docker:25.0.0-beta.2-windowsservercore
diff --git a/docker_24.0.7-alpine3.18/Dockerfile b/docker_24.0.7-alpine3.19/Dockerfile
similarity index 100%
rename from docker_24.0.7-alpine3.18/Dockerfile
rename to docker_24.0.7-alpine3.19/Dockerfile
diff --git a/docker_25.0.0-beta.2-alpine3.18/dockerd-entrypoint.sh b/docker_24.0.7-alpine3.19/dockerd-entrypoint.sh
similarity index 98%
rename from docker_25.0.0-beta.2-alpine3.18/dockerd-entrypoint.sh
rename to docker_24.0.7-alpine3.19/dockerd-entrypoint.sh
index 0081938..056ee2a 100755
--- a/docker_25.0.0-beta.2-alpine3.18/dockerd-entrypoint.sh
+++ b/docker_24.0.7-alpine3.19/dockerd-entrypoint.sh
@@ -147,7 +147,8 @@ if [ "$1" = 'dockerd' ]; then
# if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example)
# https://github.com/docker-library/docker/issues/350
# https://github.com/moby/moby/issues/26824
- modprobe ip_tables || :
+ # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620
+ modprobe nf_tables || :
fi
uid="$(id -u)"
diff --git a/docker_24.0.7-cli-alpine3.18/Dockerfile b/docker_24.0.7-cli-alpine3.19/Dockerfile
similarity index 99%
rename from docker_24.0.7-cli-alpine3.18/Dockerfile
rename to docker_24.0.7-cli-alpine3.19/Dockerfile
index 3f2960a..f385b96 100644
--- a/docker_24.0.7-cli-alpine3.18/Dockerfile
+++ b/docker_24.0.7-cli-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
RUN apk add --no-cache \
ca-certificates \
diff --git a/docker_24.0.7-cli-alpine3.18/docker-entrypoint.sh b/docker_24.0.7-cli-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from docker_24.0.7-cli-alpine3.18/docker-entrypoint.sh
rename to docker_24.0.7-cli-alpine3.19/docker-entrypoint.sh
diff --git a/docker_24.0.7-cli-alpine3.18/modprobe.sh b/docker_24.0.7-cli-alpine3.19/modprobe.sh
similarity index 100%
rename from docker_24.0.7-cli-alpine3.18/modprobe.sh
rename to docker_24.0.7-cli-alpine3.19/modprobe.sh
diff --git a/docker_25.0.0-beta.2-alpine3.18/Dockerfile b/docker_25.0.0-beta.2-alpine3.19/Dockerfile
similarity index 100%
rename from docker_25.0.0-beta.2-alpine3.18/Dockerfile
rename to docker_25.0.0-beta.2-alpine3.19/Dockerfile
diff --git a/docker_24.0.7-alpine3.18/dockerd-entrypoint.sh b/docker_25.0.0-beta.2-alpine3.19/dockerd-entrypoint.sh
similarity index 98%
rename from docker_24.0.7-alpine3.18/dockerd-entrypoint.sh
rename to docker_25.0.0-beta.2-alpine3.19/dockerd-entrypoint.sh
index 0081938..056ee2a 100755
--- a/docker_24.0.7-alpine3.18/dockerd-entrypoint.sh
+++ b/docker_25.0.0-beta.2-alpine3.19/dockerd-entrypoint.sh
@@ -147,7 +147,8 @@ if [ "$1" = 'dockerd' ]; then
# if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example)
# https://github.com/docker-library/docker/issues/350
# https://github.com/moby/moby/issues/26824
- modprobe ip_tables || :
+ # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620
+ modprobe nf_tables || :
fi
uid="$(id -u)"
diff --git a/docker_25.0.0-beta.2-cli-alpine3.18/Dockerfile b/docker_25.0.0-beta.2-cli-alpine3.19/Dockerfile
similarity index 99%
rename from docker_25.0.0-beta.2-cli-alpine3.18/Dockerfile
rename to docker_25.0.0-beta.2-cli-alpine3.19/Dockerfile
index 759ac32..b1ac0aa 100644
--- a/docker_25.0.0-beta.2-cli-alpine3.18/Dockerfile
+++ b/docker_25.0.0-beta.2-cli-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
RUN apk add --no-cache \
ca-certificates \
diff --git a/docker_25.0.0-beta.2-cli-alpine3.18/docker-entrypoint.sh b/docker_25.0.0-beta.2-cli-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from docker_25.0.0-beta.2-cli-alpine3.18/docker-entrypoint.sh
rename to docker_25.0.0-beta.2-cli-alpine3.19/docker-entrypoint.sh
diff --git a/docker_25.0.0-beta.2-cli-alpine3.18/modprobe.sh b/docker_25.0.0-beta.2-cli-alpine3.19/modprobe.sh
similarity index 100%
rename from docker_25.0.0-beta.2-cli-alpine3.18/modprobe.sh
rename to docker_25.0.0-beta.2-cli-alpine3.19/modprobe.shRelevant Maintainers: |
yosifkit
approved these changes
Dec 14, 2023
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: