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

Merge pull request #13518 from docker/master 

Publish updates from master
This commit is contained in:
Sebastiaan van Stijn 2021-09-13 15:46:42 +02:00 committed by GitHub
parent 170c0759bb 9008e8c3e8
commit 8bb220ef7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 159 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_config_production.yml
View File

@ -84,10 +84,6 @@ defaults:
path: registry/spec path: registry/spec
values: values:
edit_url: "https://github.com/docker/distribution/tree/master/docs/spec" edit_url: "https://github.com/docker/distribution/tree/master/docs/spec"
- scope:
path: compliance
values:
edit_url: "https://github.com/mirantis/compliance/tree/master/docs/compliance"
# Hide Enterprise content from sitemap. These directories still contains stubs # Hide Enterprise content from sitemap. These directories still contains stubs
# that are needed to redirect old URLs # that are needed to redirect old URLs

2
_data/compose-cli/docker_compose_events.yaml
View File

@ -19,7 +19,7 @@ long: |-
} }
``` ```
The events that can be received using this can be seen [here](/engine/reference/commandline/events/#object-types). The events that can be received using this can be seen [here](https://docs.docker.com/engine/reference/commandline/events/#object-types).
usage: docker compose events [options] [--] [SERVICE...] usage: docker compose events [options] [--] [SERVICE...]
pname: docker compose pname: docker compose
plink: docker_compose.yaml plink: docker_compose.yaml

18
_data/glossary.yaml
View File

@ -34,8 +34,8 @@ Compose: |
*Also known as : docker-compose, fig* *Also known as : docker-compose, fig*
copy-on-write: | copy-on-write: |
Docker uses a Docker uses a
[copy-on-write](/engine/userguide/storagedriver/imagesandcontainers/#/the-copy-on-write-strategy) [copy-on-write](/storage/storagedriver/#the-copy-on-write-cow-strategy)
technique and a [union file system](#union_file_system) for both images and technique and a [union file system](#union-file-system) for both images and
containers to optimize resources and speed performance. Multiple copies of an containers to optimize resources and speed performance. Multiple copies of an
entity share the same instance and each one makes only specific changes to its entity share the same instance and each one makes only specific changes to its
unique layer. unique layer.
@ -51,7 +51,7 @@ copy-on-write: |
For more about copy-on-write in the context of Docker, see [Understand images, For more about copy-on-write in the context of Docker, see [Understand images,
containers, and storage containers, and storage
drivers](/engine/userguide/storagedriver/imagesandcontainers/). drivers](/storage/storagedriver/).
container: | container: |
A container is a runtime instance of a [docker image](#image). A container is a runtime instance of a [docker image](#image).
@ -178,7 +178,7 @@ namespace: |
and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run/) and [Isolate containers with a user namespace](/engine/security/userns-remap/). and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run/) and [Isolate containers with a user namespace](/engine/security/userns-remap/).
node: | node: |
A [node](/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual A [node](/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual
machine running an instance of the Docker Engine in [swarm mode](#swarm_mode). machine running an instance of the Docker Engine in [swarm mode](#swarm-mode).
**Manager nodes** perform swarm management and orchestration duties. By default **Manager nodes** perform swarm management and orchestration duties. By default
manager nodes are also worker nodes. manager nodes are also worker nodes.
@ -206,7 +206,7 @@ registry: |
A Registry is a hosted service containing [repositories](#repository) of [images](#image) A Registry is a hosted service containing [repositories](#repository) of [images](#image)
which responds to the Registry API. which responds to the Registry API.
The default registry can be accessed using a browser at [Docker Hub](#docker hub) The default registry can be accessed using a browser at [Docker Hub](#docker-hub)
or using the `docker search` command. or using the `docker search` command.
repository: | repository: |
A repository is a set of Docker images. A repository can be shared by pushing it A repository is a set of Docker images. A repository can be shared by pushing it
@ -232,7 +232,7 @@ service: |
any other type of executable program that you wish to run in a distributed any other type of executable program that you wish to run in a distributed
environment. environment.
service discovery: | service discovery: |
Swarm mode [service discovery](/engine/swarm/networking/#use-swarm-mode-service-discovery) is a DNS component Swarm mode [container discovery](/network/overlay/#container-discovery) is a DNS component
internal to the swarm that automatically assigns each service on an overlay internal to the swarm that automatically assigns each service on an overlay
network in the swarm a VIP and DNS entry. Containers on the network share DNS network in the swarm a VIP and DNS entry. Containers on the network share DNS
mappings for the service via gossip so any container on the network can access mappings for the service via gossip so any container on the network can access
@ -242,9 +242,9 @@ service discovery: |
other services on the same overlay network. The swarm’s internal load balancer other services on the same overlay network. The swarm’s internal load balancer
automatically distributes requests to the service VIP among the active tasks. automatically distributes requests to the service VIP among the active tasks.
swarm: | swarm: |
A [swarm](/engine/swarm/) is a cluster of one or more Docker Engines running in [swarm mode](#swarm_mode). A [swarm](/engine/swarm/) is a cluster of one or more Docker Engines running in [swarm mode](#swarm-mode).
Docker Swarm: | Docker Swarm: |
Do not confuse [Docker Swarm](https://github.com/docker/swarm) with the [swarm mode](#swarm_mode) features in Docker Engine. Do not confuse [Docker Swarm](https://github.com/docker/swarm) with the [swarm mode](#swarm-mode) features in Docker Engine.
Docker Swarm is the name of a standalone native clustering tool for Docker. Docker Swarm is the name of a standalone native clustering tool for Docker.
Docker Swarm pools together several Docker hosts and exposes them as a single Docker Swarm pools together several Docker hosts and exposes them as a single
@ -262,7 +262,7 @@ tag: |
*Note : This label is not related to the key=value labels set for docker daemon.* *Note : This label is not related to the key=value labels set for docker daemon.*
task: | task: |
A [task](/engine/swarm/how-swarm-mode-works/services/#/tasks-and-scheduling) is the A [task](/engine/swarm/how-swarm-mode-works/services/#tasks-and-scheduling) is the
atomic unit of scheduling within a swarm. A task carries a Docker container and atomic unit of scheduling within a swarm. A task carries a Docker container and
the commands to run inside the container. Manager nodes assign tasks to worker the commands to run inside the container. Manager nodes assign tasks to worker
nodes according to the number of replicas set in the service scale. nodes according to the number of replicas set in the service scale.

3
_scripts/fetch-upstream-resources.sh
View File

@ -27,7 +27,6 @@ svn co "https://github.com/docker/cli/${engine_svn_branch}/docs/extend"
svn co "https://github.com/docker/docker/${engine_svn_branch}/docs/api" ./engine/api || (echo "Failed engine/api download" && exit 1) svn co "https://github.com/docker/docker/${engine_svn_branch}/docs/api" ./engine/api || (echo "Failed engine/api download" && exit 1)
svn co "https://github.com/docker/compose-cli/${compose_cli_svn_branch}/docs" ./cloud || (echo "Failed compose-cli/docs download" && exit 1) svn co "https://github.com/docker/compose-cli/${compose_cli_svn_branch}/docs" ./cloud || (echo "Failed compose-cli/docs download" && exit 1)
svn co "https://github.com/docker/distribution/${distribution_svn_branch}/docs/spec" ./registry/spec || (echo "Failed registry/spec download" && exit 1) svn co "https://github.com/docker/distribution/${distribution_svn_branch}/docs/spec" ./registry/spec || (echo "Failed registry/spec download" && exit 1)
svn co "https://github.com/mirantis/compliance/trunk/docs/compliance" ./compliance || (echo "Failed docker/compliance download" && exit 1)
# Fix up URls in swagger files # Fix up URls in swagger files
find ./engine/api -type f -name '*.yaml' | while read i; do sed -i 's#https://docs.docker.com/#/#g' "$i"; done; find ./engine/api -type f -name '*.yaml' | while read i; do sed -i 's#https://docs.docker.com/#/#g' "$i"; done;
@ -47,5 +46,5 @@ wget --quiet --directory-prefix=./registry/ "https://raw.git
rm -f ./engine/extend/cli_plugins.md # the cli plugins api is not a stable API, and not included in the TOC for that reason. rm -f ./engine/extend/cli_plugins.md # the cli plugins api is not a stable API, and not included in the TOC for that reason.
rm -f ./registry/spec/api.md.tmpl rm -f ./registry/spec/api.md.tmpl
rm -f ./cloud/README.md # readme to make things nice in the compose-cli repo, but meaningless here rm -f ./cloud/README.md # readme to make things nice in the compose-cli repo, but meaningless here
rm -f ./cloud/architecure.md # Compose-CLI architecture, unrelated to cloud integration rm -f ./cloud/architecture.md # Compose-CLI architecture, unrelated to cloud integration
rm -rf ./cloud/images rm -rf ./cloud/images

4
cloud/aci-integration.md
View File

@ -377,7 +377,7 @@ The Docker Compose CLI adds support for running and managing containers on Azure
### Install Prerequisites ### Install Prerequisites
- [Docker 19.03 or later](https://docs.docker.com/get-docker/) - [Docker 19.03 or later](../get-docker.md)
### Install script ### Install script
@ -415,7 +415,7 @@ $ ln -s /path/to/existing/docker /directory/in/PATH/com.docker.cli
> `which docker`. You may need root permissions to make this link. > `which docker`. You may need root permissions to make this link.
On a fresh install of Ubuntu 20.04 with Docker Engine On a fresh install of Ubuntu 20.04 with Docker Engine
[already installed](https://docs.docker.com/engine/install/ubuntu/): [already installed](../engine/install/ubuntu.md):
```console ```console
$ echo $PATH $ echo $PATH

8
cloud/ecs-integration.md
View File

@ -159,7 +159,7 @@ Your ECS services are created with rolling update configuration. As you run
`docker compose up` with a modified Compose file, the stack will be `docker compose up` with a modified Compose file, the stack will be
updated to reflect changes, and if required, some services will be replaced. updated to reflect changes, and if required, some services will be replaced.
This replacement process will follow the rolling-update configuration set by This replacement process will follow the rolling-update configuration set by
your services [`deploy.update_config`](https://docs.docker.com/compose/compose-file/#update_config) your services [`deploy.update_config`](../compose/compose-file/compose-file-v3.md#update_config)
configuration. configuration.
AWS ECS uses a percent-based model to define the number of containers to be AWS ECS uses a percent-based model to define the number of containers to be
@ -212,7 +212,7 @@ For your convenience, the Docker Compose CLI offers the `docker secret` command,
First, create a `token.json` file to define your DockerHub username and access token. First, create a `token.json` file to define your DockerHub username and access token.
For instructions on how to generate access tokens, see [Managing access tokens](https://docs.docker.com/docker-hub/access-tokens/). For instructions on how to generate access tokens, see [Managing access tokens](../docker-hub/access-tokens.md).
```json ```json
{ {
@ -253,7 +253,7 @@ Services can retrieve their dependencies using Compose service names (as they do
### Dependent service startup time and DNS resolution ### Dependent service startup time and DNS resolution
Services get concurrently scheduled on ECS when a Compose file is deployed. AWS Cloud Map introduces an initial delay for DNS service to be able to resolve your services domain names. Your code needs to support this delay by waiting for dependent services to be ready, or by adding a wait-script as the entrypoint to your Docker image, as documented in [Control startup order](https://docs.docker.com/compose/startup-order/). Services get concurrently scheduled on ECS when a Compose file is deployed. AWS Cloud Map introduces an initial delay for DNS service to be able to resolve your services domain names. Your code needs to support this delay by waiting for dependent services to be ready, or by adding a wait-script as the entrypoint to your Docker image, as documented in [Control startup order](../compose/startup-order.md).
Note this need to wait for dependent services in your Compose application also exists when deploying locally with docker-compose, but the delay is typically shorter. Issues might become more visible when deploying to ECS if services do not wait for their dependencies to be available. Note this need to wait for dependent services in your Compose application also exists when deploying locally with docker-compose, but the delay is typically shorter. Issues might become more visible when deploying to ECS if services do not wait for their dependencies to be available.
Alternatively, you can use the [depends_on](https://github.com/compose-spec/compose-spec/blob/master/spec.md#depends_on){: target="_blank" rel="noopener" class="_"} feature of the Compose file format. By doing this, dependent service will be created first, and application deployment will wait for it to be up and running before starting the creation of the dependent services. Alternatively, you can use the [depends_on](https://github.com/compose-spec/compose-spec/blob/master/spec.md#depends_on){: target="_blank" rel="noopener" class="_"} feature of the Compose file format. By doing this, dependent service will be created first, and application deployment will wait for it to be up and running before starting the creation of the dependent services.
@ -598,7 +598,7 @@ The Docker Compose CLI adds support for running and managing containers on ECS.
### Install Prerequisites ### Install Prerequisites
[Docker 19.03 or later](https://docs.docker.com/get-docker/) [Docker 19.03 or later](../get-docker.md)
### Install script ### Install script

8
compose/compose-file/compose-file-v2.md
View File

@ -1103,7 +1103,7 @@ The corresponding network configuration in the
[top-level networks section](#network-configuration-reference) must have an [top-level networks section](#network-configuration-reference) must have an
`ipam` block with subnet and gateway configurations covering each static address. `ipam` block with subnet and gateway configurations covering each static address.
> If IPv6 addressing is desired, the [`enable_ipv6`](#enableipv6) option must be set. > If IPv6 addressing is desired, the [`enable_ipv6`](#enable_ipv6) option must be set.
An example: An example:
@ -1405,7 +1405,7 @@ userns_mode: "host"
``` ```
Disables the user namespace for this service, if Docker daemon is configured with user namespaces. Disables the user namespace for this service, if Docker daemon is configured with user namespaces.
See [dockerd](/engine/reference/commandline/dockerd/#disable-user-namespace-for-a-container) for See [dockerd](../../engine/security/userns-remap.md#disable-namespace-remapping-for-a-container) for
more information. more information.
### volumes ### volumes
@ -1596,7 +1596,7 @@ stdin_open: true
tty: true tty: true
``` ```
{: id="orig-resources" } <a name="orig-resources"></a>
## Specifying durations ## Specifying durations
@ -1615,7 +1615,7 @@ The supported units are `us`, `ms`, `s`, `m` and `h`.
## Specifying byte values ## Specifying byte values
Some configuration options, such as the `device_read_bps` sub-option for Some configuration options, such as the `device_read_bps` sub-option for
[`blkio_config`](#blkioconfig), accept a byte value as a string in a format [`blkio_config`](#blkio_config), accept a byte value as a string in a format
that looks like this: that looks like this:
2b 2b

4
compose/compose-file/compose-file-v3.md
View File

@ -1207,7 +1207,7 @@ external_links:
> **Note** > **Note**
> >
> The externally-created containers must be connected to at least one of the same > The externally-created containers must be connected to at least one of the same
> networks as the service that is linking to them. [Links](compose-file-v2#links) > networks as the service that is linking to them. [Links](compose-file-v2.md#links)
> are a legacy option. We recommend using [networks](#networks) instead. > are a legacy option. We recommend using [networks](#networks) instead.
> Note when using docker stack deploy > Note when using docker stack deploy
@ -1947,7 +1947,7 @@ userns_mode: "host"
``` ```
Disables the user namespace for this service, if Docker daemon is configured with user namespaces. Disables the user namespace for this service, if Docker daemon is configured with user namespaces.
See [dockerd](/engine/reference/commandline/dockerd/#disable-user-namespace-for-a-container) for See [dockerd](../../engine/security/userns-remap.md#disable-namespace-remapping-for-a-container) for
more information. more information.
> Note when using docker stack deploy > Note when using docker stack deploy

8
compose/compose-file/compose-versioning.md
View File

@ -14,7 +14,7 @@ The Compose file formats are now described in these references, specific to each
| [Compose Specification](index.md) (most current, and recommended) | [Versioning](compose-versioning.md#versioning) | | [Compose Specification](index.md) (most current, and recommended) | [Versioning](compose-versioning.md#versioning) |
| [Version 3](compose-file-v3.md) | [Version 3 updates](#version-3) | | [Version 3](compose-file-v3.md) | [Version 3 updates](#version-3) |
| [Version 2](compose-file-v2.md) | [Version 2 updates](#version-2) | | [Version 2](compose-file-v2.md) | [Version 2 updates](#version-2) |
| Version 1 (Deprecated) | [Version 1 updates](#version-1) | | Version 1 (Deprecated) | [Version 1 updates](#version-1-deprecated) |
The topics below explain the differences among the versions, Docker Engine The topics below explain the differences among the versions, Docker Engine
compatibility, and [how to upgrade](#upgrading). compatibility, and [how to upgrade](#upgrading).
@ -204,7 +204,7 @@ between services and startup order.
db: db:
image: postgres image: postgres
* [`ipv4_address`, `ipv6_address`](compose-file-v2.md#ipv4address-ipv6address) * [`ipv4_address`, `ipv6_address`](compose-file-v2.md#ipv4_address-ipv6_address)
[Variable substitution](compose-file-v2.md#variable-substitution) also was added in Version 2. [Variable substitution](compose-file-v2.md#variable-substitution) also was added in Version 2.
@ -217,7 +217,7 @@ supported by **Compose 1.9.0+**.
Introduces the following additional parameters: Introduces the following additional parameters:
- [`link_local_ips`](compose-file-v2.md#link_local_ips) - [`link_local_ips`](compose-file-v2.md#link_local_ips)
- [`isolation`](compose-file-v2.md#isolation) in build configurations and - [`isolation`](compose-file-v2.md#isolation-1) in build configurations and
service definitions service definitions
- `labels` for [volumes](compose-file-v2.md#volume-configuration-reference), - `labels` for [volumes](compose-file-v2.md#volume-configuration-reference),
[networks](compose-file-v2.md#network-configuration-reference), and [networks](compose-file-v2.md#network-configuration-reference), and
@ -253,7 +253,7 @@ supported by **Compose 1.16.0+**.
Introduces the following additional parameters: Introduces the following additional parameters:
- [`target`](compose-file-v2.md#target), [`extra_hosts`](compose-file-v2.md#extra_hosts-1) and - [`target`](compose-file-v2.md#target), [`extra_hosts`](compose-file-v2.md#extra_hosts-1) and
[`shm_size`](compose-file-v2.md#shmsize) for [build configurations](compose-file-v2.md#build) [`shm_size`](compose-file-v2.md#shm_size) for [build configurations](compose-file-v2.md#build)
- `start_period` for [`healthchecks`](compose-file-v2.md#healthcheck) - `start_period` for [`healthchecks`](compose-file-v2.md#healthcheck)
- ["Long syntax" for volumes](compose-file-v2.md#long-syntax) - ["Long syntax" for volumes](compose-file-v2.md#long-syntax)
- [`runtime`](compose-file-v2.md#runtime) for service definitions - [`runtime`](compose-file-v2.md#runtime) for service definitions

2
compose/reference/build.md
View File

@ -40,5 +40,5 @@ supported by Compose itself. BuildKit is enabled by default on Docker Desktop,
but requires the `DOCKER_BUILDKIT=1` environment variable to be set on other but requires the `DOCKER_BUILDKIT=1` environment variable to be set on other
platforms. platforms.
Refer to the [Compose CLI environment variables](envvars.md#COMPOSE_DOCKER_CLI_BUILD) Refer to the [Compose CLI environment variables](envvars.md#compose_docker_cli_build)
section to learn how to switch between "native build" and "compose build". section to learn how to switch between "native build" and "compose build".

2
compose/reference/envvars.md
View File

@ -106,7 +106,7 @@ using this character as path separator.
## COMPOSE\_FORCE\_WINDOWS\_HOST ## COMPOSE\_FORCE\_WINDOWS\_HOST
If set, volume declarations using the [short syntax](../compose-file/#short-syntax-3) If set, volume declarations using the [short syntax](../compose-file/compose-file-v3.md#short-syntax-3)
are parsed assuming the host path is a Windows path, even if Compose is are parsed assuming the host path is a Windows path, even if Compose is
running on a UNIX-based system. running on a UNIX-based system.
Supported values: `true` or `1` to enable, `false` or `0` to disable. Supported values: `true` or `1` to enable, `false` or `0` to disable.

2
compose/release-notes.md
View File

@ -2327,7 +2327,7 @@ Several new configuration keys have been added to `docker-compose.yml`:
- `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in. - `cpuset`, like `docker run --cpuset-cpus`, lets you specify which CPUs to allow execution in.
- `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only. - `read_only`, like `docker run --read-only`, lets you mount a container's filesystem as read-only.
- `security_opt`, like `docker run --security-opt`, lets you specify [security options](/engine/reference/run/#security-configuration). - `security_opt`, like `docker run --security-opt`, lets you specify [security options](/engine/reference/run/#security-configuration).
- `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](/engine/reference/run/#logging-drivers-log-driver). - `log_driver`, like `docker run --log-driver`, lets you specify a [log driver](/engine/reference/run/#logging-drivers---log-driver).
### Bug Fixes ### Bug Fixes

4
config/daemon/systemd.md
View File

@ -36,7 +36,7 @@ for your Docker daemon. The recommended way is to use the platform-independent
You can configure nearly all daemon configuration options using `daemon.json`. The following You can configure nearly all daemon configuration options using `daemon.json`. The following
example configures two options. One thing you cannot configure using `daemon.json` mechanism is example configures two options. One thing you cannot configure using `daemon.json` mechanism is
a [HTTP proxy](#http-proxy). a [HTTP proxy](#httphttps-proxy).
### Runtime directory and storage driver ### Runtime directory and storage driver
@ -236,7 +236,7 @@ you need to add this configuration in the Docker systemd service file.
## Configure where the Docker daemon listens for connections ## Configure where the Docker daemon listens for connections
See See
[Configure where the Docker daemon listens for connections](../../engine/install/linux-postinstall.md#control-where-the-docker-daemon-listens-for-connections). [Configure where the Docker daemon listens for connections](../../engine/install/linux-postinstall.md#configure-where-the-docker-daemon-listens-for-connections).
## Manually create the systemd unit files ## Manually create the systemd unit files

2
config/labels-custom-metadata.md
View File

@ -104,7 +104,7 @@ Labels on swarm nodes and services can be updated dynamically.
- [Filtering swarm nodes by label](../engine/reference/commandline/node_ls.md#filtering) - [Filtering swarm nodes by label](../engine/reference/commandline/node_ls.md#filtering)
- Swarm services - Swarm services
- [Adding labels when creating a swarm service](../engine/reference/commandline/service_create.md#set-metadata-on-a-service-l-label) - [Adding labels when creating a swarm service](../engine/reference/commandline/service_create.md#set-metadata-on-a-service--l---label)
- [Updating a swarm service's labels](../engine/reference/commandline/service_update.md) - [Updating a swarm service's labels](../engine/reference/commandline/service_update.md)
- [Inspecting a swarm service's labels](../engine/reference/commandline/service_inspect.md) - [Inspecting a swarm service's labels](../engine/reference/commandline/service_inspect.md)
- [Filtering swarm services by label](../engine/reference/commandline/service_ls.md#filtering) - [Filtering swarm services by label](../engine/reference/commandline/service_ls.md#filtering)

4
desktop/faqs.md
View File

@ -67,7 +67,7 @@ For more information and examples, see how to connect from a container to a serv
We recommend that you publish a port, or connect from another container. Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work. We recommend that you publish a port, or connect from another container. Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work.
For more information and examples, see For more information and examples, see
[I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](windows/networking.md#i-want-to-connect-to-a-container-from-the-mac). [I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](windows/networking.md#i-want-to-connect-to-a-container-from-windows).
### How do I add custom CA certificates? ### How do I add custom CA certificates?
@ -106,7 +106,7 @@ After updating the `settings.json` file, close and restart Docker Desktop to app
### When will Docker Desktop move to a cumulative release stream? ### When will Docker Desktop move to a cumulative release stream?
Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](mac/install.md#automatic-updates). Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](mac/install.md#updates).
### How do new users install Docker Desktop? ### How do new users install Docker Desktop?

13
desktop/index.md
View File

@ -10,9 +10,18 @@ redirect_from:
- /docker-for-windows/opensource/ - /docker-for-windows/opensource/
--- ---
Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes [Docker Engine](../engine/), Docker CLI client, [Docker Compose](../compose/), [Docker Content Trust](../engine/security/trust.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). Docker Desktop is an easy-to-install application for your Mac or Windows environment
that enables you to build and share containerized applications and microservices.
Docker Desktop includes [Docker Engine](../engine/index.md), Docker CLI client,
[Docker Compose](../compose/index.md), [Docker Content Trust](../engine/security/trust/index.md),
[Kubernetes](https://github.com/kubernetes/kubernetes/), and
Credential Helper](https://github.com/docker/docker-credential-helpers/).
Docker Desktop works with your choice of development tools and languages and gives you access to a vast library of certified images and templates in [Docker Hub](https://hub.docker.com/). This enables development teams to extend their environment to rapidly auto-build, continuously integrate, and collaborate using a secure repository. Docker Desktop works with your choice of development tools and languages and
gives you access to a vast library of certified images and templates in
[Docker Hub](https://hub.docker.com/). This enables development teams to extend
their environment to rapidly auto-build, continuously integrate, and collaborate
using a secure repository.
Some of the key features of Docker Desktop include: Some of the key features of Docker Desktop include:

12
desktop/mac/edge-release-notes.md
View File

@ -374,7 +374,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
### New ### New
Docker Desktop introduces a directory caching mechanism to greatly improve disk performance in containers. This feature uses [mutagen.io](https://mutagen.io/){: target="_blank" rel="noopener" class="_"} to sync files between the host and the containers and benefits from native disk performance. For more information, see [Mutagen-based caching](mutagen.md). Docker Desktop introduces a directory caching mechanism to greatly improve disk performance in containers. This feature uses [mutagen.io](https://mutagen.io/){: target="_blank" rel="noopener" class="_"} to sync files between the host and the containers and benefits from native disk performance.
We appreciate you trying out an early version of the Mutagen file sync feature. Please let us know your feedback by creating an issue in the [Docker Desktop for Mac GitHub](https://github.com/docker/for-mac/issues){: target="_blank" rel="noopener" class="_"} repository with the `Mutagen` label. We appreciate you trying out an early version of the Mutagen file sync feature. Please let us know your feedback by creating an issue in the [Docker Desktop for Mac GitHub](https://github.com/docker/for-mac/issues){: target="_blank" rel="noopener" class="_"} repository with the `Mutagen` label.
@ -1681,7 +1681,7 @@ TCP connection is idle for more than five minutes (related to
**New** **New**
- More options when moving disk image (see [Storage location](index.md#storage-location) under Advanced preference settings) - More options when moving disk image (see [Storage location](space.md) under Advanced preference settings)
- Filesharing and daemon table empty fields are editable - Filesharing and daemon table empty fields are editable
- DNS forwarder ignores responses from malfunctioning servers ([docker/for-mac#1025](https://github.com/docker/for-mac/issues/1025)) - DNS forwarder ignores responses from malfunctioning servers ([docker/for-mac#1025](https://github.com/docker/for-mac/issues/1025))
- DNS forwarder send all queries in parallel, process results in order - DNS forwarder send all queries in parallel, process results in order
@ -1866,9 +1866,9 @@ TCP connection is idle for more than five minutes (related to
**New** **New**
- Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](index.md#daemon-advanced-json-configuration-file). - Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](index.md#docker-engine).
- Docker Experimental mode can be toggled. See [Daemon Basic (experimental mode and registries)](index.md#daemon-basic-experimental-mode-and-registries). - Docker Experimental mode can be toggled. See [Daemon Basic (experimental mode and registries)](index.md#docker-engine).
**Upgrades** **Upgrades**
@ -2161,7 +2161,7 @@ events or unexpected unmounts.
**New** **New**
* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [Getting Started](index.md#download-docker-for-mac). * Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](install.md).
**Upgrades** **Upgrades**
@ -2232,7 +2232,7 @@ events or unexpected unmounts.
### Beta 18.1 Release Notes (2016-07-07 1.12.0-rc3-beta18.1) ### Beta 18.1 Release Notes (2016-07-07 1.12.0-rc3-beta18.1)
>**Note**: Docker 1.12.0 RC3 release introduces a backward incompatible change from RC2. You can fix this by [recreating or updating your containers](troubleshoot.md#recreate-or-update-your-containers-after-beta-18-upgrade) as described in Troubleshooting. >**Note**: Docker 1.12.0 RC3 release introduces a backward incompatible change from RC2. You can fix this by recreating or updating your containers.
**Hotfix** **Hotfix**

3
desktop/mac/networking.md
View File

@ -107,8 +107,7 @@ Our current recommendation is to publish a port, or to connect from another
container. This is what you need to do even on Linux if the container is on an container. This is what you need to do even on Linux if the container is on an
overlay network, not a bridge network, as these are not routed. overlay network, not a bridge network, as these are not routed.
The command to run the `nginx` webserver shown in [Getting Started](index.md#explore-the-application) For example, to run an `nginx` webserver:
is an example of this.
```console ```console
$ docker run -d -p 80:80 --name webserver nginx $ docker run -d -p 80:80 --name webserver nginx

2
desktop/mac/previous-versions.md
View File

@ -656,7 +656,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
- Clearer error message when incompatible hardware is detected. - Clearer error message when incompatible hardware is detected.
- Fix some cases where selecting "Reset" after an error did not reset properly. - Fix some cases where selecting "Reset" after an error did not reset properly.
- Fix incorrect NTP config. Fixes [docker/for-mac#2529](https://github.com/docker/for-mac/issues/2529) - Fix incorrect NTP config. Fixes [docker/for-mac#2529](https://github.com/docker/for-mac/issues/2529)
- Migration of Docker Toolbox images is not proposed anymore in Docker For Mac installer (still possible to [migrate Toolbox images manually](docker-toolbox.md#migrating-from-docker-toolbox-to-docker-desktop-on-mac) ). - Migration of Docker Toolbox images is not proposed anymore in Docker For Mac installer (still possible to [migrate Toolbox images manually](../../toolbox/index.md) ).
### Docker Community Edition 17.12.0-ce-mac55 2018-02-27 ### Docker Community Edition 17.12.0-ce-mac55 2018-02-27

24
desktop/mac/release-notes.md
View File

@ -12,14 +12,32 @@ toc_max: 2
This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
## Docker Desktop 4.0.1
2021-09-13
> Download Docker Desktop
>
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn }
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
### Upgrades
- [Compose V2 RC3](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.3)
- Compose v2 is now hosted on github.com/docker/compose.
- Fixed go panic on downscale using `compose up --scale`.
- Fixed a race condition in `compose run --rm` while capturing exit code.
### Bug fixes and minor changes
- Fixed a bug where copy-paste was not available in the Docker Dashboard.
## Docker Desktop 4.0.0 ## Docker Desktop 4.0.0
2021-08-31 2021-08-31
> Download Docker Desktop > Download Docker Desktop
> >
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn } > [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/67817/Docker.dmg) |
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn } > [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/67817/Docker.dmg)
### New ### New
@ -546,7 +564,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
### New ### New
- Use of three-digit version number for Docker Desktop releases. - Use of three-digit version number for Docker Desktop releases.
- Starting with Docker Desktop 3.0.0, updates are now much smaller as they will be applied using delta patches. For more information, see [Automatic updates](install.md#automatic-updates). - Starting with Docker Desktop 3.0.0, updates are now much smaller as they will be applied using delta patches. For more information, see [Automatic updates](install.md#updates).
- First version of `docker compose` (as an alternative to the existing `docker-compose`). Supports some basic commands but not the complete functionality of `docker-compose` yet. - First version of `docker compose` (as an alternative to the existing `docker-compose`). Supports some basic commands but not the complete functionality of `docker-compose` yet.
- Supports the following subcommands: `up`, `down`, `logs`, `build`, `pull`, `push`, `ls`, `ps` - Supports the following subcommands: `up`, `down`, `logs`, `build`, `pull`, `push`, `ls`, `ps`

2
desktop/mac/troubleshoot.md
View File

@ -334,7 +334,7 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install
$ export DOCKER_HOST=unix:///var/run/docker.sock $ export DOCKER_HOST=unix:///var/run/docker.sock
``` ```
* There are a number of issues with the performance of directories bind-mounted * <a name="bind-mounted-dirs"></a> There are a number of issues with the performance of directories bind-mounted
into containers. In particular, writes of small blocks, and traversals of large into containers. In particular, writes of small blocks, and traversals of large
directories are currently slow. Additionally, containers that perform large directories are currently slow. Additionally, containers that perform large
numbers of directory operations, such as repeated scans of large directory numbers of directory operations, such as repeated scans of large directory

17
desktop/windows/edge-release-notes.md
View File

@ -9,7 +9,7 @@ toc_max: 2
This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release. This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.
For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install). [What to know before you install](install.md#system-requirements).
## Docker Desktop Community 2.5.4 ## Docker Desktop Community 2.5.4
2020-12-07 2020-12-07
@ -2007,8 +2007,7 @@ registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/is
**New** **New**
- Windows containers settings panel and options are working. In previous releases, settings were not implemented for - Windows containers settings panel and options are working. In previous releases, settings were not implemented for
[Windows containers mode](index.md#switch-between-windows-and-linux-containers). (See [Windows containers mode](index.md#switch-between-windows-and-linux-containers).
[About the Docker Windows containers specific dialogs](index.md#about-the-docker-windows-containers-specific-dialogs).)
- Windows containers: Restart from the settings panel works - Windows containers: Restart from the settings panel works
- Windows containers: Factory default - Windows containers: Factory default
- Windows containers: `Daemon.json` can be modified - Windows containers: `Daemon.json` can be modified
@ -2258,7 +2257,7 @@ work. Some insider builds may not work.
* Only UTF-8 passwords are supported for host filesystem sharing * Only UTF-8 passwords are supported for host filesystem sharing
* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Remove stale network adapters](troubleshoot.md#4-remove-stale-network-adapters) under [Networking issues](troubleshoot.md#networking-issues) in Troubleshooting. * Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc`.
### Beta 24 Release (2016-08-23 1.12.1-beta24) ### Beta 24 Release (2016-08-23 1.12.1-beta24)
@ -2285,7 +2284,7 @@ work. Some insider builds may not work.
* Only UTF-8 passwords are supported for host filesystem sharing. * Only UTF-8 passwords are supported for host filesystem sharing.
* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Remove stale network adapters](troubleshoot.md#4-remove-stale-network-adapters) under [Networking issues](troubleshoot.md#networking-issues) in Troubleshooting. * Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc`.
### Beta 23 Release (2016-08-16 1.12.1-rc1-beta23) ### Beta 23 Release (2016-08-16 1.12.1-rc1-beta23)
@ -2410,7 +2409,7 @@ Unreleased. See Beta 23 for changes.
### Beta 18.1 Release (2016-07-07 1.12.0-rc3-beta18.1) ### Beta 18.1 Release (2016-07-07 1.12.0-rc3-beta18.1)
>**Note**: Docker 1.12.0 RC3 release introduces a backward incompatible change from RC2. You can fix this by [recreating or updating your containers](troubleshoot.md#recreate-or-update-your-containers-after-beta-18-upgrade) as described in Troubleshooting. >**Note**: Docker 1.12.0 RC3 release introduces a backward incompatible change from RC2. You can fix this by recreating or updating your containers.
**Hotfix** **Hotfix**
@ -2555,7 +2554,7 @@ Unreleased. See Beta 23 for changes.
**Known issues** **Known issues**
* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [NAT Configuration](troubleshoot.md#nat-configuration) in [Troubleshooting](troubleshoot.md) for more details. * Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed.
### Beta 13 Release (2016-05-25 1.11.1-beta13) ### Beta 13 Release (2016-05-25 1.11.1-beta13)
@ -2583,7 +2582,7 @@ This Beta release includes some significant changes:
**Known issues** **Known issues**
* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [NAT Configuration](troubleshoot.md#nat-configuration) in [Troubleshooting](troubleshoot.md) for more details. * Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed.
### Beta 12 Release (2016-17-10 1.11.1-beta12) ### Beta 12 Release (2016-17-10 1.11.1-beta12)
@ -2599,7 +2598,7 @@ This Beta release includes some significant changes:
**Known issues** **Known issues**
* Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed. See [NAT Configuration](troubleshoot.md#nat-configuration) in [Troubleshooting](troubleshoot.md) for more details. * Due to limitation in the Windows NAT implementation, co-existence with other NAT prefixes needs to be carefully managed.
### Beta 11b Release (2016-05-11 1.11.1-beta11b) ### Beta 11b Release (2016-05-11 1.11.1-beta11b)

4
desktop/windows/index.md
View File

@ -304,7 +304,7 @@ For more information on Windows containers, refer to the following documentation
[forked here to use containers](https://github.com/friism/MusicStore), is a good example of a multi-container application. [forked here to use containers](https://github.com/friism/MusicStore), is a good example of a multi-container application.
- To understand how to connect to Windows containers from the local host, see - To understand how to connect to Windows containers from the local host, see
[Limitations of Windows containers for `localhost` and published ports](troubleshoot.md#limitations-of-windows-containers-for-localhost-and-published-ports) [I want to connect to a container from Windows](networking.md#i-want-to-connect-to-a-container-from-windows)
> Settings dialog changes with Windows containers > Settings dialog changes with Windows containers
> >
@ -313,7 +313,7 @@ For more information on Windows containers, refer to the following documentation
* [General](#general) * [General](#general)
* [Proxies](#proxies) * [Proxies](#proxies)
* [Daemon](#docker-daemon) * [Daemon](#docker-engine)
* [Reset](#reset) * [Reset](#reset)
If you set proxies or daemon configuration in Windows containers mode, these If you set proxies or daemon configuration in Windows containers mode, these

2
desktop/windows/install.md
View File

@ -51,7 +51,7 @@ WSL 2 on Windows 10:
- Windows 10 64-bit: Pro 2004 (build 19041) or higher, or Enterprise or Education 1909 (build 18363) or higher. - Windows 10 64-bit: Pro 2004 (build 19041) or higher, or Enterprise or Education 1909 (build 18363) or higher.
For Windows 10 Home, see [System requirements for WSL 2 backend](#system-requirements-for-wsl-2-backend). For Windows 10 Home, see [System requirements for WSL 2 backend](#wsl-2-backend).
- Hyper-V and Containers Windows features must be enabled. - Hyper-V and Containers Windows features must be enabled.
- The following hardware prerequisites are required to successfully run Client - The following hardware prerequisites are required to successfully run Client
Hyper-V on Windows 10: Hyper-V on Windows 10:

3
desktop/windows/networking.md
View File

@ -103,8 +103,7 @@ Our current recommendation is to publish a port, or to connect from another
container. This is what you need to do even on Linux if the container is on an container. This is what you need to do even on Linux if the container is on an
overlay network, not a bridge network, as these are not routed. overlay network, not a bridge network, as these are not routed.
The command to run the `nginx` webserver shown in [Getting Started](index.md#explore-the-application) For example, to run an `nginx` webserver:
is an example of this.
```console ```console
$ docker run -d -p 80:80 --name webserver nginx $ docker run -d -p 80:80 --name webserver nginx

6
desktop/windows/previous-versions.md
View File

@ -488,7 +488,7 @@ Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kuber
### New ### New
Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. For more information, see [Two-factor authentication](index/#docker-hub). Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. For more information, see [Two-factor authentication](index.md#two-factor-authentication).
## Docker Desktop Community 2.1.0.3 ## Docker Desktop Community 2.1.0.3
2019-09-16 2019-09-16
@ -807,7 +807,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
- Fix Linuxkit start on Windows RS4 Insider. Fixes [docker/for-win#1458](https://github.com/docker/for-win/issues/1458), [docker/for-win#1514](https://github.com/docker/for-win/issues/1514), [docker/for-win#1640](https://github.com/docker/for-win/issues/1640) - Fix Linuxkit start on Windows RS4 Insider. Fixes [docker/for-win#1458](https://github.com/docker/for-win/issues/1458), [docker/for-win#1514](https://github.com/docker/for-win/issues/1514), [docker/for-win#1640](https://github.com/docker/for-win/issues/1640)
- Fix risk of privilege escalation. (https://www.tenable.com/sc-report-templates/microsoft-windows-unquoted-service-path-vulnerability) - Fix risk of privilege escalation. (https://www.tenable.com/sc-report-templates/microsoft-windows-unquoted-service-path-vulnerability)
- All users present in the docker-users group are now able to use Docker. Fixes [docker/for-win#1732](https://github.com/docker/for-win/issues/1732) - All users present in the docker-users group are now able to use Docker. Fixes [docker/for-win#1732](https://github.com/docker/for-win/issues/1732)
- Migration of Docker Toolbox images is not proposed in Docker For Windows installer (still possible to [migrate Toolbox images manually](https://docs.docker.com/toolbox/) ). - Migration of Docker Toolbox images is not proposed in Docker For Windows installer (still possible to [migrate Toolbox images manually](../../toolbox/index.md) ).
- Better cleanup for Windows containers and images on reset/uninstall. Fixes [docker/for-win#1580](https://github.com/docker/for-win/issues/1580), [docker/for-win#1544](https://github.com/docker/for-win/issues/1544), [docker/for-win#191](https://github.com/docker/for-win/issues/191) - Better cleanup for Windows containers and images on reset/uninstall. Fixes [docker/for-win#1580](https://github.com/docker/for-win/issues/1580), [docker/for-win#1544](https://github.com/docker/for-win/issues/1544), [docker/for-win#191](https://github.com/docker/for-win/issues/191)
- Desktop icon creation is optional in installer; do not recreate Desktop icon on upgrade (effective on next upgrade). Fixes [docker/for-win#246](https://github.com/docker/for-win/issues/246), [docker/for-win#925](https://github.com/docker/for-win/issues/925), [docker/for-win#1551](https://github.com/docker/for-win/issues/1551) - Desktop icon creation is optional in installer; do not recreate Desktop icon on upgrade (effective on next upgrade). Fixes [docker/for-win#246](https://github.com/docker/for-win/issues/246), [docker/for-win#925](https://github.com/docker/for-win/issues/925), [docker/for-win#1551](https://github.com/docker/for-win/issues/1551)
@ -1323,7 +1323,7 @@ We did not distribute a 1.12.4 stable release
**Known issues** **Known issues**
* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Remove stale network adapters](troubleshoot.md#4-remove-stale-network-adapters) under [Networking issues](troubleshoot.md#networking-issues) in Troubleshooting. * Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc`.
### Docker for Windows 1.12.0, 2016-07-28 ### Docker for Windows 1.12.0, 2016-07-28

23
desktop/windows/release-notes.md
View File

@ -12,12 +12,31 @@ toc_max: 2
This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
## Docker Desktop 4.0.1
2021-09-13
> Download Docker Desktop
>
> [For Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn }
### Upgrades
- [Compose V2 RC3](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.3)
- Compose v2 is now hosted on github.com/docker/compose.
- Fixed go panic on downscale using `compose up --scale`.
- Fixed a race condition in `compose run --rm` while capturing exit code.
### Bug fixes and minor changes
- Fixed a bug where Docker Desktop would not start correctly with the Hyper-V engine. See [docker/for-win#11963](https://github.com/docker/for-win/issues/11963)
- Fixed a bug where copy-paste was not available in the Docker Dashboard.
## Docker Desktop 4.0.0 ## Docker Desktop 4.0.0
2021-08-31 2021-08-31
> Download Docker Desktop > Download Docker Desktop
> >
> [For Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn } > [For Windows](https://desktop.docker.com/win/stable/amd64/67817/Docker Desktop Installer.exe)
### New ### New
@ -451,7 +470,7 @@ For developers in IT managed environments, who don’t have administrative acces
### New ### New
- Use of three-digit version number for Docker Desktop releases. - Use of three-digit version number for Docker Desktop releases.
- Docker Desktop updates are now much smaller as they will be applied using delta patches. For more information, see [Automatic updates](install.md#automatic-updates). - Docker Desktop updates are now much smaller as they will be applied using delta patches. For more information, see [Automatic updates](install.md#updates).
- First version of `docker compose` (as an alternative to the existing `docker-compose`). Supports some basic commands but not the complete functionality of `docker-compose` yet. - First version of `docker compose` (as an alternative to the existing `docker-compose`). Supports some basic commands but not the complete functionality of `docker-compose` yet.
- Supports the following subcommands: `up`, `down`, `logs`, `build`, `pull`, `push`, `ls`, `ps` - Supports the following subcommands: `up`, `down`, `logs`, `build`, `pull`, `push`, `ls`, `ps`

2
desktop/windows/wsl.md
View File

@ -36,7 +36,7 @@ Before you install the Docker Desktop WSL 2 backend, you must complete the follo
where `~` is expanded by the Linux shell to `$HOME`. where `~` is expanded by the Linux shell to `$HOME`.
- If you have concerns about the size of the docker-desktop-data VHDX, or need to change it, take a look at the [WSL tooling built into Windows](https://docs.microsoft.com/en-us/windows/wsl/wsl2-ux-changes#understanding-wsl-2-uses-a-vhd-and-what-to-do-if-you-reach-its-max-size). - If you have concerns about the size of the docker-desktop-data VHDX, or need to change it, take a look at the [WSL tooling built into Windows](https://docs.microsoft.com/en-us/windows/wsl/wsl2-ux-changes#understanding-wsl-2-uses-a-vhd-and-what-to-do-if-you-reach-its-max-size).
- If you have concerns about CPU or memory usage, you can configure limits on the memory, CPU, Swap size allocated to the [WSL 2 utility VM](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig). - If you have concerns about CPU or memory usage, you can configure limits on the memory, CPU, Swap size allocated to the [WSL 2 utility VM](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig).
- To avoid any potential conflicts with using WSL 2 on Docker Desktop, you must [uninstall any previous versions of Docker Engine](https://docs.docker.com/install/linux/docker-ce/ubuntu/#uninstall-docker-engine---community) and CLI installed directly through Linux distributions before installing Docker Desktop. - To avoid any potential conflicts with using WSL 2 on Docker Desktop, you must [uninstall any previous versions of Docker Engine](../../engine/install/ubuntu.md#uninstall-docker-engine) and CLI installed directly through Linux distributions before installing Docker Desktop.
## Download ## Download

4
docker-hub/builds/advanced.md
View File

@ -88,11 +88,11 @@ In the following example, we define a build hook that uses `docker build` argume
docker build --build-arg CUSTOM=$VAR -f $DOCKERFILE_PATH -t $IMAGE_NAME . docker build --build-arg CUSTOM=$VAR -f $DOCKERFILE_PATH -t $IMAGE_NAME .
``` ```
> **Caution**: A `hooks/build` file overrides the basic [docker build](/engine/reference/commandline/build/) command > **Caution**: A `hooks/build` file overrides the basic [docker build](../../engine/reference/commandline/build.md) command
used by the builder, so you must include a similar build command in the hook or used by the builder, so you must include a similar build command in the hook or
the automated build fails. the automated build fails.
To learn more about Docker build-time variables, see the [docker build documentation](/engine/reference/commandline/build/#set-build-time-variables-build-arg). To learn more about Docker build-time variables, see the [docker build documentation](../../engine/reference/commandline/build.md#set-build-time-variables---build-arg).
#### Push to multiple repos #### Push to multiple repos

26
docker-hub/release-notes.md
View File

@ -15,14 +15,14 @@ known issues for each Docker Hub release.
Docker has [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="*blank" rel="noopener" class="*" id="dkr_docs_relnotes_btl"} updates and extensions to the product subscriptions to increase productivity, collaboration, and added security for our developers and businesses. Docker subscription tiers now include Personal, Pro, Team, and Business. Docker has [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="*blank" rel="noopener" class="*" id="dkr_docs_relnotes_btl"} updates and extensions to the product subscriptions to increase productivity, collaboration, and added security for our developers and businesses. Docker subscription tiers now include Personal, Pro, Team, and Business.
The updated [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement) includes a change to the terms for **Docker Desktop**. The updated [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement) includes a change to the terms for **Docker Desktop**.
- Docker Desktop **remains free** for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. - Docker Desktop **remains free** for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects.
- It requires a paid subscription (**Pro, Team, or Business**), for as little as $5 a month, for professional use in larger enterprises. - It requires a paid subscription (**Pro, Team, or Business**), for as little as $5 a month, for professional use in larger enterprises.
- The effective date of these terms is August 31, 2021. There is a grace period until January 31, 2022 for those that will require a paid subscription to use Docker Desktop. - The effective date of these terms is August 31, 2021. There is a grace period until January 31, 2022 for those that will require a paid subscription to use Docker Desktop.
- The Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop. - The Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop.
- The existing Docker Free subscription has been renamed **Docker Personal**. - The existing Docker Free subscription has been renamed **Docker Personal**.
- **No changes** to Docker Engine or any other upstream **open source** Docker or Moby project. - **No changes** to Docker Engine or any other upstream **open source** Docker or Moby project.
To understand how these changes affect you, read the [FAQs](https://www.docker.com/pricing/faq){: target="*blank" rel="noopener" class="*" id="dkr_docs_relnotes_btl"}. For more information, see [Docker subscription overview](../subscription/index.md). To understand how these changes affect you, read the [FAQs](https://www.docker.com/pricing/faq){: target="*blank" rel="noopener" class="*" id="dkr_docs_relnotes_btl"}. For more information, see [Docker subscription overview](../subscription/index.md).
@ -31,9 +31,9 @@ The updated [Docker Subscription Service Agreement](https://www.docker.com/lega
### Enhancement ### Enhancement
When managing the content of your repositories, you can now filter the results based on the currentness of the tags and more easily identify your untagged images. When managing the content of your repositories, you can now filter the results based on the currentness of the tags and more easily identify your untagged images.
For more information, see [Advanced Management Dashboard](/image-management.md). For more information, see [Advanced Management Dashboard](image-management.md).
For Docker Hub API documentation, see [Docker Hub API Reference](../api/latest/#operation/GetNamespacesRepositoriesImages). For Docker Hub API documentation, see [Docker Hub API Reference](api/latest.md#operation/GetNamespacesRepositoriesImages).
## 2021-04-13 ## 2021-04-13
@ -49,7 +49,7 @@ You can now specify any email address to receive billing-related emails for your
To change the email address receiving billing-related emails, log into Docker Hub and navigate to the **Billing** tab of your organization. Select **Payment Methods** > **Contact Information**. Enter the new email address that you'd like to use in the **Email** field. Click **Update** for the changes to take effect. To change the email address receiving billing-related emails, log into Docker Hub and navigate to the **Billing** tab of your organization. Select **Payment Methods** > **Contact Information**. Enter the new email address that you'd like to use in the **Email** field. Click **Update** for the changes to take effect.
For details on how to update your billing information, see [Update billing information](../subscription/index.md#update-billing-information). For details on how to update your billing information, see [Update billing information](../subscription/upgrade.md#update-billing-information).
## 2021-03-22 ## 2021-03-22
@ -57,7 +57,7 @@ For details on how to update your billing information, see [Update billing infor
**Advanced Image Management dashboard** **Advanced Image Management dashboard**
Docker introduces the Advanced Image Management dashboard that enables you to view and manage Docker images in your repositories. For more information, see [Advanced Image Management dashboard](/image-management.md). Docker introduces the Advanced Image Management dashboard that enables you to view and manage Docker images in your repositories. For more information, see [Advanced Image Management dashboard](image-management.md).
## 2021-01-25 ## 2021-01-25
@ -72,7 +72,7 @@ For more information about this feature and for instructions on how to use it, s
### New feature ### New feature
The **Repositories** view now shows which images have gone stale because they haven't been The **Repositories** view now shows which images have gone stale because they haven't been
pulled or pushed recently. For more information, see [repository tags](repos.md/#viewing-repository-tags). pulled or pushed recently. For more information, see [repository tags](repos.md#viewing-repository-tags).
# 2020-10-07 # 2020-10-07
@ -92,7 +92,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically
### Enhancements ### Enhancements
* The [repositories page](https://docs.docker.com/docker-hub/repos/) and all * The [repositories page](repos.md) and all
related settings and tabs have been updated and moved from `cloud.docker.com` related settings and tabs have been updated and moved from `cloud.docker.com`
to `hub.docker.com`. You can access the page at its new URL: [https://hub.docker.com/repositories](https://hub.docker.com/repositories). to `hub.docker.com`. You can access the page at its new URL: [https://hub.docker.com/repositories](https://hub.docker.com/repositories).
@ -103,7 +103,7 @@ to `hub.docker.com`. You can access the page at its new URL: [https://hub.docker
## 2019-10-21 ## 2019-10-21
### New features ### New features
* **Beta:** Docker Hub now supports [two-factor authentication (2FA)](/docker-hub/2fa). Enable it in your account settings, under the **[Security](https://hub.docker.com/settings/security)** section. * **Beta:** Docker Hub now supports [two-factor authentication (2FA)](2fa/index.md). Enable it in your account settings, under the **[Security](https://hub.docker.com/settings/security)** section.
> If you lose both your 2FA authentication device and recovery code, you may > If you lose both your 2FA authentication device and recovery code, you may
> not be able to recover your account. > not be able to recover your account.
@ -172,7 +172,7 @@ Each organization page now breaks down into these tabs:
* The architecture it was built on * The architecture it was built on
* The OS * The OS
* The user who most recently updated an image for a specific tag * The user who most recently updated an image for a specific tag
* The security scan summary for [official images](https://docs.docker.com/docker-hub/official_images/) * The security scan summary for [official images](official_images.md)
has been updated. has been updated.
### Known Issues ### Known Issues

2
docker-hub/slack_integration.md
View File

@ -34,7 +34,7 @@ Once configured, choose a notification level:
* **Off** Do not receive any notifications. * **Off** Do not receive any notifications.
* **Only failures** Only receive notifications about failed builds. * **Only failures** Only receive notifications about failed builds.
* **Everything** Receive notifications for both failed and successful builds. * **Everything** Receive notifications for both failed and successful builds.
![](images/slack-notification-updates.png) ![slack notifications](images/slack-notification-updates.png)
Enjoy your new Slack channel integration! Enjoy your new Slack channel integration!

2
engine/faq.md
View File

@ -56,7 +56,7 @@ offers a high-level tool with several powerful functionalities:
uploads and downloads, similar to `git pull`, so new versions of a container uploads and downloads, similar to `git pull`, so new versions of a container
can be transferred by only sending diffs. can be transferred by only sending diffs.
- *Component re-use.* Any container can be used as a [*parent image*](../glossary.md#parent_image) to - *Component re-use.* Any container can be used as a [*parent image*](../glossary.md#parent-image) to
create more specialized components. This can be done manually or as part of an create more specialized components. This can be done manually or as part of an
automated build. For example you can prepare the ideal Python environment, and automated build. For example you can prepare the ideal Python environment, and
use it as a base for 10 different applications. Your ideal PostgreSQL setup can use it as a base for 10 different applications. Your ideal PostgreSQL setup can

8
engine/install/linux-postinstall.md
View File

@ -91,10 +91,10 @@ To create the `docker` group and add your user:
## Configure Docker to start on boot ## Configure Docker to start on boot
Most current Linux distributions (RHEL, CentOS, Fedora, Debian, Ubuntu 16.04 and Most current Linux distributions (RHEL, CentOS, Fedora, Debian, Ubuntu 16.04 and
higher) use [`systemd`](#systemd) to manage which services start when the system higher) use [`systemd`](../../config/daemon/systemd.md) to manage which services
boots. On Debian and Ubuntu, the Docker service is configured to start on boot start when the system boots. On Debian and Ubuntu, the Docker service is configured
by default. To automatically start Docker and Containerd on boot for other to start on boot by default. To automatically start Docker and Containerd on boot
distros, use the commands below: for other distros, use the commands below:
```console ```console
$ sudo systemctl enable docker.service $ sudo systemctl enable docker.service

2
engine/release-notes/17.11.md
View File

@ -12,7 +12,7 @@ skip_read_time: true
[containerd 1.0 beta](https://github.com/containerd/containerd/releases/tag/v1.0.0-beta.2). [containerd 1.0 beta](https://github.com/containerd/containerd/releases/tag/v1.0.0-beta.2).
Docker CE 17.11 and later don't recognize containers started with Docker CE 17.11 and later don't recognize containers started with
previous Docker versions. If using previous Docker versions. If using
[Live Restore](https://docs.docker.com/engine/admin/live-restore/#enable-the-live-restore-option), [Live Restore](../../config/containers/live-restore.md),
you must stop all containers before upgrading to Docker CE 17.11. you must stop all containers before upgrading to Docker CE 17.11.
If you don't, any containers started by Docker versions that predate If you don't, any containers started by Docker versions that predate
17.11 aren't recognized by Docker after the upgrade and keep 17.11 aren't recognized by Docker after the upgrade and keep

18
engine/release-notes/18.09.md
View File

@ -48,7 +48,7 @@ skip_read_time: true
### Known Issue ### Known Issue
* There are [important changes](/ee/upgrade) to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later. * There are important changes to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later.
## 18.09.7 ## 18.09.7
2019-06-27 2019-06-27
@ -76,7 +76,7 @@ skip_read_time: true
* Added a fix that now allows large log lines for logger plugins. [moby/moby#39038](https://github.com/moby/moby/pull/39038) * Added a fix that now allows large log lines for logger plugins. [moby/moby#39038](https://github.com/moby/moby/pull/39038)
### Known Issue ### Known Issue
* There are [important changes](/ee/upgrade) to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later. * There are important changes to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later.
## 18.09.6 ## 18.09.6
2019-05-06 2019-05-06
@ -89,7 +89,7 @@ skip_read_time: true
* Windows: Now selects a random host port if the user does not specify a host port. [docker/libnetwork#2369](https://github.com/docker/libnetwork/pull/2369) * Windows: Now selects a random host port if the user does not specify a host port. [docker/libnetwork#2369](https://github.com/docker/libnetwork/pull/2369)
### Known Issues ### Known Issues
* There are [important changes](/ee/upgrade) to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later. * There are important changes to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later.
## 18.09.5 ## 18.09.5
@ -120,7 +120,7 @@ skip_read_time: true
### Known Issues ### Known Issues
* There are [important changes](/ee/upgrade) to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later. * There are important changes to the upgrade process that, if not correctly followed, can have an impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later.
## 18.09.4 ## 18.09.4
@ -142,7 +142,7 @@ skip_read_time: true
* Fixed issue for swarm nodes not being able to join as masters if http proxy is set. [moby/moby#36951] * Fixed issue for swarm nodes not being able to join as masters if http proxy is set. [moby/moby#36951]
### Known Issues ### Known Issues
* There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later. * There are important changes to the upgrade process that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or later.
## 18.09.3 ## 18.09.3
@ -163,7 +163,7 @@ skip_read_time: true
* Deleted stale containerd object on start failure. [docker/engine#154](https://github.com/docker/engine/pull/154) * Deleted stale containerd object on start failure. [docker/engine#154](https://github.com/docker/engine/pull/154)
### Known Issues ### Known Issues
* There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater. * There are important changes to the upgrade process that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater.
## 18.09.2 ## 18.09.2
@ -176,7 +176,7 @@ skip_read_time: true
For additional information, [refer to the Docker blog post](https://blog.docker.com/2019/02/docker-security-update-cve-2018-5736-and-container-security-best-practices/). For additional information, [refer to the Docker blog post](https://blog.docker.com/2019/02/docker-security-update-cve-2018-5736-and-container-security-best-practices/).
### Known Issues ### Known Issues
* There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater. * There are important changes to the upgrade process that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater.
## 18.09.1 ## 18.09.1
@ -232,7 +232,7 @@ Update your configuration if this command prints a non-empty value for `MountFla
### Known Issues ### Known Issues
* When upgrading from 18.09.0 to 18.09.1, `containerd` is not upgraded to the correct version on Ubuntu. * When upgrading from 18.09.0 to 18.09.1, `containerd` is not upgraded to the correct version on Ubuntu.
* There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater. * There are important changes to the upgrade process that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater.
## 18.09.0 ## 18.09.0
@ -337,7 +337,7 @@ Update your configuration if this command prints a non-empty value for `MountFla
### Known Issues ### Known Issues
* There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater. * There are important changes to the upgrade process that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before 18.09 to version 18.09 or greater.
* With https://github.com/boot2docker/boot2docker/releases/download/v18.09.0/boot2docker.iso, connection is being refused from a node on the virtual machine. Any publishing of swarm ports in virtualbox-created docker-machine VM's will not respond. This is occurring on macOS and Windows 10, using docker-machine version 0.15 and 0.16. * With https://github.com/boot2docker/boot2docker/releases/download/v18.09.0/boot2docker.iso, connection is being refused from a node on the virtual machine. Any publishing of swarm ports in virtualbox-created docker-machine VM's will not respond. This is occurring on macOS and Windows 10, using docker-machine version 0.15 and 0.16.
The following `docker run` command works, allowing access from host browser: The following `docker run` command works, allowing access from host browser:

2
engine/swarm/manage-nodes.md
View File

@ -132,7 +132,7 @@ node-1
The labels you set for nodes using docker node update apply only to the node The labels you set for nodes using docker node update apply only to the node
entity within the swarm. Do not confuse them with the docker daemon labels for entity within the swarm. Do not confuse them with the docker daemon labels for
[dockerd](../../config/labels-custom-metadata.md#daemon-labels). [dockerd](../../config/labels-custom-metadata.md).
Therefore, node labels can be used to limit critical tasks to nodes that meet Therefore, node labels can be used to limit critical tasks to nodes that meet
certain requirements. For example, schedule only on machines where special certain requirements. For example, schedule only on machines where special

4
engine/swarm/secrets.md
View File

@ -112,14 +112,14 @@ the mount point of the secret within a given container.
## Read more about `docker secret` commands ## Read more about `docker secret` commands
Use these links to read about specific commands, or continue to the Use these links to read about specific commands, or continue to the
[example about using secrets with a service](secrets.md#example-use-secrets-with-a-service). [example about using secrets with a service](secrets.md#simple-example-get-started-with-secrets).
- [`docker secret create`](../reference/commandline/secret_create.md) - [`docker secret create`](../reference/commandline/secret_create.md)
- [`docker secret inspect`](../reference/commandline/secret_inspect.md) - [`docker secret inspect`](../reference/commandline/secret_inspect.md)
- [`docker secret ls`](../reference/commandline/secret_ls.md) - [`docker secret ls`](../reference/commandline/secret_ls.md)
- [`docker secret rm`](../reference/commandline/secret_rm.md) - [`docker secret rm`](../reference/commandline/secret_rm.md)
- [`--secret`](../reference/commandline/service_create.md#create-a-service-with-secrets) flag for `docker service create` - [`--secret`](../reference/commandline/service_create.md#create-a-service-with-secrets) flag for `docker service create`
- [`--secret-add` and `--secret-rm`](../reference/commandline/service_update.md#adding-and-removing-secrets) flags for `docker service update` - [`--secret-add` and `--secret-rm`](../reference/commandline/service_update.md#add-or-remove-secrets) flags for `docker service update`
## Examples ## Examples

5
machine/drivers/exoscale.md
View File

@ -85,11 +85,11 @@ user. If left empty, it picks a suitable one following those rules:
If a custom security group is provided, you need to ensure that you allow TCP ports 22 and 2376 in an ingress rule. If a custom security group is provided, you need to ensure that you allow TCP ports 22 and 2376 in an ingress rule.
Moreover, if you want to use [Docker Swarm](/engine/swarm/swarm-tutorial/), also add TCP port 2377, UDP/TCP on 7946, and UDP on 4789. Moreover, if you want to use [Docker Swarm](../../engine/swarm/swarm-tutorial/index.md), also add TCP port 2377, UDP/TCP on 7946, and UDP on 4789.
### Debian 9 ### Debian 9
The [default storage driver][storagedriver] may fail on Debian, specifying `overlay2` should resolve this issue. The [default storage driver](../../storage/storagedriver/select-storage-driver.md) may fail on Debian, specifying `overlay2` should resolve this issue.
$ docker-machine create --engine-storage-driver overlay2 ...` $ docker-machine create --engine-storage-driver overlay2 ...`
@ -97,7 +97,6 @@ The [default storage driver][storagedriver] may fail on Debian, specifying `over
There is a limit to the number of machines that an anti-affinity group can have. This can be worked around by specifying an additional anti-affinity group using `--exoscale-affinity-group=docker-machineX` There is a limit to the number of machines that an anti-affinity group can have. This can be worked around by specifying an additional anti-affinity group using `--exoscale-affinity-group=docker-machineX`
[storagedriver]: https://docs.docker.com/storage/storagedriver/select-storage-driver/#docker-ce
[templates]: https://www.exoscale.com/templates/ [templates]: https://www.exoscale.com/templates/
[datacenters]: https://www.exoscale.com/datacenters/ [datacenters]: https://www.exoscale.com/datacenters/
[anti-affinity]: https://community.exoscale.com/documentation/compute/anti-affinity-groups/ [anti-affinity]: https://community.exoscale.com/documentation/compute/anti-affinity-groups/

2
machine/get-started.md
View File

@ -42,7 +42,7 @@ driver.
The prerequisites are: The prerequisites are:
* Have Docker Desktop for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker Desktop for Windows](../desktop/windows/install.md#what-to-know-before-you-install)). * Have Docker Desktop for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker Desktop for Windows](../desktop/windows/install.md#system-requirements)).
* Set up the Hyper-V driver to use an external virtual network switch See * Set up the Hyper-V driver to use an external virtual network switch See
the [Docker Machine driver for Microsoft Hyper-V](drivers/hyper-v.md) topic, the [Docker Machine driver for Microsoft Hyper-V](drivers/hyper-v.md) topic,

8
machine/reference/create.md
View File

@ -129,7 +129,7 @@ Docker Machine uses them for the default value of the flag.
As part of the process of creation, Docker Machine installs Docker and As part of the process of creation, Docker Machine installs Docker and
configures it with some sensible defaults. For instance, it allows connection configures it with some sensible defaults. For instance, it allows connection
from the outside world over TCP with TLS-based encryption and defaults to AUFS from the outside world over TCP with TLS-based encryption and defaults to AUFS
as the [storage driver](/engine/reference/commandline/dockerd/#daemon-storage-driver-option) as the [storage driver](/engine/reference/commandline/dockerd/#daemon-storage-driver)
when available. when available.
There are several cases where the user might want to set options for the created There are several cases where the user might want to set options for the created
@ -180,10 +180,10 @@ Labels:
The supported flags are as follows: The supported flags are as follows:
- `--engine-insecure-registry`: Specify [insecure registries](/engine/reference/commandline/cli/#insecure-registries) to allow with the created engine - `--engine-insecure-registry`: Specify [insecure registries](/engine/reference/commandline/dockerd/#insecure-registries) to allow with the created engine
- `--engine-registry-mirror`: Specify [registry mirrors](../../registry/recipes/mirror.md) to use - `--engine-registry-mirror`: Specify [registry mirrors](../../registry/recipes/mirror.md) to use
- `--engine-label`: Specify [labels](../../config/labels-custom-metadata.md) for the created engine - `--engine-label`: Specify [labels](../../config/labels-custom-metadata.md) for the created engine
- `--engine-storage-driver`: Specify a [storage driver](/engine/reference/commandline/cli/#daemon-storage-driver-option) to use with the engine - `--engine-storage-driver`: Specify a [storage driver](/engine/reference/commandline/dockerd/#daemon-storage-driver) to use with the engine
If the engine supports specifying the flag multiple times (such as with If the engine supports specifying the flag multiple times (such as with
`--label`), then so does Docker Machine. `--label`), then so does Docker Machine.
@ -218,7 +218,7 @@ $ docker-machine create -d virtualbox \
In addition to configuring Docker Engine options as listed above, In addition to configuring Docker Engine options as listed above,
you can use Machine to specify how the created swarm manager is you can use Machine to specify how the created swarm manager is
configured. There is a `--swarm-strategy` flag, which you can use to specify configured. There is a `--swarm-strategy` flag, which you can use to specify
the [scheduling strategy](../../swarm/scheduler/strategy.md) the scheduling strategy
which Docker Swarm should use (Machine defaults to the `spread` strategy). which Docker Swarm should use (Machine defaults to the `spread` strategy).
There is also a general purpose `--swarm-opt` option which works similar to the aforementioned `--engine-opt` option, except that it specifies options There is also a general purpose `--swarm-opt` option which works similar to the aforementioned `--engine-opt` option, except that it specifies options
for the `swarm manage` command (used to boot a master node) instead of the base for the `swarm manage` command (used to boot a master node) instead of the base

1
network/overlay.md
View File

@ -3,7 +3,6 @@ title: Use overlay networks
description: All about using overlay networks description: All about using overlay networks
keywords: network, overlay, user-defined, swarm, service keywords: network, overlay, user-defined, swarm, service
redirect_from: redirect_from:
- /engine/swarm/networking/
- /engine/userguide/networking/overlay-security-model/ - /engine/userguide/networking/overlay-security-model/
- /config/containers/overlay/ - /config/containers/overlay/
--- ---

2
storage/storagedriver/btrfs-driver.md
View File

@ -107,7 +107,7 @@ This procedure is essentially identical on SLES and Ubuntu.
``` ```
See all storage options for each storage driver in the See all storage options for each storage driver in the
[daemon reference documentation](/engine/reference/commandline/dockerd/#storage-driver-options) [daemon reference documentation](/engine/reference/commandline/dockerd/#options-per-storage-driver)
7. Start Docker. After it is running, verify that `btrfs` is being used as the 7. Start Docker. After it is running, verify that `btrfs` is being used as the
storage driver. storage driver.

6
storage/storagedriver/device-mapper-driver.md
View File

@ -71,7 +71,7 @@ For production systems, see
``` ```
See all storage options for each storage driver in the See all storage options for each storage driver in the
[daemon reference documentation](/engine/reference/commandline/dockerd/#storage-driver-options) [daemon reference documentation](/engine/reference/commandline/dockerd/#options-per-storage-driver)
Docker does not start if the `daemon.json` file contains badly-formed JSON. Docker does not start if the `daemon.json` file contains badly-formed JSON.
@ -178,7 +178,7 @@ options in the table above.
``` ```
See all storage options for each storage driver in the See all storage options for each storage driver in the
[daemon reference documentation](/engine/reference/commandline/dockerd/#storage-driver-options) [daemon reference documentation](/engine/reference/commandline/dockerd/#options-per-storage-driver)
Restart Docker for the changes to take effect. Docker invokes the commands to Restart Docker for the changes to take effect. Docker invokes the commands to
configure the block device for you. configure the block device for you.
@ -431,7 +431,7 @@ If you run into repeated problems with thin pool, you can set the storage option
`/etc/docker/daemon.json`. For instance, setting it to `10` ensures `/etc/docker/daemon.json`. For instance, setting it to `10` ensures
that operations fail with a warning when the free space is at or near 10%. that operations fail with a warning when the free space is at or near 10%.
See the See the
[storage driver options in the Engine daemon reference](/engine/reference/commandline/dockerd/#storage-driver-options){: target="_blank" rel="noopener" class="_"}. [storage driver options in the Engine daemon reference](/engine/reference/commandline/dockerd/#daemon-storage-driver){: target="_blank" rel="noopener" class="_"}.
### Increase capacity on a running device ### Increase capacity on a running device

2
storage/storagedriver/zfs-driver.md
View File

@ -142,7 +142,7 @@ Edit `/etc/docker/daemon.json` and add the following:
``` ```
See all storage options for each storage driver in the See all storage options for each storage driver in the
[daemon reference documentation](/engine/reference/commandline/dockerd/#storage-driver-options) [daemon reference documentation](/engine/reference/commandline/dockerd/#daemon-storage-driver)
Save and close the file, and restart Docker. Save and close the file, and restart Docker.