docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13100 from docker/master 

Publish updates from master
This commit is contained in:
Usha Mandya 2021-07-01 15:41:40 +01:00 committed by GitHub
parent 258a9f9db4 00ce93eda3
commit ffcd5a2769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2260 additions and 2238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_data/toc.yaml
View File

@ -1190,10 +1190,12 @@ manuals:
title: Disk utilization
- path: /docker-for-mac/troubleshoot/
title: Logs and troubleshooting
- path: /docker-for-mac/release-notes/
title: Release notes
- path: /docker-for-mac/apple-silicon/
title: Apple silicon
- path: /docker-for-mac/release-notes/
title: Release notes
- path: /docker-for-mac/previous-versions/
title: Previous versions
- sectiontitle: Windows
section:
- path: /docker-for-windows/install/
@ -1204,10 +1206,12 @@ manuals:
title: Networking
- path: /docker-for-windows/troubleshoot/
title: Logs and troubleshooting
- path: /docker-for-windows/release-notes/
title: Release notes
- path: /docker-for-windows/wsl/
title: Docker Desktop WSL 2 backend
- path: /docker-for-windows/release-notes/
title: Release notes
- path: /docker-for-windows/previous-versions/
title: Previous versions
- path: /desktop/dashboard/
title: Dashboard
- path: /desktop/dev-environments/

1062
docker-for-mac/previous-versions.md Normal file
View File

File diff suppressed because it is too large Load Diff

1051
docker-for-mac/release-notes.md
View File

File diff suppressed because it is too large Load Diff

1178
docker-for-windows/previous-versions.md Normal file
View File

File diff suppressed because it is too large Load Diff

1167
docker-for-windows/release-notes.md
View File

File diff suppressed because it is too large Load Diff

2
get-started/05_persisting_data.md
View File

@ -58,7 +58,7 @@ What you'll see is that the files created in one container aren't available in a
And look! There's no `data.txt` file there! That's because it was written to the scratch space for
only the first container.
4. Go ahead and remove the first container using the `docker rm -f` command.
4. Go ahead and remove the first container using the `docker rm -f <container-id>` command.
## Container volumes

26
network/proxy.md
View File

@ -11,23 +11,21 @@ configure it in different ways:
[configure the Docker client](#configure-the-docker-client) to pass
proxy information to containers automatically.
- In Docker 17.06 and lower, you must
[set appropriate environment variables](#use-environment-variables)
- In Docker 17.06 and earlier versions, you must set the appropriate
[environment variables](#use-environment-variables)
within the container. You can do this when you build the image (which makes
the image less portable) or when you create or run the container.
## Configure the Docker client
1. On the Docker client, create or edit the file `~/.docker/config.json` in the
home directory of the user which starts containers. Add JSON such as the
following, substituting the type of proxy with `httpsProxy` or `ftpProxy` if
necessary, and substituting the address and port of the proxy server. You
can configure multiple proxy servers at the same time.
home directory of the user that starts containers. Add JSON similar to the
following example. Substitute the type of proxy with `httpsProxy` or `ftpProxy` if necessary, and substitute the address and port of the proxy server. You can also configure multiple proxy servers simultaneously.
You can optionally exclude hosts or ranges from going through the proxy
server by setting a `noProxy` key to one or more comma-separated IP
addresses or hosts. Using the `*` character as a wildcard for hosts and using CIDR notation for IP addresses is supported as
shown in this example.
shown in this example:
```json
{
@ -35,8 +33,8 @@ configure it in different ways:
{
"default":
{
"httpProxy": "http://127.0.0.1:3001",
"httpsProxy": "http://127.0.0.1:3001",
"httpProxy": "http://192.168.1.12:3128",
"httpsProxy": "http://192.168.1.12:3128",
"noProxy": "*.test.example.com,.example2.com,127.0.0.0/8"
}
}
@ -48,7 +46,6 @@ configure it in different ways:
2. When you create or start new containers, the environment variables are
set automatically within the container.
## Use environment variables
### Set the environment variables manually
@ -59,10 +56,9 @@ value. This method makes the image less portable, so if you have Docker 17.07
or higher, you should [configure the Docker client](#configure-the-docker-client)
instead.
| Variable | Dockerfile example | `docker run` Example |
| Variable | Dockerfile example | `docker run` example |
|:--------------|:--------------------------------------------------|:----------------------------------------------------|
| `HTTP_PROXY` | `ENV HTTP_PROXY="http://127.0.0.1:3001"` | `--env HTTP_PROXY="http://127.0.0.1:3001"` |
| `HTTPS_PROXY` | `ENV HTTPS_PROXY="https://127.0.0.1:3001"` | `--env HTTPS_PROXY="https://127.0.0.1:3001"` |
| `FTP_PROXY` | `ENV FTP_PROXY="ftp://127.0.0.1:3001"` | `--env FTP_PROXY="ftp://127.0.0.1:3001"` |
| `HTTP_PROXY` | `ENV HTTP_PROXY="http://192.168.1.12:3128"` | `--env HTTP_PROXY="http://192.168.1.12:3128"` |
| `HTTPS_PROXY` | `ENV HTTPS_PROXY="https://192.168.1.12:3128"` | `--env HTTPS_PROXY="https://192.168.1.12:3128"` |
| `FTP_PROXY` | `ENV FTP_PROXY="ftp://192.168.1.12:3128"` | `--env FTP_PROXY="ftp://192.168.1.12:3128"` |
| `NO_PROXY` | `ENV NO_PROXY="*.test.example.com,.example2.com"` | `--env NO_PROXY="*.test.example.com,.example2.com"` |