Commit Graph

14 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 073cd2fe24 engine: rewrite section on configuring proxies for containers
Signed-off-by: David Karlsson <david.karlsson@docker.com>

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
2023-05-03 20:02:11 +02:00
Sebastiaan van Stijn a9b15d6253
desktop: settings: remove "-settings" suffix from URLs
The "-settings" suffix in the URL duplicated the "/settings/" directory
in the URL, which made it redundant.

Using "/mac/", "/windows/" and "/linux/" keeps the URLs shorter, more
memorable, and more consistent with other locations, making it easier
to "guess" the URL when navigating using the browser's location bar.

No redirects were added, because the "-settings" pages have not yet
been published.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-15 12:57:14 +02:00
Allie Sadler d17f279abc
create a global setting section for DD (#15122)
* create a global setting section for DD

* fix broken links

* fix broken links

* fix broken links
2022-07-14 15:56:51 +01:00
David Scott 57714d6499
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 <dave.scott@docker.com>

* Apply suggestions from code review

Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update proxy.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2022-07-08 12:16:01 +01:00
Usha Mandya 9bc2f59d53 Update proxy server examples to include a diff ip address
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-06-30 18:43:44 +01:00
araisch b50f1f69c7
Update proxy.md
Missleading to talk about Wildcards after mention "IP and host", while support them only for hosts without any hint to CIDR..
2021-03-01 14:24:26 +01:00
Sebastiaan van Stijn f6adc80d9a
remove examples for ENV key value without '='
The `ENV key value` form can be ambiguous, for example, the following defines
a single env-variable (`ONE`) with value `"TWO= THREE=world"`:

    ENV ONE TWO= THREE=world

While we cannot deprecate/remove that syntax (as it would break existing
Dockerfiles), we should reduce exposure of the format in our examples.

Also updating some code-blocks that were missing language-hints

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 15:16:35 +02:00
Brett Randall 58beec2d76 Included httpsProxy key/value in sample client config.json.
Signed-off-by: Brett Randall <javabrett@gmail.com>
2019-01-06 16:47:54 +11:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
pallxk 35cd70f4f1 Fix typo in proxy.md 2018-05-16 15:48:29 -07:00
Misty Stanley-Jones 9c56ec4596
Put back proxy server content (#5951) 2018-02-07 16:16:45 -08:00