From c9d8bd3a77d7730a055a07dcc136ce0adaee9140 Mon Sep 17 00:00:00 2001 From: Joao Victor Portal Date: Tue, 23 Apr 2024 15:28:10 -0300 Subject: [PATCH] Fix Docker registry configuration commands The commands to configure and apply the service parameters related to Docker proxy feature were outdated. Partial-Bug: 2062079 Change-Id: Ib8d8deb19528120b7813d406ad9d5e6b952a760f Signed-off-by: Joao Victor Portal --- .../configuration/docker_proxy_config.rst | 21 +++++++++++++------ ...registries-through-a-firewall-or-proxy.rst | 17 ++++++++------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/doc/source/configuration/docker_proxy_config.rst b/doc/source/configuration/docker_proxy_config.rst index 4538e586b..189a7d0f4 100644 --- a/doc/source/configuration/docker_proxy_config.rst +++ b/doc/source/configuration/docker_proxy_config.rst @@ -86,8 +86,11 @@ To specify the HTTP proxy URL, use the commands: :: - system service-parameter-modify platform docker http_proxy http://my.proxy.com:1080 - system service-parameter-apply platform + system service-parameter-add docker proxy http_proxy=http://my.proxy.com:1080 + system service-parameter-apply docker + +If the service parameter "http_proxy" already exists, use +`service-parameter-modify` instead of `service-parameter-add`. ------------------- Set HTTPS proxy URL @@ -97,8 +100,11 @@ To specify the HTTPS proxy URL, use the commands: :: - system service-parameter-modify platform docker https_proxy https://my.proxy.com:1443 - system service-parameter-apply platform + system service-parameter-add docker proxy https_proxy=https://my.proxy.com:1443 + system service-parameter-apply docker + +If the service parameter "https_proxy" already exists, use +`service-parameter-modify` instead of `service-parameter-add`. ------------------------- Set no_proxy address list @@ -115,5 +121,8 @@ To specify a no_proxy list, use the commands: :: - system service-parameter-modify platform docker no_proxy: 1.2.3.4, 5.6.7.8 - system service-parameter-apply platform + system service-parameter-add docker proxy no_proxy="1.2.3.4,5.6.7.8" + system service-parameter-apply docker + +If the service parameter "no_proxy" already exists, use +`service-parameter-modify` instead of `service-parameter-add`. \ No newline at end of file diff --git a/doc/source/security/kubernetes/connect-to-container-registries-through-a-firewall-or-proxy.rst b/doc/source/security/kubernetes/connect-to-container-registries-through-a-firewall-or-proxy.rst index 9d5076371..648705bcb 100644 --- a/doc/source/security/kubernetes/connect-to-container-registries-through-a-firewall-or-proxy.rst +++ b/doc/source/security/kubernetes/connect-to-container-registries-through-a-firewall-or-proxy.rst @@ -18,17 +18,19 @@ otherwise inaccessible behind a firewall or proxy. .. code-block:: none - ~(keystone_user)$ system service-parameter-modify platform docker http_proxy http://:1080 - ~(keystone_user)$ system service-parameter-apply platform + ~(keystone_user)$ system service-parameter-add docker proxy http_proxy=http://:1080 + ~(keystone_user)$ system service-parameter-apply docker - To allow access over HTTPS: .. code-block:: none - ~(keystone_user)$ system service-parameter-modify platform docker https_proxy https://:1443 - ~(keystone_user)$ system service-parameter-apply platform + ~(keystone_user)$ system service-parameter-add docker proxy https_proxy=https://:1443 + ~(keystone_user)$ system service-parameter-apply docker + If the service parameters "http_proxy" and/or "https_proxy" already exist, + use `service-parameter-modify` instead of `service-parameter-add`. Substitute the correct value for . #. If you access registries that are not on the other side of the @@ -42,7 +44,8 @@ otherwise inaccessible behind a firewall or proxy. .. code-block:: none - ~(keystone_user)$ system service-parameter-modify platform docker no_proxy: 1.2.3.4, 5.6.7.8 - ~(keystone_user)$ system service-parameter-apply platform - + ~(keystone_user)$ system service-parameter-add docker proxy no_proxy="1.2.3.4,5.6.7.8" + ~(keystone_user)$ system service-parameter-apply docker + If the service parameter "no_proxy" already exists, use + `service-parameter-modify` instead of `service-parameter-add`.