diff --git a/1017-Allow-user-to-specify-default-address-pools-for-dock.patch b/1017-Allow-user-to-specify-default-address-pools-for-dock.patch new file mode 100644 index 0000000000000000000000000000000000000000..1056a29eb752e1679115893d0beb4549f09e45e2 --- /dev/null +++ b/1017-Allow-user-to-specify-default-address-pools-for-dock.patch @@ -0,0 +1,40 @@ +From 017213c2b0be1640eb17e231b15df2f323587571 Mon Sep 17 00:00:00 2001 +From: selansen +Date: Thu, 18 Jan 2018 16:59:39 -0800 +Subject: [PATCH 075/172] Allow user to specify default address pools for + docker networks This is separate commit for CLI files to address PR 36054 + +Signed-off-by: selansen +(cherry picked from commit 462f38bd8b89c8995ad7f2129dec2c494d6ae011) +Signed-off-by: Cory Snider +--- + man/dockerd.8.md | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/man/dockerd.8.md b/man/dockerd.8.md +index 27df9c9810..6d2c930443 100644 +--- a/man/dockerd.8.md ++++ b/man/dockerd.8.md +@@ -22,6 +22,7 @@ dockerd - Enable daemon mode + [**-D**|**--debug**] + [**--default-gateway**[=*DEFAULT-GATEWAY*]] + [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]] ++[**--default-address-pool**[=*DEFAULT-ADDRESS-POOL*]] + [**--default-runtime**[=*runc*]] + [**--default-ipc-mode**=*MODE*] + [**--default-shm-size**[=*64MiB*]] +@@ -183,6 +184,11 @@ $ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-ru + **--default-gateway-v6**="" + IPv6 address of the container default gateway + ++**--default-address-pool**="" ++ Default address pool from which IPAM driver selects a subnet for the networks. ++ Example: base=172.30.0.0/16,size=24 will set the default ++ address pools for the selected scope networks to {172.30.[0-255].0/24} ++ + **--default-runtime**="runc" + Set default runtime if there're more than one specified by `--add-runtime`. + +-- +2.27.0 + diff --git a/moby.spec b/moby.spec index 40e94ec130c0932188187434f369b7a51f0bc12b..d8f293f3a08920eb4878e8a49a77e05ca01482aa 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: moby Version: 25.0.3 -Release: 28 +Release: 29 Summary: The open-source application container engine License: Apache-2.0 URL: https://www.docker.com @@ -40,6 +40,7 @@ Patch1013: 1013-Don-t-enforce-new-validation-rules-for-existing-netw.patch Patch1014: 1014-daemon-overlay2-remove-world-writable-permission-fro.patch Patch1015: 1015-rootless-fix-open-etc-docker-plugins-permission-deni.patch Patch1016: 1016-Fix-cases-where-we-are-wrapping-a-nil-error.patch +Patch1017: 1017-Allow-user-to-specify-default-address-pools-for-dock.patch # Patch 2001-2999 for tini Patch2001: 2001-tini.c-a-function-declaration-without-a-prototype-is.patch Requires(meta): %{name}-engine = %{version}-%{release} @@ -231,6 +232,10 @@ fi %systemd_postun_with_restart docker.service %changelog +* Sun Apr 20 2025 shechenglong - 25.0.3-29 +- Allow user to specify default address pools for docker networks + This is separate commit for CLI files to address PR 36054 + * Sat Apr 19 2025 shechenglong - 25.0.3-28 - rootless: Fix cases where we are wrapping a nil error