dockerd: fix typo in config for no_proxy

the "http_proxy" here should be "no_proxy"

Signed-off-by: Joe Zheng <joe.zheng@intel.com>
(cherry picked from commit dcea616c6134c0d1630174d2fff6a95ffcf60fe6)

diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile
index 4d39748b306c3854353eea4f927530019216f7ee..1ec6b76c9f3d2fd7446be25ac9061e0818d8f2ce 100644 (file)
--- 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 0fa4a5627df3ca431a03ee087ee27b82e2aa84c0..e3fde7caf4b4cfee8a0d57eb438486ba37407b1a 100644 (file)
--- 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: