From 57714d649903ec17406b52914420dbcd42025020 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 8 Jul 2022 12:16:01 +0100 Subject: [PATCH] network/proxy: add a note pointing at docker engine and Docker Desktop (#15046) * network/proxy: add a note pointing at docker engine and Docker Desktop The title is "Configure Docker to use a proxy server" which is generic and implies this is the page which describes everything. However the scope of the instructions is limited to containers: > If your container needs to use an HTTP, ... There are other HTTP proxy cases, for example - for Docker Desktop to log into Docker - for pulling and pushing containers - for docker scan Add a note at the top of this page to clarify the scope and link to instructions for other cases. Signed-off-by: David Scott * Apply suggestions from code review Co-authored-by: Sebastiaan van Stijn * Update proxy.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Co-authored-by: Sebastiaan van Stijn --- network/proxy.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/network/proxy.md b/network/proxy.md index 4db72526bb..8d80c83173 100644 --- a/network/proxy.md +++ b/network/proxy.md @@ -4,6 +4,15 @@ description: How to configure the Docker client to use a proxy server keywords: network, networking, proxy, client --- +> **Note** +> +> This page describes how to configure the Docker CLI to configure proxies via environment variables in containers. +> For information on configuring Docker Desktop to use HTTP/HTTPS proxies, see [proxies on Mac](../desktop/mac/index.md#proxies), [proxies on Windows](../desktop/windows/index.md#proxies), and [proxies on Linux](../desktop/linux/index.md#proxies). + +> If you are not running Docker Desktop, and have installed the Docker Engine in +> other ways, refer to the "HTTP/HTTPS proxy" section in +> [configuring the Docker daemon with systemd](../config/daemon/systemd.md#httphttps-proxy). + If your container needs to use an HTTP, HTTPS, or FTP proxy server, you can configure it in different ways: