From 81f69327d766dd1332c9448ec60a3de0ea2dfdc6 Mon Sep 17 00:00:00 2001 From: Joe Zheng Date: Fri, 13 Sep 2024 17:01:31 +0800 Subject: [PATCH] dockerd: fix typo in config for no_proxy the "http_proxy" here should be "no_proxy" Signed-off-by: Joe Zheng (cherry picked from commit dcea616c6134c0d1630174d2fff6a95ffcf60fe6) --- utils/dockerd/Makefile | 2 +- utils/dockerd/files/etc/config/dockerd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 4d39748b30..1ec6b76c9f 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd PKG_VERSION:=27.1.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/dockerd/files/etc/config/dockerd b/utils/dockerd/files/etc/config/dockerd index 0fa4a5627d..e3fde7caf4 100644 --- a/utils/dockerd/files/etc/config/dockerd +++ b/utils/dockerd/files/etc/config/dockerd @@ -26,7 +26,7 @@ config globals 'globals' config proxies 'proxies' # option http_proxy 'http://proxy.example.com:3128' # option https_proxy 'https://proxy.example.com:3129' -# option http_proxy '*.test.example.com,.example.org,127.0.0.0/8' +# option no_proxy '*.test.example.com,.example.org,127.0.0.0/8' # Docker doesn't work well out of the box with fw4. This is because Docker relies on a compatibility layer that # naively translates iptables rules. For the best compatibility replace the following dependencies: -- 2.30.2