diff --git a/_data/glossary.yaml b/_data/glossary.yaml index e8e3dba5c2..c5ec50f1f8 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -73,20 +73,20 @@ Docker Desktop: | 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. This enables development teams to extend their environment to rapidly auto-build, continuously integrate, and collaborate using a secure repository. Docker Desktop for Mac: | - [Docker Desktop for Mac](/desktop/mac/) is an easy-to-install, lightweight + Docker Desktop for Mac is an easy-to-install, lightweight Docker development environment designed specifically for the Mac. A native Mac application, Docker Desktop for Mac uses the macOS Hypervisor framework, networking, and filesystem. It's the best solution if you want to build, debug, test, package, and ship Dockerized applications on a Mac. Docker Desktop for Windows: | - [Docker Desktop for Windows](/desktop/windows/) is an + Docker Desktop for Windows is an easy-to-install, lightweight Docker development environment designed specifically for Windows systems that support WSL 2 and Microsoft Hyper-V. Docker Desktop for Windows uses WSL 2 or Hyper-V for virtualization. Docker Desktop for Windows is the best solution if you want to build, debug, test, package, and ship Dockerized applications from Windows machines. Docker Desktop for Linux: | - [Docker Desktop for Linux](/desktop/linux/) is an an easy-to-install, lightweight Docker development environment designed specifically for Linux machines. It's the best solution if you want to build, debug, test, package, and ship Dockerized applications on a Linux machine. + Docker Desktop for Linux is an an easy-to-install, lightweight Docker development environment designed specifically for Linux machines. It's the best solution if you want to build, debug, test, package, and ship Dockerized applications on a Linux machine. Docker Hub: | The [Docker Hub](https://hub.docker.com/) is a centralized resource for working with Docker and its components. It provides the following services: diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md index fcff4f0c50..c15d6c0f90 100644 --- a/compose/gettingstarted.md +++ b/compose/gettingstarted.md @@ -272,7 +272,7 @@ If you get runtime errors indicating an application file is not found, a volume mount is denied, or a service cannot start, try enabling file or drive sharing. Volume mounting requires shared drives for projects that live outside of `C:\Users` (Windows) or `/Users` (Mac), and is required for _any_ project on -Docker Desktop for Windows that uses [Linux containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers). +Docker Desktop for Windows that uses [Linux containers](../desktop/faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). For more information, see [File sharing](../desktop/settings/mac.md#file-sharing) on Docker for Mac, and the general examples on how to > [Manage data in containers](../storage/volumes.md). diff --git a/deprecated/machine.md b/deprecated/machine.md index abfffe2e36..e52736413d 100644 --- a/deprecated/machine.md +++ b/deprecated/machine.md @@ -64,8 +64,7 @@ notoc: true > **Deprecated** > -> Docker Machine has been deprecated. Please use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/mac/index.md) -> and [Docker Desktop for Windows](../desktop/windows/index.md). +> Docker Machine has been deprecated. Please use [Docker Desktop](../desktop/index.md) instead. > You can also use other cloud provisioning tools. {: .warning } diff --git a/deprecated/toolbox.md b/deprecated/toolbox.md index d8038fa898..51da02e774 100644 --- a/deprecated/toolbox.md +++ b/deprecated/toolbox.md @@ -21,8 +21,7 @@ toc_max: 2 > **Deprecated** > > Docker Toolbox has been deprecated and is no longer in active development. Please -> use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/mac/index.md) -> and [Docker Desktop for Windows](../desktop/windows/index.md). +> use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/index.md) {: .warning } The source code for Toolbox has been archived, You can find the source code diff --git a/desktop/extensions.md b/desktop/extensions.md index 665de43fd5..e1d144efed 100644 --- a/desktop/extensions.md +++ b/desktop/extensions.md @@ -20,11 +20,7 @@ Docker Community members and partners can use our [SDK](extensions-sdk/index.md) ## Prerequisites -Docker Extensions is available as part of Docker Desktop 4.8.0 or a later release. Download and install Docker Desktop 4.8.0 or later: - -* [Mac](mac/release-notes/index.md) -* [Windows](windows/release-notes/index.md) -* [Linux](linux/index.md) +Docker Extensions is available as part of Docker Desktop 4.8.0 or a later release. [Download and install Docker Desktop 4.8.0 or later](release-notes.md). ## Add an extension diff --git a/desktop/install/linux-install.md b/desktop/install/linux-install.md index 98a066a8df..95095568c7 100644 --- a/desktop/install/linux-install.md +++ b/desktop/install/linux-install.md @@ -270,9 +270,7 @@ Docker Desktop for Linux runs a Virtual Machine (VM) for the following reasons: ## Where to go next -- [Getting started](../linux/index.md) provides an overview of Docker Desktop on Linux, basic Docker command examples, how to get help or give feedback, and links to other topics about Docker Desktop on Linux. -- [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how - to run and submit diagnostics, and submit issues. +- [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. - [FAQs](../faqs/general.md) provide answers to frequently asked questions. - [Release notes](../release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. - [Get started with Docker](../../get-started/index.md) provides a general Docker tutorial. diff --git a/desktop/install/mac-install.md b/desktop/install/mac-install.md index 568e8395a5..7a0f0dad3e 100644 --- a/desktop/install/mac-install.md +++ b/desktop/install/mac-install.md @@ -138,7 +138,6 @@ To uninstall Docker Desktop from your Mac: ## Where to go next -- [Getting started](../mac/index.md) provides an overview of Docker Desktop on Mac, basic Docker command examples, how to get help or give feedback, and links to other topics about Docker Desktop on Mac. - [Docker Desktop for Apple silicon](../mac/apple-silicon.md) for detailed information about Docker Desktop for Apple silicon. - [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. diff --git a/desktop/install/windows-install.md b/desktop/install/windows-install.md index befaba3a20..175a940288 100644 --- a/desktop/install/windows-install.md +++ b/desktop/install/windows-install.md @@ -93,7 +93,7 @@ more information, see [Running Docker Desktop in nested virtualization scenarios Looking for information on using Windows containers? -* [Switch between Windows and Linux containers](../windows/index.md#switch-between-windows-and-linux-containers) +* [Switch between Windows and Linux containers](../faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers) describes how you can toggle between Linux and Windows containers in Docker Desktop and points you to the tutorial mentioned above. * [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md) provides a tutorial on how to set up and run Windows containers on Windows 10, Windows Server 2016 and Windows Server 2019. It shows you how to use a MusicStore application @@ -201,7 +201,6 @@ To uninstall Docker Desktop from your Windows machine: ## Where to go next -* [Getting started](../windows/index.md) introduces Docker Desktop for Windows. * [Get started with Docker](/get-started/) is a tutorial that teaches you how to deploy a multi-service stack. * [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, and diff --git a/desktop/linux/index.md b/desktop/linux/index.md deleted file mode 100644 index 7968e3590b..0000000000 --- a/desktop/linux/index.md +++ /dev/null @@ -1,93 +0,0 @@ ---- -description: Getting Started -keywords: linux, tutorial, run, docker, local, machine -title: Docker Desktop for Linux user manual ---- - -The Docker Desktop for Linux user manual provides information on how to manage your credentials. - -For information about Docker Desktop download, system requirements, and installation instructions, see [Install Docker Desktop](../install/linux-install.md). - -## Credentials management - -Docker Desktop relies on [`pass`](https://www.passwordstore.org/){: target="_blank" rel="noopener" class="_"} to store credentials in gpg2-encrypted files. -Before signing in to Docker Hub from the Docker Dashboard or the Docker menu, you must initialize `pass`. -Docker Desktop displays a warning if you've not initialized `pass`. - -You can intialize pass by using a gpg key. To generate a gpg key, run: - -``` console -$ gpg --generate-key -... -GnuPG needs to construct a user ID to identify your key. - -Real name: Molly -Email address: molly@example.com -You selected this USER-ID: - "Molly " - -Change (N)ame, (E)mail, or (O)kay/(Q)uit? O -... -pub rsa3072 2022-03-31 [SC] [expires: 2024-03-30] - 7865BA9185AFA2C26C5B505669FC4F36530097C2 -uid Molly -sub rsa3072 2022-03-31 [E] [expires: 2024-03-30] -``` - -To initialize `pass`, run: - -```console -molly@ubuntu:~$ pass init 7865BA9185AFA2C26C5B505669FC4F36530097C2 -mkdir: created directory '/home/molly/.password-store/' -Password store initialized for 7865BA9185AFA2C26C5B505669FC4F36530097C2 -``` - -Once `pass` is initialized, we can sign in on the Docker Dashboard and pull our private images. -When credentials are used by the Docker CLI or Docker Desktop, a user prompt may pop up for the password you set during the gpg key generation. - -```console -$ docker pull molly/privateimage -Using default tag: latest -latest: Pulling from molly/privateimage -3b9cc81c3203: Pull complete -Digest: sha256:3c6b73ce467f04d4897d7a7439782721fd28ec9bf62ea2ad9e81a5fb7fb3ff96 -Status: Downloaded newer image for molly/privateimage:latest -docker.io/molly/privateimage:latest -``` - -## Docker Hub - -Select **Sign in / Create Docker ID** from the Docker Desktop menu to access your [Docker](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories and organizations directly from the Docker Desktop menu. - -For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){:target="_blank" -class="_"}: - -* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"} -* [Builds](../../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"} - -## Pause/Resume - -You can pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. When you pause Docker Desktop, the Linux VM running Docker Engine is paused, the current state of all your containers are saved in memory, and all processes are frozen. This reduces the CPU usage and helps you retain a longer battery life on your laptop. You can resume Docker Desktop when you want by clicking the Resume option. - -From the Docker menu, select ![whale menu](images/whale-x.png){: .inline} > **Pause** to pause Docker Desktop. - -![Docker context menu](images/menu/prefs.png){:width="250px"} - -Docker Desktop now displays the paused status on the Docker menu and on the **Containers**, **Images**, **Volumes**, and **Dev Environment** screens on the Docker Dashboard. You can still access the **Settings** and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop. - -Select ![whale menu](images/whale-x.png){: .inline} > **Resume** to resume Docker Desktop. - -> **Note** -> -> When Docker Desktop is paused, running any commands in the Docker CLI will automatically resume Docker Desktop. - -## Where to go next - -* Try out the walkthrough at [Get Started](/get-started/){: target="_blank" - class="_"}. - -* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example - walkthroughs and source code. - -* For a summary of Docker command line interface (CLI) commands, see - [Docker CLI Reference Guide](../../engine/api/index.md){: target="_blank" rel="noopener" class="_"}. diff --git a/desktop/linux/networking.md b/desktop/linux/networking.md deleted file mode 100644 index e197f51483..0000000000 --- a/desktop/linux/networking.md +++ /dev/null @@ -1,160 +0,0 @@ ---- -description: Networking -keywords: linux, networking -title: Networking features in Docker Desktop for Linux ---- -{% assign Arch = 'Linux' %} - -Docker Desktop for {{Arch}} provides several networking features to make it -easier to use. - -## Features - -### VPN Passthrough - -Docker Desktop for {{Arch}}'s networking can work when attached to a VPN. To do this, -Docker Desktop for {{Arch}} intercepts traffic from the containers and injects it into -{{Arch}} as if it originated from the Docker application. - -### Port Mapping - -When you run a container with the `-p` argument, for example: - -```console -$ docker run -p 80:80 -d nginx -``` - -Docker Desktop for {{Arch}} makes whatever is running on port 80 in the container (in -this case, `nginx`) available on port 80 of `localhost`. In this example, the -host and container ports are the same. What if you need to specify a different -host port? If, for example, you already have something running on port 80 of -your host machine, you can connect the container to a different port: - -```console -$ docker run -p 8000:80 -d nginx -``` - -Now, connections to `localhost:8000` are sent to port 80 in the container. The -syntax for `-p` is `HOST_PORT:CLIENT_PORT`. - -### HTTP/HTTPS Proxy Support - -See [Proxies](index.md#proxies). - -### SSH agent forwarding - -Docker Desktop for Linux allows you to use the host’s SSH agent inside a container. To do this: - -1. Bind mount the SSH agent socket by adding the following parameter to your `docker run` command: - - ```ssh - --mount type=bind,src=/run/host-services/ssh-auth.sock,target=/run/host-services/ssh-auth.sock - ``` - - -2. Add the `SSH_AUTH_SOCK` environment variable in your container: - - `-e SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock"` - - -To enable the SSH agent in Docker Compose, add the following flags to your service: - - ```yaml -services: - web: - image: nginx:alpine - volumes: - - type: bind - source: /run/host-services/ssh-auth.sock - target: /run/host-services/ssh-auth.sock - environment: - - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock - ``` - -## Known limitations, use cases, and workarounds - -Below is a summary of the current limitations on the Docker Desktop for {{Arch}} -networking stack, along with some ideas for workarounds. - -### Changing internal IP addresses - -The internal IP addresses used by Docker can be changed from the **Settings** panel. -After changing IPs, you need to reset the Kubernetes cluster and leave any active Swarm. - -### I cannot ping my containers - -Docker Desktop for Linux can't route traffic to containers. - -### Per-container IP addressing is not possible - -The docker bridge network is not reachable from the Linux host. - -### Use cases and workarounds - -There are two scenarios that the above limitations affect: - -#### I want to connect from a container to a service on the host - -The host has a changing IP address (or none if you have no network access). We recommend that you connect to the special DNS name -`host.docker.internal` which resolves to the internal IP address used by the -host. This is for development purposes and will not work in a production environment outside of Docker Desktop for Linux. - -You can also reach the gateway using `gateway.docker.internal`. - -If you have installed Python on your machine, use the following instructions as an example to connect from a container to a service on the host: - -1. Run the following command to start a simple HTTP server on port 8000. - - ```console - $ python -m http.server 8000 - ``` - - If you have installed Python 2.x, run: - - ```console - $ python -m SimpleHTTPServer 8000 - ``` - -2. Now, run a container, install `curl`, and try to connect to the host using the following commands: - - ```console - $ docker run --rm -it alpine sh - # apk add curl - # curl http://host.docker.internal:8000 - # exit - ``` - -#### I want to connect to a container from the Linux host - -Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work. -Ports exposed from the Linux VM are forwarded to the host. - -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 -overlay network, not a bridge network, as these are not routed. - -For example, to run an `nginx` webserver: - -```console -$ docker run -d -p 80:80 --name webserver nginx -``` - -To clarify the syntax, the following two commands both expose port `80` on the -container to port `8000` on the host: - -```console -$ docker run --publish 8000:80 --name webserver nginx - -$ docker run -p 8000:80 --name webserver nginx -``` - -To expose all ports, use the `-P` flag. For example, the following command -starts a container (in detached mode) and the `-P` exposes all ports on the -container to random ports on the host. - -```console -$ docker run -d -P --name webserver nginx -``` - -See the [run command](../../engine/reference/commandline/run.md) for more details on -publish options used with `docker run`. diff --git a/desktop/linux/release-notes/index.md b/desktop/linux/release-notes/index.md deleted file mode 100644 index d80380deec..0000000000 --- a/desktop/linux/release-notes/index.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -description: Change log / release notes for Docker Desktop for Linux -keywords: Docker Desktop for Linux, release notes -title: Docker Desktop for Linux release notes -toc_min: 1 -toc_max: 2 ---- - -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. - -Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1){: target="_blank" rel="noopener" class="_"} to see what's coming next. - -## Docker Desktop 4.8.1 -2022-05-09 - -> Download Docker Desktop -> -> [DEB](https://desktop-stage.docker.com/linux/main/amd64/78998/docker-desktop-4.8.1-amd64.deb) | -> [RPM](https://desktop-stage.docker.com/linux/main/amd64/78998/docker-desktop-4.8.1-x86_64.rpm) | -> [Arch package](https://desktop-stage.docker.com/linux/main/amd64/78998/docker-desktop-4.8.1-x86_64.pkg.tar.zst) - -## Bugfixes and minor changes - -- Fixed a bug that caused the Kubernetes cluster to be deleted when updating Docker Desktop. - -## Known issues - -- Changing ownership rights for files in bind mounts fails. This is due to the way we have implemented file sharing between the host and VM within which the Docker Engine runs. We aim to resolve this issue in the next release. - -## Docker Desktop 4.8.0 -2022-05-06 - -> Download Docker Desktop -> -> [DEB](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.8.0-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64) | -> [RPM](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.8.0-x86_64.rpm?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64) | -> [Arch package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.8.0-x86_64.pkg.tar.zst?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64) - -## Known issues - -- Changing ownership rights for files in bind mounts fails. This is due to the way we have implemented file sharing between the host and VM within which the Docker Engine runs. We aim to resolve this issue in the next release. -- Currently, if you are running a Kubernetes cluster, it will be deleted when you upgrade to Docker Desktop 4.8.0. We aim to fix this in the next release. diff --git a/desktop/linux/space.md b/desktop/linux/space.md deleted file mode 100644 index 2b2e83bffc..0000000000 --- a/desktop/linux/space.md +++ /dev/null @@ -1,98 +0,0 @@ ---- -description: Disk utilization -keywords: linux, disk -title: Disk utilization in Docker Desktop for Linux ---- - -Docker Desktop stores Linux containers and images in a single, large "disk image" file in the Linux filesystem. This is different from Docker on Linux, which usually stores containers and images in the `/var/lib/docker` directory on the host's filesystem. - -## Where is the disk image file? - -To locate the disk image file, select the Docker icon and then -**Settings** > **Resources** > **Advanced**. - -![Disk preferences](images/menu/prefs-advanced.png){:width="750px"} - -The **Advanced** tab displays the location of the disk image. It also displays the maximum size of the disk image and the actual space the disk image is consuming. Note that other tools might display space usage of the file in terms of the maximum file size, and not the actual file size. - -## If the file is too large - -If the disk image file is too large, you can: - -- move it to a bigger drive, -- delete unnecessary containers and images, or -- reduce the maximum allowable size of the file. - -### Move the file to a bigger drive - -To move the disk image file to a different location: - -1. Select **Settings** > **Resources** > **Advanced**. - -2. In the **Disk image location** section, click **Browse** and choose a new location for the disk image. - -3. Click **Apply & Restart** for the changes to take effect. - -Do not move the file directly in Finder as this can cause Docker Desktop to lose track of the file. - -### Delete unnecessary containers and images - -Check whether you have any unnecessary containers and images. If your client and daemon API are running version 1.25 or later (use the `docker version` command on the client to check your client and daemon API versions), you can see the detailed space usage information by running: - -```console -$ docker system df -v -``` - -Alternatively, to list images, run: - -```console -$ docker image ls -``` - -and then, to list containers, run: - -```console -$ docker container ls -a -``` - -If there are lots of redundant objects, run the command: - -```console -$ docker system prune -``` - -This command removes all stopped containers, unused networks, dangling images, and build cache. - -It might take a few minutes to reclaim space on the host depending on the format of the disk image file: - -- If the file is named `Docker.raw`: space on the host should be reclaimed within a few seconds. -- If the file is named `Docker.qcow2`: space will be freed by a background process after a few minutes. - -Space is only freed when images are deleted. Space is not freed automatically when files are deleted inside running containers. To trigger a space reclamation at any point, run the command: - -```console -$ docker run --privileged --pid=host docker/desktop-reclaim-space -``` - -Note that many tools report the maximum file size, not the actual file size. -To query the actual size of the file on the host from a terminal, run: - -```console -$ cd ~/.docker/desktop/vms/0/data -$ ls -klsh Docker.raw -2333548 -rw-r--r--@ 1 username staff 64G Dec 13 17:42 Docker.raw -``` - -In this example, the actual size of the disk is `2333548` KB, whereas the maximum size of the disk is `64` GB. - -### Reduce the maximum size of the file - -To reduce the maximum size of the disk image file: - -1. Select the Docker icon and then select **Settings** > **Resources** > **Advanced**. - -2. The **Disk image size** section contains a slider that allows you to change the maximum size of the disk image. Adjust the slider to set a lower limit. - -3. Click **Apply & Restart**. - -When you reduce the maximum size, the current disk image file is deleted, and therefore, all containers and images will be lost. diff --git a/desktop/mac/index.md b/desktop/mac/index.md deleted file mode 100644 index 6f68b0b235..0000000000 --- a/desktop/mac/index.md +++ /dev/null @@ -1,250 +0,0 @@ ---- -description: Getting Started -keywords: mac, tutorial, run, docker, local, machine -redirect_from: -- /docker-for-mac/ -- /docker-for-mac/index/ -- /docker-for-mac/mutagen/ -- /docker-for-mac/mutagen-caching/ -- /docker-for-mac/osx/ -- /docker-for-mac/started/ -- /engine/installation/mac/ -- /installation/mac/ -- /mac/ -- /mac/started/ -- /mackit/ -- /mackit/getting-started/ -- /docker-for-mac/osxfs/ -- /docker-for-mac/osxfs-caching/ -title: Docker Desktop for Mac user manual ---- - -The Docker Desktop for Mac user manual provides information on how to Add TLS certificates and other useful topics. - -For information about Docker Desktop download, system requirements, and installation instructions, see [Install Docker Desktop](../install/mac-install.md). - -## Add TLS certificates - -You can add trusted Certificate Authorities (CAs) (used to verify registry -server certificates) and client certificates (used to authenticate to -registries) to your Docker daemon. - -### Add custom CA certificates (server side) - -All trusted CAs (root or intermediate) are supported. Docker Desktop creates a -certificate bundle of all user-trusted CAs based on the Mac Keychain, and -appends it to Moby trusted certificates. So if an enterprise SSL certificate is -trusted by the user on the host, it is trusted by Docker Desktop. - -To manually add a custom, self-signed certificate, start by adding the -certificate to the macOS keychain, which is picked up by Docker Desktop. Here is -an example: - -```console -$ sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain ca.crt -``` - -Or, if you prefer to add the certificate to your own local keychain only (rather -than for all users), run this command instead: - -```console -$ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain ca.crt -``` - -See also, [Directory structures for -certificates](#directory-structures-for-certificates). - -> **Note**: You need to restart Docker Desktop after making any changes to the -> keychain or to the `~/.docker/certs.d` directory in order for the changes to -> take effect. - -For a complete explanation of how to do this, see the blog post [Adding -Self-signed Registry Certs to Docker & Docker Desktop for -Mac](https://blog.container-solutions.com/adding-self-signed-registry-certs-docker-mac){:target="_blank" rel="noopener" class="_"}. - -### Add client certificates - -You can put your client certificates in -`~/.docker/certs.d/:/client.cert` and -`~/.docker/certs.d/:/client.key`. - -When the Docker Desktop application starts, it copies the `~/.docker/certs.d` -folder on your Mac to the `/etc/docker/certs.d` directory on Moby (the Docker -Desktop `xhyve` virtual machine). - -> * You need to restart Docker Desktop after making any changes to the keychain -> or to the `~/.docker/certs.d` directory in order for the changes to take -> effect. -> -> * The registry cannot be listed as an _insecure registry_ (see [Docker -> Engine](#docker-engine). Docker Desktop ignores certificates listed -> under insecure registries, and does not send client certificates. Commands -> like `docker run` that attempt to pull from the registry produce error -> messages on the command line, as well as on the registry. - -### Directory structures for certificates - -If you have this directory structure, you do not need to manually add the CA -certificate to your Mac OS system login: - -``` -/Users//.docker/certs.d/ -└── : - ├── ca.crt - ├── client.cert - └── client.key -``` - -The following further illustrates and explains a configuration with custom -certificates: - -``` -/etc/docker/certs.d/ <-- Certificate directory -└── localhost:5000 <-- Hostname:port - ├── client.cert <-- Client certificate - ├── client.key <-- Client key - └── ca.crt <-- Certificate authority that signed - the registry certificate -``` - -You can also have this directory structure, as long as the CA certificate is -also in your keychain. - -``` -/Users//.docker/certs.d/ -└── : - ├── client.cert - └── client.key -``` - -To learn more about how to install a CA root certificate for the registry and -how to set the client TLS certificate for verification, see -[Verify repository client with certificates](../../engine/security/certificates.md) -in the Docker Engine topics. - -## Install shell completion - -Docker Desktop comes with scripts to enable completion for the `docker` and `docker-compose` commands. The completion scripts may be -found inside `Docker.app`, in the `Contents/Resources/etc/` directory and can be -installed both in Bash and Zsh. - -### Bash - -Bash has [built-in support for -completion](https://www.debian-administration.org/article/316/An_introduction_to_bash_completion_part_1){:target="_blank" -class="_"} To activate completion for Docker commands, these files need to be -copied or symlinked to your `bash_completion.d/` directory. For example, if you -installed bash via [Homebrew](https://brew.sh): - -```bash -etc=/Applications/Docker.app/Contents/Resources/etc -ln -s $etc/docker.bash-completion $(brew --prefix)/etc/bash_completion.d/docker -ln -s $etc/docker-compose.bash-completion $(brew --prefix)/etc/bash_completion.d/docker-compose -``` - -Add the following to your `~/.bash_profile`: - -```bash -[ -f /usr/local/etc/bash_completion ] && . /usr/local/etc/bash_completion -``` - -OR - -```bash -if [ -f $(brew --prefix)/etc/bash_completion ]; then -. $(brew --prefix)/etc/bash_completion -fi -``` - -### Zsh - -In Zsh, the [completion -system](http://zsh.sourceforge.net/Doc/Release/Completion-System.html){:target="_blank" rel="nooopener" class="_"} -takes care of things. To activate completion for Docker commands, -these files need to be copied or symlinked to your Zsh `site-functions/` -directory. For example, if you installed Zsh via [Homebrew](https://brew.sh){:target="_blank" rel="nooopener" class="_"}: - -```bash -etc=/Applications/Docker.app/Contents/Resources/etc -ln -s $etc/docker.zsh-completion /usr/local/share/zsh/site-functions/_docker -ln -s $etc/docker-compose.zsh-completion /usr/local/share/zsh/site-functions/_docker-compose -``` - -### Fish-Shell - -Fish-shell also supports tab completion [completion -system](https://fishshell.com/docs/current/#tab-completion){:target="_blank" -class="_"}. To activate completion for Docker commands, -these files need to be copied or symlinked to your Fish-shell `completions/` -directory. - -Create the `completions` directory: - -```console -$ mkdir -p ~/.config/fish/completions -``` - -Now add fish completions from docker. - -```console -$ ln -shi /Applications/Docker.app/Contents/Resources/etc/docker.fish-completion ~/.config/fish/completions/docker.fish -$ ln -shi /Applications/Docker.app/Contents/Resources/etc/docker-compose.fish-completion ~/.config/fish/completions/docker-compose.fish -``` - -## Docker Hub - -Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories and organizations directly from the Docker Desktop menu. - -For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){:target="_blank" -class="_"}: - -* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"} -* [Builds](../../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"} - -### Two-factor authentication - -Docker Desktop enables you to sign into Docker Hub using two-factor authentication. Two-factor authentication provides an extra layer of security when accessing your Docker Hub account. - -You must enable two-factor authentication in Docker Hub before signing into your Docker Hub account through Docker Desktop. For instructions, see [Enable two-factor authentication for Docker Hub](/docker-hub/2fa/). - -After you have enabled two-factor authentication: - -1. Go to the Docker Desktop menu and then select **Sign in / Create Docker ID**. - -2. Enter your Docker ID and password and click **Sign in**. - -3. After you have successfully signed in, Docker Desktop prompts you to enter the authentication code. Enter the six-digit code from your phone and then click **Verify**. - -![Docker Desktop 2FA](images/desktop-mac-2fa.png){:width="500px"} - -After you have successfully authenticated, you can access your organizations and repositories directly from the Docker Desktop menu. - -## Pause/Resume - -Starting with the Docker Desktop 4.2 release, you can pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. When you pause Docker Desktop, the Linux VM running Docker Engine is paused, the current state of all your containers are saved in memory, and all processes are frozen. This reduces the CPU usage and helps you retain a longer battery life on your laptop. You can resume Docker Desktop when you want by clicking the Resume option. - -From the Docker menu, select ![whale menu](images/whale-x.png){: .inline} > **Pause** to pause Docker Desktop. - -![Docker context menu](images/menu/prefs.png){:width="250px"} - -Docker Desktop now displays the paused status on the Docker menu and on the **Containers / Apps**, **Images**, **Volumes**, and **Dev Environment** screens on the Docker Dashboard. You can still access the **Preferences** and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop. - -Select ![whale menu](images/whale-x.png){: .inline} > **Resume** to resume Docker Desktop. - -> **Note** -> -> When Docker Desktop is paused, running any commands in the Docker CLI will automatically resume Docker Desktop. - -## Where to go next - -* Try out the walkthrough at [Get Started](/get-started/){: target="_blank" - class="_"}. - -* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example - walkthroughs and source code. - -* For a summary of Docker command line interface (CLI) commands, see - [Docker CLI Reference Guide](../../engine/api/index.md){: target="_blank" rel="noopener" class="_"}. - -* Check out the blog post, [What’s New in Docker 17.06 Community Edition - (CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" rel="noopener" class="_"}. diff --git a/desktop/mac/networking.md b/desktop/mac/networking.md deleted file mode 100644 index 4304980c84..0000000000 --- a/desktop/mac/networking.md +++ /dev/null @@ -1,160 +0,0 @@ ---- -description: Networking -keywords: mac, networking -redirect_from: -- /docker-for-mac/networking/ -- /mackit/networking/ -title: Networking features in Docker Desktop for Mac ---- -{% assign Arch = 'Mac' %} - -Docker Desktop for {{Arch}} provides several networking features to make it -easier to use. - -## Features - -### VPN Passthrough - -Docker Desktop for {{Arch}}'s networking can work when attached to a VPN. To do this, -Docker Desktop for {{Arch}} intercepts traffic from the containers and injects it into -{{Arch}} as if it originated from the Docker application. - -### Port Mapping - -When you run a container with the `-p` argument, for example: - -```console -$ docker run -p 80:80 -d nginx -``` - -Docker Desktop for {{Arch}} makes whatever is running on port 80 in the container (in -this case, `nginx`) available on port 80 of `localhost`. In this example, the -host and container ports are the same. What if you need to specify a different -host port? If, for example, you already have something running on port 80 of -your host machine, you can connect the container to a different port: - -```console -$ docker run -p 8000:80 -d nginx -``` - -Now, connections to `localhost:8000` are sent to port 80 in the container. The -syntax for `-p` is `HOST_PORT:CLIENT_PORT`. - -### HTTP/HTTPS Proxy Support - -See [Proxies](index.md#proxies). - -### SSH agent forwarding - -Docker Desktop for Mac allows you to use the host’s SSH agent inside a container. To do this: - -1. Bind mount the SSH agent socket by adding the following parameter to your `docker run` command: - - `--mount type=bind,src=/run/host-services/ssh-auth.sock,target=/run/host-services/ssh-auth.sock` - -1. Add the `SSH_AUTH_SOCK` environment variable in your container: - - `-e SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock"` - -To enable the SSH agent in Docker Compose, add the following flags to your service: - - ```yaml -services: - web: - image: nginx:alpine - volumes: - - type: bind - source: /run/host-services/ssh-auth.sock - target: /run/host-services/ssh-auth.sock - environment: - - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock - ``` - -## Known limitations, use cases, and workarounds - -Following is a summary of current limitations on the Docker Desktop for {{Arch}} -networking stack, along with some ideas for workarounds. - -### Changing internal IP addresses - -The internal IP addresses used by Docker can be changed via the Settings (Windows) -or Preferences (Mac). After changing IPs, it is necessary to reset the Kubernetes -cluster and to leave any active Swarm. - -### There is no docker0 bridge on macOS - -Because of the way networking is implemented in Docker Desktop for Mac, you cannot see a -`docker0` interface on the host. This interface is actually within the virtual -machine. - -### I cannot ping my containers - -Docker Desktop for Mac can't route traffic to containers. - -### Per-container IP addressing is not possible - -The docker (Linux) bridge network is not reachable from the macOS host. - -### Use cases and workarounds - -There are two scenarios that the above limitations affect: - -#### I want to connect from a container to a service on the host - -The host has a changing IP address (or none if you have no network access). We recommend that you connect to the special DNS name -`host.docker.internal` which resolves to the internal IP address used by the -host. This is for development purpose and will not work in a production environment outside of Docker Desktop for Mac. - -You can also reach the gateway using `gateway.docker.internal`. - -If you have installed Python on your machine, use the following instructions as an example to connect from a container to a service on the host: - -1. Run the following command to start a simple HTTP server on port 8000. - - `python -m http.server 8000` - - If you have installed Python 2.x, run `python -m SimpleHTTPServer 8000`. - -2. Now, run a container, install `curl`, and try to connect to the host using the following commands: - - ```console - $ docker run --rm -it alpine sh - # apk add curl - # curl http://host.docker.internal:8000 - # exit - ``` - -#### I want to connect to a container from the Mac - -Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work. -Ports exposed from Linux are forwarded to the host. - -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 -overlay network, not a bridge network, as these are not routed. - -For example, to run an `nginx` webserver: - -```console -$ docker run -d -p 80:80 --name webserver nginx -``` - -To clarify the syntax, the following two commands both expose port `80` on the -container to port `8000` on the host: - -```console -$ docker run --publish 8000:80 --name webserver nginx - -$ docker run -p 8000:80 --name webserver nginx -``` - -To expose all ports, use the `-P` flag. For example, the following command -starts a container (in detached mode) and the `-P` exposes all ports on the -container to random ports on the host. - -```console -$ docker run -d -P --name webserver nginx -``` - -See the [run command](../../engine/reference/commandline/run.md) for more details on -publish options used with `docker run`. diff --git a/desktop/mac/release-notes/index.md b/desktop/mac/release-notes/index.md deleted file mode 100644 index 7e3c1fdcc7..0000000000 --- a/desktop/mac/release-notes/index.md +++ /dev/null @@ -1,500 +0,0 @@ ---- -description: Change log / release notes for Docker Desktop for Mac -keywords: Docker Desktop for Mac, release notes -title: Docker Desktop for Mac release notes -toc_min: 1 -toc_max: 2 -redirect_from: -- /docker-for-mac/release-notes/ -- /docker-for-mac/edge-release-notes/ -- /mackit/release-notes/ ---- - -> **Update to the Docker Desktop terms** -> -> Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid -> subscription. The grace period for those that will require a paid subscription -> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: - target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. -{: .important} - -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. - -Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1){: target="_blank" rel="noopener" class="_"} to see what's coming next. - -## Docker Desktop 4.8.1 -2022-05-09 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/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/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: -> .button .primary-btn } - -### New - -- Released [Docker Desktop for Linux](https://docs.docker.com/desktop/linux/). -- Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. -- Created a Docker Homepage where you can run popular images and discover how to use them. -- [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) - -### Bug fixes and minor changes - -- Fixed a bug that caused the Kubernetes cluster to be deleted when updating Docker Desktop. - -## Docker Desktop 4.8.0 -2022-05-06 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/78933/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/78933/Docker.dmg) - -### New - -- Released [Docker Desktop for Linux](https://docs.docker.com/desktop/linux/). -- Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. -- Created a Docker Homepage where you can run popular images and discover how to use them. -- [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) - -### Upgrades - -- [Compose v2.5.0](https://github.com/docker/compose/releases/tag/v2.5.0) -- [Go 1.18.1](https://golang.org/doc/go1.18) -- [Kubernetes 1.24](https://github.com/kubernetes/kubernetes/releases/tag/v1.24.0) - -### Bug fixes and minor changes - -- Introduced reading system proxy. You no longer need to manually configure proxies unless it differs from your OS level proxy. -- Fixed a bug that showed Remote Repositories in the Dashboard when running behind a proxy. -- Fixed vpnkit establishing and blocking the client connection even if the server is gone. See [docker/for-mac#6235](https://github.com/docker/for-mac/issues/6235). -- Made improvements on the Volume tab in Docker Desktop: - - Volume size is displayed. - - Columns can be resized, hidden and reordered. - - A columns sort order and hidden state is persisted, even after Docker Desktop restarts. - - Row selection is persisted when switching between tabs, even after Docker Desktop restarts. -- Fixed a bug in the Dev Environments tab that did not add a scroll when more items were added to the screen. -- Standardised the header title and action in the Dashboard. -- Added support for downloading Registry Access Management policies through HTTP proxies. -- Fixed an issue related to empty remote repositories when the machine is in sleep mode for an extended period of time. -- Fixed a bug where dangling images were not selected in the cleanup process if their name was not marked as "" but their tag is. -- Docker Desktop's icon now matches Big Sur Style guide. See [docker/for-mac#5536](https://github.com/docker/for-mac/issues/5536). -- Fixed a problem with duplicate Dock icons and Dock icon not working as expected. Fixes [docker/for-mac#6189](https://github.com/docker/for-mac/issues/6189). -- Improved the error message when `docker pull` fails because an HTTP proxy is required. -- Added the ability to clear the search bar easily in Docker Desktop. -- Renamed the "Containers / Apps" tab to "Containers". -- Improved support for the `Cmd+Q` shortcut. - -### Known issues - -- Currently, if you are running a Kubernetes cluster, it will be deleted when you upgrade to Docker Desktop 4.8.0. We aim to fix this in the next release. - - -## Docker Desktop 4.7.1 -2022-04-19 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/77678/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/77678/Docker.dmg) -### Bug fixes and minor changes - - Fixed a crash on the Quick Start Guide final screen. - -## Docker Desktop 4.7.0 -2022-04-07 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/77141/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/77141/Docker.dmg) - -### Security - -- Update Docker Engine to v20.10.14 to address [CVE-2022-24769](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24769){: target="_blank" rel="noopener" class="_"} -- Update containerd to v1.5.11 to address [CVE-2022-24769](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24769) - -### New - -- IT Administrators can now install Docker Desktop remotely using the command line. For more information, see [Install Docker Desktop using the command line](../install.md#install-from-the-command-line). -- Add the Docker Software Bill of Materials (SBOM) CLI plugin. The new CLI plugin enables users to generate SBOMs for Docker images. For more information, see [Docker SBOM](../../../engine/sbom/index.md). -- Use [cri-dockerd](https://github.com/Mirantis/cri-dockerd){: target="_blank" rel="noopener" class="_"} for new Kubernetes clusters instead of `dockershim`. The change is transparent from the user's point of view and Kubernetes containers run on the Docker Engine as before. `cri-dockerd` allows Kubernetes to manage Docker containers using the standard [Container Runtime Interface](https://github.com/kubernetes/cri-api#readme){: target="_blank" rel="noopener" class="_"}, the same interface used to control other container runtimes. For more information, see [The Future of Dockershim is cri-dockerd](https://www.mirantis.com/blog/the-future-of-dockershim-is-cri-dockerd/){: target="_blank" rel="noopener" class="_"}. - -### Upgrades - -- [Docker Engine v20.10.14](https://docs.docker.com/engine/release-notes/#201014) -- [Compose v2.4.1](https://github.com/docker/compose/releases/tag/v2.4.1) -- [Buildx 0.8.2](https://github.com/docker/buildx/releases/tag/v0.8.2) -- [containerd v1.5.11](https://github.com/containerd/containerd/releases/tag/v1.5.11) -- [Go 1.18](https://golang.org/doc/go1.18) - -### Bug fixes and minor changes - - Fixed an issue that sometimes caused Docker Desktop to display a blank white screen. Fixes [docker/for-mac#6134](https://github.com/docker/for-mac/issues/6134). - - Fixed a bug where the Registry Access Management policy was never refreshed after a failure. - - Fixed an issue that caused Docker Desktop to become unresponsive during startup when osxfs is used for file sharing. - - Fixed a problem where gettimeofday() performance drops after waking from sleep when using Hyperkit. Fixes [docker/for-mac#3455](https://github.com/docker/for-mac/issues/3455). - - Logs and terminals in the UI now respect your OS theme in light and dark mode. - - Easily clean up many volumes at once via multi-select checkboxes. - - Improved login feedback. - -### Deprecation -- Deprecate macOS 10.14. For macOS system requirements, see [Docker Desktop for Mac system requirements](../install.md#system-requirements). - -## Docker Desktop 4.6.1 -2022-03-22 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/76265/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/76265/Docker.dmg) - -### Upgrades - -- [Buildx 0.8.1](https://github.com/docker/buildx/releases/tag/v0.8.1) - -### Bug fixes and minor changes - -- Fixed diagnostics upload when there is no HTTP proxy set. Fixes [docker/for-mac#6234](https://github.com/docker/for-mac/issues/6234). -- Removed a false positive "vm is not running" error from self-diagnose. Fixes [docker/for-mac#6233](https://github.com/docker/for-mac/issues/6233). -- Prevented spinning in vpnkit-forwarder filling the logs with error messages. - -## Docker Desktop 4.6.0 -2022-03-14 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/75818/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/75818/Docker.dmg) - -### Security - -- Fixed [CVE-2022-0847](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0847){: target="_blank" rel="noopener" class="_"}, aka “Dirty Pipe”, an issue that could enable attackers to modify files in container images on the host, from inside a container. - -### New - -- Docker Desktop 4.6.0 gives macOS users the option of enabling a new experimental file sharing technology called VirtioFS. During testing VirtioFS has been shown to drastically reduce the time taken to sync changes between the host and VM, leading to substantial performance improvements. For more information, see [VirtioFS](../index.md#experimental-features). -- The Docker Dashboard Volume Management feature now offers the ability to efficiently clean up volumes using multi-select checkboxes. - -### Upgrades - -- [Docker Engine v20.10.13](https://docs.docker.com/engine/release-notes/#201013) -- [Compose v2.3.3](https://github.com/docker/compose/releases/tag/v2.3.3) -- [Buildx 0.8.0](https://github.com/docker/buildx/releases/tag/v0.8.0) -- [containerd v1.4.13](https://github.com/containerd/containerd/releases/tag/v1.4.13) -- [runc v1.0.3](https://github.com/opencontainers/runc/releases/tag/v1.0.3) -- [Go 1.17.8](https://golang.org/doc/go1.17) -- [Linux kernel 5.10.104](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.104-379cadd2e08e8b25f932380e9fdaab97755357b3/images/sha256-7753b60f4544e5c5eed629d12151a49c8a4b48d98b4fb30e4e65cecc20da484d?context=explore) -- [Qemu 6.2.0](https://wiki.qemu.org/ChangeLog/6.2) - -### Bug fixes and minor changes - -- Fixed uploading diagnostics when an HTTPS proxy is set. -- Fixed the systray menu not displaying all menu items after starting Docker Desktop. Fixes [docker/for-mac#6192](https://github.com/docker/for-mac/issues/6192). -- Fixed a regression about Docker Desktop not starting in background anymore. Fixes [docker/for-mac#6167](https://github.com/docker/for-mac/issues/6167). -- Fixed missing Docker Desktop Dock icon. Fixes [docker/for-mac#6173](https://github.com/docker/for-mac/issues/6173). -- Made checking for updates from the systray menu open the Software updates settings section. -- Used speed up block device access when using the experimental `virtualization.framework`. See [benchmarks](https://github.com/docker/roadmap/issues/7#issuecomment-1050626886). -- Increased default VM memory allocation to half of physical memory (min 2 GB, max 8 GB) for better out-of-the-box performances. -- Fixed copying text from terminal in Quick Start Guide. Fixes [docker/for-win#12444](https://github.com/docker/for-win/issues/12444). - -### Known issues - -- After enabling VirtioFS, containers with processes running with different Unix user IDs may experience caching issues. For example if a process running as `root` queries a file and another process running as user `nginx` tries to access the same file immediately, the `nginx` process will get a "Permission Denied" error. - -## Docker Desktop 4.5.0 -2022-02-10 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/74594/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/74594/Docker.dmg) - -### Security - -- Fixed [CVE-2021-44719](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44719){: target="_blank" rel="noopener" class="_"} where Docker Desktop could be used to access any user file on the host from a container, bypassing the allowed list of shared folders. - -### New - -- Docker Desktop 4.5.0 introduces a new version of the Docker menu which creates a consistent user experience across all operating systems. For more information, see the blog post [New Docker Menu & Improved Release Highlights with Docker Desktop 4.5](https://www.docker.com/blog/new-docker-menu-improved-release-highlights-with-docker-desktop-4-5/){: target="_blank" rel="noopener" class="_"} -- The 'docker version' output now displays the version of Docker Desktop installed on the machine. - -### Upgrades - -- [Amazon ECR Credential Helper v0.6.0](https://github.com/awslabs/amazon-ecr-credential-helper/releases/tag/v0.6.0){: target="blank" rel="noopener" class=""} - -### Bug fixes and minor changes - -- Fixed an issue that caused the VM to become unresponsive during startup when using `osxfs` and when no host directories are shared with the VM. -- Increased the filesystem watch (inotify) limits by setting `fs.inotify.max_user_watches=1048576` and `fs.inotify.max_user_instances=8192` in Linux. Fixes [docker/for-mac#6071](https://github.com/docker/for-mac/issues/6071). -- Fixed an issue that didn't allow users to stop a Docker Compose application using Docker Dashboard if the application was started in a different version of Docker Compose. For example, if the user started a Docker Compose application in V1 and then switched to Docker Compose V2, attempts to stop the Docker Compose application would fail. -- Fixed an issue where Docker Desktop incorrectly prompted users to sign in after they quit Docker Desktop and start the application. -- Fixed an issue where the **About Docker Desktop** window wasn't working anymore. -- Limit the number of CPUs to 8 on Mac M1 to fix the startup problem. Fixes [docker/for-mac#6063](https://github.com/docker/for-mac/issues/6063). - -## Docker Desktop 4.4.2 -2022-01-13 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/73305/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/73305/Docker.dmg) - -### Security - -- Fixed [CVE-2021-45449](https://docs.docker.com/security/#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. - -Docker Desktop version 4.3.0 and 4.3.1 has a bug that may log sensitive information (access token or password) on the user's machine during login. -This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user has logged in while on 4.3.0, 4.3.1. Gaining access to this data would require having access to the user’s local files. - -### New - -- Easy, Secure sign in with Auth0 and Single Sign-on - - Single Sign-on: Users with a Docker Business subscription can now configure SSO to authenticate using their identity providers (IdPs) to access Docker. For more information, see [Single Sign-on](../../../single-sign-on/index.md). - - Signing in to Docker Desktop now takes you through the browser so that you get all the benefits of auto-filling from password managers. - -### Upgrades - -- [Docker Engine v20.10.12](https://docs.docker.com/engine/release-notes/#201012) -- [Compose v2.2.3](https://github.com/docker/compose/releases/tag/v2.2.3) -- [Kubernetes 1.22.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.5) -- [docker scan v0.16.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.16.0){: target="_blank" rel="noopener" class="_"} - -### Bug fixes and minor changes - -- Docker Desktop displays an error if `registry.json` contains more than one organization in the `allowedOrgs` field. If you are using multiple organizations for different groups of developers, you must provision a separate `registry.json` file for each group. -- Fixed the memory statistics for containers in the Dashboard. Fixes [docker/for-mac/#4774](https://github.com/docker/for-mac/issues/6076). -- Added a deprecated option to `settings.json`: `"deprecatedCgroupv1": true`, which switches the Linux environment back to cgroups v1. If your software requires cgroups v1, you should update it to be compatible with cgroups v2. Although cgroups v1 should continue to work, it is likely that some future features will depend on cgroups v2. It is also possible that some Linux kernel bugs will only be fixed with cgroups v2. -- Fixed a regression in Compose that reverted the container name separator from `-` to `_`. Fixes [docker/compose-switch](https://github.com/docker/compose-switch/issues/24). -- Fixed an issue where putting the machine to Sleep mode after pausing Docker Desktop results in Docker Desktop not being able to resume from pause after the machine comes out of Sleep mode. Fixes [for-mac#6058](https://github.com/docker/for-mac/issues/6058). - -### Known issues - -- The tips of the week show on top of the mandatory login dialog when an organization restriction is enabled via a `registry.json` file. - -## Docker Desktop 4.3.2 -2021-12-21 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/72729/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/72729/Docker.dmg) - -### Security - -- Fixed [CVE-2021-45449](https://docs.docker.com/security/#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. - -Docker Desktop version 4.3.0 and 4.3.1 has a bug that may log sensitive information (access token or password) on the user's machine during login. -This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user has logged in while on 4.3.0, 4.3.1. Gaining access to this data would require having access to the user’s local files. - -### Upgrades - -[docker scan v0.14.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.14.0){: target="_blank" rel="noopener" class="_"} - -### Security - -**Log4j 2 CVE-2021-44228**: We have updated the `docker scan` CLI plugin. -This new version of `docker scan` is able to detect [Log4j 2 -CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228){: -target="_blank" rel="noopener" class="_"} and [Log4j 2 -CVE-2021-45046](https://nvd.nist.gov/vuln/detail/CVE-2021-45046). - -For more information, read the blog post [Apache Log4j 2 -CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/){: target="_blank" rel="noopener" class="_"}. - -## Docker Desktop 4.3.1 -2021-12-11 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/72247/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/72247/Docker.dmg) - -### Upgrades - -[docker scan v0.11.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.11.0){: target="_blank" rel="noopener" class="_"} - -### Security - -**Log4j 2 CVE-2021-44228**: We have updated the `docker scan` CLI plugin for you. -Older versions of `docker scan` in Docker Desktop 4.3.0 and earlier versions are -not able to detect [Log4j 2 -CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228){: -target="_blank" rel="noopener" class="_"}. - -For more information, read the -blog post [Apache Log4j 2 CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/){: target="_blank" rel="noopener" class="_"}. - -## Docker Desktop 4.3.0 -2021-12-02 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/71786/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/71786/Docker.dmg) - -### Upgrades - -- [Docker Engine v20.10.11](https://docs.docker.com/engine/release-notes/#201011) -- [containerd v1.4.12](https://github.com/containerd/containerd/releases/tag/v1.4.12) -- [Buildx 0.7.1](https://github.com/docker/buildx/releases/tag/v0.7.1) -- [Compose v2.2.1](https://github.com/docker/compose/releases/tag/v2.2.1) -- [Kubernetes 1.22.4](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.4) -- [Docker Hub Tool v0.4.4](https://github.com/docker/hub-tool/releases/tag/v0.4.4) -- [Go 1.17.3](https://golang.org/doc/go1.17) - -### Bug fixes and minor changes - -- Docker Desktop on Apple silicon no longer requires Rosetta 2, with the exception of [three optional command line tools](../apple-silicon/#known-issues). -- Fixed an issue which prevented users from saving files from a volume using the Save As option in the Volumes UI. Fixes [docker/for-win#12407](https://github.com/docker/for-win/issues/12407). -- Fixed an issue that sometimes launched the existing version of Docker Desktop even after updating to a newer version. -- Added a self-diagnose warning if the host lacks Internet connectivity. -- Docker Desktop now uses cgroupv2. If you need to run `systemd` in a container then: - - Ensure your version of `systemd` supports cgroupv2. [It must be at least `systemd` 247](https://github.com/systemd/systemd/issues/19760#issuecomment-851565075). Consider upgrading any `centos:7` images to `centos:8`. - - Containers running `systemd` need the following options: [`--privileged --cgroupns=host -v /sys/fs/cgroup:/sys/fs/cgroup:rw`](https://serverfault.com/questions/1053187/systemd-fails-to-run-in-a-docker-container-when-using-cgroupv2-cgroupns-priva). - -### Known issue - -Docker Dashboard incorrectly displays the container memory usage as zero. -You can use the [`docker stats`](../../../engine/reference/commandline/stats.md) -command on the command line as a workaround to view the -actual memory usage. See -[docker/for-mac#6076](https://github.com/docker/for-mac/issues/6076). - -### Deprecation - -- The following internal DNS names are deprecated and will be removed from a future release: `docker-for-desktop`, `docker-desktop`, `docker.for.mac.host.internal`, `docker.for.mac.localhost`, `docker.for.mac.gateway.internal`. You must now use `host.docker.internal`, `vm.docker.internal`, and `gateway.docker.internal`. -- Custom RBAC rules have been removed from Docker Desktop as it gives `cluster-admin` privileges to all Service Accounts. Fixes [docker/for-mac/#4774](https://github.com/docker/for-mac/issues/4774). - -## Docker Desktop 4.2.0 -2021-11-09 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/70708/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/70708/Docker.dmg) - -### New - -**Pause/Resume**: You can now pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. For more information, see [Pause/Resume](../index.md#pauseresume). - -- Ships [Docker Public Roadmap#226](https://github.com/docker/roadmap/issues/226){: target="_blank" rel="noopener" class="_"} - -**Software Updates**: The option to turn off automatic check for updates is now available for users on all Docker subscriptions, including Docker Personal and Docker Pro. All update-related settings have been moved to the **Software Updates** section. For more information, see [Software updates](../index.md#software-updates). - -- Ships [Docker Public Roadmap#228](https://github.com/docker/roadmap/issues/228){: target="_blank" rel="noopener" class="_"} - -**Window management**: The Docker Dashboard window size and position persists when you close and reopen Docker Desktop. - -### Upgrades - -- [Docker Engine v20.10.10](https://docs.docker.com/engine/release-notes/#201010) -- [containerd v1.4.11](https://github.com/containerd/containerd/releases/tag/v1.4.11) -- [runc v1.0.2](https://github.com/opencontainers/runc/releases/tag/v1.0.2) -- [Go 1.17.2](https://golang.org/doc/go1.17) -- [Compose v2.1.1](https://github.com/docker/compose/releases/tag/v2.1.1) -- [docker-scan 0.9.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.9.0) - -### Bug fixes and minor changes - -- Improved: Self-diagnose now also checks for overlap between host IPs and `docker networks`. -- Fixed the position of the indicator that displays the availability of an update on the Docker Dashboard. -- Fixed an issue that caused Docker Desktop to stop responding upon clicking **Exit** on the fatal error dialog. -- Fixed a rare startup failure affecting users having a `docker volume` bind-mounted on top of a directory from the host. If existing, this fix will also remove manually user added `DENY DELETE` ACL entries on the corresponding host directory. -- Fixed a bug where a `Docker.qcow2` file would be ignored on upgrade and a fresh `Docker.raw` used instead, resulting in containers and images disappearing. Note that if a system has both files (due to the previous bug) then the most recently modified file will be used, to avoid recent containers and images disappearing again. To force the use of the old `Docker.qcow2`, delete the newer `Docker.raw` file. Fixes [docker/for-mac#5998](https://github.com/docker/for-mac/issues/5998). -- Fixed a bug where subprocesses could fail unexpectedly during shutdown, triggering an unexpected fatal error popup. Fixes [docker/for-mac#5834](https://github.com/docker/for-mac/issues/5834). - - -## Docker Desktop 4.1.1 -2021-10-12 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/69879/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/69879/Docker.dmg) - -### Bug fixes and minor changes - -> When upgrading from 4.1.0, the Docker menu does not change to **Update and restart** so you can just wait for the download to complete (icon changes) and then select **Restart**. This bug is fixed in 4.1.1, for future upgrades. - -- Fixed a bug where a `Docker.qcow2` file would be ignored on upgrade and a fresh `Docker.raw` used instead, resulting in containers and images disappearing. If a system has both files (due to the previous bug), then the most recently modified file will be used to avoid recent containers and images disappearing again. To force the use of the old `Docker.qcow2`, delete the newer `Docker.raw` file. Fixes [docker/for-mac#5998](https://github.com/docker/for-mac/issues/5998). -- Fixed the update notification overlay sometimes getting out of sync between the **Settings** button and the **Software update** button in the Docker Dashboard. -- Fixed the menu entry to install a newly downloaded Docker Desktop update. When an update is ready to install, the **Restart** option changes to **Update and restart**. - -## Docker Desktop 4.1.0 -2021-09-30 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/69386/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/69386/Docker.dmg) - -### New - -- **Software Updates**: The Settings tab now includes a new section to help you manage Docker Desktop updates. The **Software Updates** section notifies you whenever there's a new update and allows you to download the update or view information on what's included in the newer version. For more information, see [Software Updates](../index.md#software-updates). -- **Compose V2** You can now specify whether to use [Docker Compose V2](../../../compose/index.md#compose-v2-and-the-new-docker-compose-command) in the General settings. -- **Volume Management**: Volume management is now available for users on any subscription, including Docker Personal. For more information, see [Explore volumes](../../dashboard.md#explore-volumes). Ships [Docker Public Roadmap#215](https://github.com/docker/roadmap/issues/215){: target="_blank" rel="noopener" class="_"} - -### Upgrades - -- [Compose V2](https://github.com/docker/compose/releases/tag/v2.0.0) -- [Buildx 0.6.3](https://github.com/docker/buildx/releases/tag/v0.6.3) -- [Kubernetes 1.21.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.5) -- [Go 1.17.1](https://github.com/golang/go/releases/tag/go1.17.1) -- [Alpine 3.14](https://alpinelinux.org/posts/Alpine-3.14.0-released.html) -- [Qemu 6.1.0](https://wiki.qemu.org/ChangeLog/6.1) -- Base distro to debian:bullseye - -## Docker Desktop 4.0.1 -2021-09-13 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/68347/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/68347/Docker.dmg) - -### Upgrades - -- [Compose V2 RC3](https://github.com/docker/compose/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 -2021-08-31 - -> Download Docker Desktop -> -> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/67817/Docker.dmg) | -> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/67817/Docker.dmg) - -### New - -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. - -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. -- 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 Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop. -- 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. - -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). - -### Upgrades - -- [Compose V2 RC2](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.2) - - Fixed project name to be case-insensitive for `compose down`. See [docker/compose-cli#2023](https://github.com/docker/compose-cli/issues/2023) - - Fixed non-normalized project name. - - Fixed port merging on partial reference. -- [Kubernetes 1.21.4](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.4) - -### Bug fixes and minor changes - -- Fixed a bug where SSH was not available for builds from git URL. Fixes [for-mac#5902](https://github.com/docker/for-mac/issues/5902) diff --git a/desktop/mac/space.md b/desktop/mac/space.md deleted file mode 100644 index 8d65030694..0000000000 --- a/desktop/mac/space.md +++ /dev/null @@ -1,100 +0,0 @@ ---- -description: Disk utilization -keywords: mac, disk -title: Disk utilization in Docker for Mac -redirect_from: -- /docker-for-mac/space/ ---- - -Docker Desktop stores Linux containers and images in a single, large "disk image" file in the Mac filesystem. This is different from Docker on Linux, which usually stores containers and images in the `/var/lib/docker` directory. - -## Where is the disk image file? - -To locate the disk image file, select the Docker icon and then -**Preferences** > **Resources** > **Advanced**. - -![Disk preferences](images/menu/prefs-advanced.png){:width="750px"} - -The **Advanced** tab displays the location of the disk image. It also displays the maximum size of the disk image and the actual space the disk image is consuming. Note that other tools might display space usage of the file in terms of the maximum file size, and not the actual file size. - -## If the file is too big - -If the disk image file is too big, you can: - -- move it to a bigger drive, -- delete unnecessary containers and images, or -- reduce the maximum allowable size of the file. - -### Move the file to a bigger drive - -To move the disk image file to a different location: - -1. Select **Preferences** > **Resources** > **Advanced**. - -2. In the **Disk image location** section, click **Browse** and choose a new location for the disk image. - -3. Click **Apply & Restart** for the changes to take effect. - -Do not move the file directly in Finder as this can cause Docker Desktop to lose track of the file. - -### Delete unnecessary containers and images - -Check whether you have any unnecessary containers and images. If your client and daemon API are running version 1.25 or later (use the `docker version` command on the client to check your client and daemon API versions), you can see the detailed space usage information by running: - -```console -$ docker system df -v -``` - -Alternatively, to list images, run: - -```console -$ docker image ls -``` - -and then, to list containers, run: - -```console -$ docker container ls -a -``` - -If there are lots of redundant objects, run the command: - -```console -$ docker system prune -``` - -This command removes all stopped containers, unused networks, dangling images, and build cache. - -It might take a few minutes to reclaim space on the host depending on the format of the disk image file: - -- If the file is named `Docker.raw`: space on the host should be reclaimed within a few seconds. -- If the file is named `Docker.qcow2`: space will be freed by a background process after a few minutes. - -Space is only freed when images are deleted. Space is not freed automatically when files are deleted inside running containers. To trigger a space reclamation at any point, run the command: - -```console -$ docker run --privileged --pid=host docker/desktop-reclaim-space -``` - -Note that many tools report the maximum file size, not the actual file size. -To query the actual size of the file on the host from a terminal, run: - -```console -$ cd ~/Library/Containers/com.docker.docker/Data/vms/0/data -$ ls -klsh Docker.raw -2333548 -rw-r--r--@ 1 username staff 64G Dec 13 17:42 Docker.raw -``` - -In this example, the actual size of the disk is `2333548` KB, whereas the maximum size of the disk is `64` GB. - -### Reduce the maximum size of the file - -To reduce the maximum size of the disk image file: - -1. Select the Docker icon and then select **Preferences** > **Resources** > **Advanced**. - -2. The **Disk image size** section contains a slider that allows you to change the maximum size of the disk image. Adjust the slider to set a lower limit. - -3. Click **Apply & Restart**. - -When you reduce the maximum size, the current disk image file is deleted, and therefore, all containers and images will be lost. diff --git a/desktop/previous-versions/2.x-mac.md b/desktop/previous-versions/2.x-mac.md index e93618c525..7a1fd7f946 100644 --- a/desktop/previous-versions/2.x-mac.md +++ b/desktop/previous-versions/2.x-mac.md @@ -359,7 +359,7 @@ Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kuber ### New Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. -For more information, see [Two-factor authentication](../mac/index.md#docker-hub). + ## Docker Desktop Community 2.1.0.3 2019-09-16 diff --git a/desktop/previous-versions/2.x-windows.md b/desktop/previous-versions/2.x-windows.md index 167c8a6a7d..e4730ce6cc 100644 --- a/desktop/previous-versions/2.x-windows.md +++ b/desktop/previous-versions/2.x-windows.md @@ -487,7 +487,7 @@ Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kuber ### New -Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. For more information, see [Two-factor authentication](../windows/index.md#two-factor-authentication). +Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. ## Docker Desktop Community 2.1.0.3 2019-09-16 diff --git a/desktop/previous-versions/archive-mac.md b/desktop/previous-versions/archive-mac.md index c01a50fa5e..7eeb76659e 100644 --- a/desktop/previous-versions/archive-mac.md +++ b/desktop/previous-versions/archive-mac.md @@ -195,7 +195,7 @@ This page contains release notes for older versions of Docker Desktop for Mac. - VM entirely built with Linuxkit - VM disk size can be changed in disk preferences. (See [docker/for-mac#1037](https://github.com/docker/for-mac/issues/1037)) - For systems running APFS on SSD on High Sierra, use `raw` format VM disks by default. This improves disk throughput (from 320MiB/sec to 600MiB/sec in `dd` on a 2015 MacBook Pro) and disk space handling. - Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See [Disk utilization](../mac/space.md) + Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". - DNS name `docker.for.mac.host.internal` should be used instead of `docker.for.mac.localhost` (still valid) for host resolution from containers, since since there is an RFC banning the use of subdomains of localhost. See https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06. * Bug fixes and minor changes diff --git a/desktop/previous-versions/edge-releases-mac.md b/desktop/previous-versions/edge-releases-mac.md index fb88c0c9bd..fa6ccc303e 100644 --- a/desktop/previous-versions/edge-releases-mac.md +++ b/desktop/previous-versions/edge-releases-mac.md @@ -10,7 +10,7 @@ redirect_from: 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](../mac/index.md). For Docker Desktop system requirements, see +For Docker Desktop system requirements, see [What to know before you install](../install/mac-install.md#system-requirements). ## Docker Desktop Community 2.5.4 @@ -1683,7 +1683,7 @@ TCP connection is idle for more than five minutes (related to **New** -- More options when moving disk image (see [Storage location](../mac/space.md) under Advanced preference settings) +- More options when moving disk image - 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 send all queries in parallel, process results in order @@ -2287,7 +2287,7 @@ events or unexpected unmounts. **Bug fixes and minor changes** -* Documentation moved to [https://docs.docker.com/desktop/mac/](../mac/index.md) +* Documentation moved to [https://docs.docker.com/desktop/mac/](../index.md) * Allow non-admin users to launch the app for the first time (using admin creds) * Prompt non-admin users for admin password when needed in Preferences * Fixed download links, documentation links diff --git a/desktop/previous-versions/edge-releases-windows.md b/desktop/previous-versions/edge-releases-windows.md index 55e8c94c34..3ba8739d18 100644 --- a/desktop/previous-versions/edge-releases-windows.md +++ b/desktop/previous-versions/edge-releases-windows.md @@ -10,7 +10,7 @@ redirect_from: 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](../windows/release-notes/index.md). For Docker Desktop system requirements, see + For Docker Desktop system requirements, see [What to know before you install](../install/windows-install.md#system-requirements). ## Docker Desktop Community 2.5.4 @@ -2009,7 +2009,7 @@ registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/is **New** - Windows containers settings panel and options are working. In previous releases, settings were not implemented for -[Windows containers mode](../windows/index.md#switch-between-windows-and-linux-containers). +[Windows containers mode](../faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). - Windows containers: Restart from the settings panel works - Windows containers: Factory default - Windows containers: `Daemon.json` can be modified diff --git a/desktop/release-notes.md b/desktop/release-notes.md index 23133bed23..1071d35059 100644 --- a/desktop/release-notes.md +++ b/desktop/release-notes.md @@ -254,7 +254,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge ### New -- Released [Docker Desktop for Linux](https://docs.docker.com/desktop/linux/). +- Released [Docker Desktop for Linux](install/linux-install.md). - Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. - Created a Docker Homepage where you can run popular images and discover how to use them. - [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) @@ -283,7 +283,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge ### New -- Released [Docker Desktop for Linux](https://docs.docker.com/desktop/linux/). +- Released [Docker Desktop for Linux](install/linux-install.md). - Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. - Created a Docker Homepage where you can run popular images and discover how to use them. - [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) diff --git a/desktop/settings/windows.md b/desktop/settings/windows.md index 7915913f90..08b2030054 100644 --- a/desktop/settings/windows.md +++ b/desktop/settings/windows.md @@ -90,7 +90,7 @@ Linux containers. This is especially useful for editing source code in an IDE on the host while running and testing the code in a container. Note that configuring file sharing is not necessary for Windows containers, -only [Linux containers](../windows/index.md#switch-between-windows-and-linux-containers). +only [Linux containers](../faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). If a directory is not shared with a Linux container you may get `file not found` or `cannot start service` errors at runtime. See [Volume mounting requires shared folders for Linux containers](../troubleshoot/topics.md). diff --git a/desktop/windows/index.md b/desktop/windows/index.md deleted file mode 100644 index b99e5676bb..0000000000 --- a/desktop/windows/index.md +++ /dev/null @@ -1,163 +0,0 @@ ---- -description: Getting Started -keywords: windows, edge, tutorial, run, docker, local, machine -redirect_from: -- /docker-for-windows/ -- /docker-for-windows/index/ -- /docker-for-windows/started/ -- /engine/installation/windows/ -- /installation/windows/ -- /win/ -- /windows/ -- /windows/started/ -- /winkit/ -- /winkit/getting-started/ - -title: Docker Desktop for Windows user manual ---- - -Welcome to Docker Desktop! The Docker Desktop for Windows user manual provides information on how to add TLS certificates and switch between Windows and Linux containers. - -For information about Docker Desktop download, system requirements, and installation instructions, see [Install Docker Desktop](../install/windows-install.md). - -## Add TLS certificates - -You can add trusted Certificate Authorities (CAs) (used to verify registry -server certificates) and client certificates (used to authenticate to -registries) to your Docker daemon. - -## Switch between Windows and Linux containers - -From the Docker Desktop menu, you can toggle which daemon (Linux or Windows) -the Docker CLI talks to. Select **Switch to Windows containers** to use Windows -containers, or select **Switch to Linux containers** to use Linux containers -(the default). - -For more information on Windows containers, refer to the following documentation: - -- Microsoft documentation on [Windows containers](https://docs.microsoft.com/en-us/virtualization/windowscontainers/about/index). - -- [Build and Run Your First Windows Server Container (Blog Post)](https://blog.docker.com/2016/09/build-your-first-docker-windows-server-container/) - gives a quick tour of how to build and run native Docker Windows containers on Windows 10 and Windows Server 2016 evaluation releases. - -- [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md) - shows you how to use the [MusicStore](https://github.com/aspnet/MusicStore/blob/dev/README.md) - application with Windows containers. The MusicStore is a standard .NET application and, - [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 - [I want to connect to a container from Windows](../networking.md#i-want-to-connect-to-a-container-from-the-host) - -> Settings dialog changes with Windows containers -> -> When you switch to Windows containers, the Settings dialog only shows those tabs that are active and apply to your Windows containers: -> - - * [General](../settings/windows.md#general) - * [Proxies](../settings/windows.md#proxies) - * [Daemon](../settings/windows.md#docker-engine) - -If you set proxies or daemon configuration in Windows containers mode, these -apply only on Windows containers. If you switch back to Linux containers, -proxies and daemon configurations return to what you had set for Linux -containers. Your Windows container settings are retained and become available -again when you switch back. - -## Dashboard - -The Docker Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md). - -## Docker Hub - -Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories directly from the Docker Desktop menu. - -For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){: target="_blank" rel="noopener" class="_" }: - -* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){: target="_blank" rel="noopener" class="_" } -* [Builds and Images](../../docker-hub/builds/index.md){: target="_blank" rel="noopener" class="_" } - -### Two-factor authentication - -Docker Desktop enables you to sign into Docker Hub using two-factor authentication. Two-factor authentication provides an extra layer of security when accessing your Docker Hub account. - -You must enable two-factor authentication in Docker Hub before signing into your Docker Hub account through Docker Desktop. For instructions, see [Enable two-factor authentication for Docker Hub](/docker-hub/2fa/). - -After you have enabled two-factor authentication: - -1. Go to the Docker Desktop menu and then select **Sign in / Create Docker ID**. - -2. Enter your Docker ID and password and click **Sign in**. - -3. After you have successfully signed in, Docker Desktop prompts you to enter the authentication code. Enter the six-digit code from your phone and then click **Verify**. - -![Docker Desktop 2FA](images/desktop-win-2fa.png){:width="500px"} - -After you have successfully authenticated, you can access your organizations and repositories directly from the Docker Desktop menu. - -## Pause/Resume - -Starting with the Docker Desktop 4.2 release, you can pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. When you pause Docker Desktop, the Linux VM running Docker Engine will be paused, the current state of all your containers are saved in memory, and all processes are frozen. This reduces the CPU usage and helps you retain a longer battery life on your laptop. You can resume Docker Desktop when you want by clicking the Resume option. - -> **Note** -> -> The Pause/Resume feature is currently not available in the Windows containers mode. - -To pause Docker Desktop, right-click the Docker icon in the notifications area (or System tray) and then click **Pause**. - -![Docker Desktop popup menu](images/docker-menu-settings.png){:width="300px"} - -Docker Desktop now displays the paused status on the Docker menu and on all screens on the Docker Dashboard. You can still access the **Preferences** and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop. - -Select ![whale menu](images/whale-x.png){: .inline} > **Resume** to resume Docker Desktop. - -> **Note** -> -> When Docker Desktop is paused, running any commands in the Docker CLI will automatically resume Docker Desktop. - -## Adding TLS certificates - -You can add trusted **Certificate Authorities (CAs)** to your Docker daemon to verify registry server certificates, and **client certificates**, to authenticate to registries. - -### How do I add custom CA certificates? - -Docker Desktop supports all trusted Certificate Authorities (CAs) (root or -intermediate). Docker recognizes certs stored under Trust Root -Certification Authorities or Intermediate Certification Authorities. - -Docker Desktop creates a certificate bundle of all user-trusted CAs based on -the Windows certificate store, and appends it to Moby trusted certificates. Therefore, if an enterprise SSL certificate is trusted by the user on the host, it is trusted by Docker Desktop. - -To learn more about how to install a CA root certificate for the registry, see -[Verify repository client with certificates](../../engine/security/certificates.md) -in the Docker Engine topics. - -### How do I add client certificates? - -You can add your client certificates -in `~/.docker/certs.d//client.cert` and -`~/.docker/certs.d//client.key`. You do not need to push your certificates with `git` commands. - -When the Docker Desktop application starts, it copies the -`~/.docker/certs.d` folder on your Windows system to the `/etc/docker/certs.d` -directory on Moby (the Docker Desktop virtual machine running on Hyper-V). - -You need to restart Docker Desktop after making any changes to the keychain -or to the `~/.docker/certs.d` directory in order for the changes to take effect. - -The registry cannot be listed as an _insecure registry_ (see -[Docker Daemon](../settings/windows.md#docker-engine)). Docker Desktop ignores -certificates listed under insecure registries, and does not send client -certificates. Commands like `docker run` that attempt to pull from the registry -produce error messages on the command line, as well as on the registry. - -To learn more about how to set the client TLS certificate for verification, see -[Verify repository client with certificates](../../engine/security/certificates.md) -in the Docker Engine topics. - -## Where to go next - -* Try out the walkthrough at [Get Started](../../get-started/index.md){: target="_blank" rel="noopener" class="_"}. - -* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code. - -* Refer to the [Docker CLI Reference Guide](/engine/reference/commandline/cli/){: target="_blank" rel="noopener" class="_"}. diff --git a/desktop/windows/networking.md b/desktop/windows/networking.md deleted file mode 100644 index 999ce854a0..0000000000 --- a/desktop/windows/networking.md +++ /dev/null @@ -1,129 +0,0 @@ ---- -description: Networking -keywords: windows, networking -title: Networking features in Docker Desktop for Windows -redirect_from: -- /docker-for-win/networking/ -- /docker-for-windows/networking/ ---- -{% assign Arch = 'Windows' %} - -Docker Desktop provides several networking features to make it easier to -use. - -## Features - -### VPN Passthrough - -Docker Desktop networking can work when attached to a VPN. To do this, -Docker Desktop intercepts traffic from the containers and injects it into -{{Arch}} as if it originated from the Docker application. - -### Port Mapping - -When you run a container with the `-p` argument, for example: - -```console -$ docker run -p 80:80 -d nginx -``` - -Docker Desktop makes whatever is running on port 80 in the container (in -this case, `nginx`) available on port 80 of `localhost`. In this example, the -host and container ports are the same. What if you need to specify a different -host port? If, for example, you already have something running on port 80 of -your host machine, you can connect the container to a different port: - -```console -$ docker run -p 8000:80 -d nginx -``` - -Now, connections to `localhost:8000` are sent to port 80 in the container. The -syntax for `-p` is `HOST_PORT:CLIENT_PORT`. - -### HTTP/HTTPS Proxy Support - -See [Proxies](index.md#proxies). - -## Known limitations, use cases, and workarounds - -Following is a summary of current limitations on the Docker Desktop for {{Arch}} -networking stack, along with some ideas for workarounds. - -### There is no docker0 bridge on {{Arch}} - -Because of the way networking is implemented in Docker Desktop for {{Arch}}, you cannot -see a `docker0` interface on the host. This interface is actually within the -virtual machine. - -### I cannot ping my containers - -Docker Desktop for Windows can't route traffic to Linux containers. However, you can -ping the Windows containers. - -### Per-container IP addressing is not possible - -The docker (Linux) bridge network is not reachable from the Windows host. -However, it works with Windows containers. - -### Use cases and workarounds - -There are two scenarios that the above limitations affect: - -#### I want to connect from a container to a service on the host - -The host has a changing IP address (or none if you have no network access). We recommend that you connect to the special DNS name -`host.docker.internal` which resolves to the internal IP address used by the -host. This is for development purpose and will not work in a production environment outside of Docker Desktop for Windows. - -You can also reach the gateway using `gateway.docker.internal`. - -If you have installed Python on your machine, use the following instructions as an example to connect from a container to a service on the host: - -1. Run the following command to start a simple HTTP server on port 8000. - - `python -m http.server 8000` - - If you have installed Python 2.x, run `python -m SimpleHTTPServer 8000`. - -2. Now, run a container, install `curl`, and try to connect to the host using the following commands: - - ```console - $ docker run --rm -it alpine sh - # apk add curl - # curl http://host.docker.internal:8000 - # exit - ``` - -#### I want to connect to a container from Windows - -Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work. -Ports exposed from Linux are forwarded to the host. - -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 -overlay network, not a bridge network, as these are not routed. - -For example, to run an `nginx` webserver: - -```console -$ docker run -d -p 80:80 --name webserver nginx -``` - -To clarify the syntax, the following two commands both publish container's port `80` to host's port `8000`: - -```console -$ docker run --publish 8000:80 --name webserver nginx - -$ docker run -p 8000:80 --name webserver nginx -``` - -To publish all ports, use the `-P` flag. For example, the following command -starts a container (in detached mode) and the `-P` flag publishes all exposed ports of the -container to random ports on the host. - -```console -$ docker run -d -P --name webserver nginx -``` - -See the [run command](../engine/reference/commandline/run.md) for more details on -publish options used with `docker run`. diff --git a/desktop/windows/release-notes/index.md b/desktop/windows/release-notes/index.md deleted file mode 100644 index a1f741654e..0000000000 --- a/desktop/windows/release-notes/index.md +++ /dev/null @@ -1,544 +0,0 @@ ---- -description: Change log / release notes for Docker Desktop for Windows -keywords: Docker Desktop for Windows, release notes -title: Docker for Windows release notes -toc_min: 1 -toc_max: 2 -redirect_from: -- /docker-for-windows/edge-release-notes/ -- /docker-for-windows/release-notes/ -- /winkit/release-notes/ ---- - -> **Update to the Docker Desktop terms** -> -> Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) now requires a paid -> subscription. The grace period for those that will require a paid subscription -> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: - target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. -{: .important} - -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. - -Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1){: target="_blank" rel="noopener" class="_"} to see what's coming next. - -## Docker Desktop 4.8.1 -2022-05-09 - -> Download Docker Desktop -> -> [For -> Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: -> .button .primary-btn } - -### New - -- Released [Docker Desktop for Linux](https://docs.docker.com/desktop/linux/). -- Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. -- Created a Docker Homepage where you can run popular images and discover how to use them. -- [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) - -### Bug fixes and minor changes - -- Fixed a bug that caused the Kubernetes cluster to be deleted when updating Docker Desktop. - - -## Docker Desktop 4.8.0 -2022-05-06 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/78933/Docker%20Desktop%20Installer.exe) - -### New - -- Released [Docker Desktop for Linux](https://docs.docker.com/desktop/linux/). -- Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. -- Created a Docker Homepage where you can run popular images and discover how to use them. -- [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) - -### Upgrades - -- [Compose v2.5.0](https://github.com/docker/compose/releases/tag/v2.5.0) -- [Go 1.18.1](https://golang.org/doc/go1.18) -- [Kubernetes 1.24](https://github.com/kubernetes/kubernetes/releases/tag/v1.24.0) - -### Bug fixes and minor changes - -- Introduced reading system proxy. You no longer need to manually configure proxies unless it differs from your OS level proxy. -- Fixed a bug that showed Remote Repositories in the Dashboard when running behind a proxy. -- Fixed vpnkit establishing and blocking the client connection even if the server is gone. See [docker/for-mac#6235](https://github.com/docker/for-mac/issues/6235) -- Made improvements on the Volume tab in Docker Desktop: - - Volume size is displayed. - - Columns can be resized, hidden and reordered. - - A columns sort order and hidden state is persisted, even after Docker Desktop restarts. - - Row selection is persisted when switching between tabs, even after Docker Desktop restarts. -- Fixed a bug in the Dev Environments tab that did not add a scroll when more items were added to the screen. -- Standardised the header title and action in the Dashboard. -- Added support for downloading Registry Access Management policies through HTTP proxies. -- Fixed an issue related to empty remote repositories when the machine is in sleep mode for an extended period of time. -- Fixed a bug where dangling images were not selected in the cleanup process if their name was not marked as "" but their tag is. -- Improved the error message when `docker pull` fails because an HTTP proxy is required. -- Added the ability to clear the search bar easily in Docker Desktop. -- Renamed the "Containers / Apps" tab to "Containers". -- Fixed a silent crash in the Docker Desktop installer when `C:\ProgramData\DockerDesktop` is a file or a symlink. -- Improved support for the `Ctrl+W` shortcut. -- Fixed a bug where an image with no namespace, for example `docker pull /image`, would be erroneously blocked by Registry Access Management unless access to Docker Hub was enabled in settings. - -### Known issues - -- Currently, if you are running a Kubernetes cluster, it will be deleted when you upgrade to Docker Desktop 4.8.0. We aim to fix this in the next release. - -## Docker Desktop 4.7.1 -2022-04-19 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/77678/Docker%20Desktop%20Installer.exe) - -### Bug fixes and minor changes - - Fixed a bug where update was failing with a symlink error. Fixes [docker/for-win#12650](https://github.com/docker/for-win/issues/12650). - - Fixed a bug that prevented using Windows container mode. Fixes [docker/for-win#12652](https://github.com/docker/for-win/issues/12652). - - Fixed a crash on the Quick Start Guide final screen. - -## Docker Desktop 4.7.0 -2022-04-07 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/77141/Docker%20Desktop%20Installer.exe) - -### Security - -- Update Docker Engine to v20.10.14 to address [CVE-2022-24769](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24769){: target="_blank" rel="noopener" class="_"} -- Update containerd to v1.5.11 to address [CVE-2022-24769](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24769) - -### New - -- IT Administrators can now install Docker Desktop remotely using the command line. For more information, see [Install Docker Desktop using the command line](../install.md#install-from-the-command-line). -- Add the Docker Software Bill of Materials (SBOM) CLI plugin. The new CLI plugin enables users to generate SBOMs for Docker images. For more information, see [Docker SBOM](../../../engine/sbom/index.md). -- Use [cri-dockerd](https://github.com/Mirantis/cri-dockerd){: target="_blank" rel="noopener" class="_"} for new Kubernetes clusters instead of `dockershim`. The change is transparent from the user's point of view and Kubernetes containers run on the Docker Engine as before. `cri-dockerd` allows Kubernetes to manage Docker containers using the standard [Container Runtime Interface](https://github.com/kubernetes/cri-api#readme){: target="_blank" rel="noopener" class="_"}, the same interface used to control other container runtimes. For more information, see [The Future of Dockershim is cri-dockerd](https://www.mirantis.com/blog/the-future-of-dockershim-is-cri-dockerd/){: target="_blank" rel="noopener" class="_"}. - -### Upgrades - -- [Docker Engine v20.10.14](https://docs.docker.com/engine/release-notes/#201014) -- [Compose v2.4.1](https://github.com/docker/compose/releases/tag/v2.4.1) -- [Buildx 0.8.2](https://github.com/docker/buildx/releases/tag/v0.8.2) -- [containerd v1.5.11](https://github.com/containerd/containerd/releases/tag/v1.5.11) -- [Go 1.18](https://golang.org/doc/go1.18) - -### Bug fixes and minor changes - - Fixed a bug where the Registry Access Management policy was never refreshed after a failure. - - Fixed volume title. Fixes [docker/for-win#12616](https://github.com/docker/for-win/issues/12616). - - Fixed a bug in the WSL 2 integration that caused Docker commands to stop working after restarting Docker Desktop or after switching to Windows containers. - - Logs and terminals in the UI now respect your OS theme in light and dark mode. - - Easily clean up many volumes at once via multi-select checkboxes. - - Improved login feedback. - -## Docker Desktop 4.6.1 -2022-03-22 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/76265/Docker%20Desktop%20Installer.exe) - -### Upgrades - -- [Buildx 0.8.1](https://github.com/docker/buildx/releases/tag/v0.8.1) - -### Bug fixes and minor changes - -- Fixed diagnostics upload when there is no HTTP proxy set. Fixes [docker/for-mac#6234](https://github.com/docker/for-mac/issues/6234). -- Removed a false positive "vm is not running" error from self-diagnose. Fixes [docker/for-mac#6233](https://github.com/docker/for-mac/issues/6233). -- Prevented spinning in vpnkit-forwarder filling the logs with error messages. - -## Docker Desktop 4.6.0 -2022-03-14 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/75818/Docker%20Desktop%20Installer.exe) - -### Security - -- Fixed [CVE-2022-0847](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0847){: target="_blank" rel="noopener" class="_"}, aka “Dirty Pipe”, an issue that could enable attackers to modify files in container images on the host, from inside a container. - If using the WSL 2 backend, you must update WSL 2 by running `wsl --update`. -- Fixed [CVE-2022-26659](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-26659){: target="_blank" rel="noopener" class="_"}, which could allow an attacker to overwrite any administrator writable file on the system during the installation or the update of Docker Desktop. - -### New - -- The Docker Dashboard Volume Management feature now offers the ability to efficiently clean up volumes using multi-select checkboxes. - -### Upgrades - -- [Docker Engine v20.10.13](https://docs.docker.com/engine/release-notes/#201013) -- [Compose v2.3.3](https://github.com/docker/compose/releases/tag/v2.3.3) -- [Buildx 0.8.0](https://github.com/docker/buildx/releases/tag/v0.8.0) -- [containerd v1.4.13](https://github.com/containerd/containerd/releases/tag/v1.4.13) -- [runc v1.0.3](https://github.com/opencontainers/runc/releases/tag/v1.0.3) -- [Go 1.17.8](https://golang.org/doc/go1.17) -- [Linux kernel 5.10.104](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.104-379cadd2e08e8b25f932380e9fdaab97755357b3/images/sha256-7753b60f4544e5c5eed629d12151a49c8a4b48d98b4fb30e4e65cecc20da484d?context=explore) - -### Bug fixes and minor changes - -- Fixed uploading diagnostics when an HTTPS proxy is set. -- Fixed the UI stuck in `starting` state forever although Docker Desktop is working fine from the command line. -- Fixed missing Docker Desktop systray icon [docker/for-win#12573](https://github.com/docker/for-win/issues/12573) -- Made checking for updates from the systray menu open the Software updates settings section. -- Fixed Registry Access Management under WSL 2 with latest 5.10.60.1 kernel. -- Fixed a UI crash when selecting the containers of a Compose application started from a WSL 2 environment. Fixes [docker/for-win#12567](https://github.com/docker/for-win/issues/12567). -- Fixed copying text from terminal in Quick Start Guide. Fixes [docker/for-win#12444](https://github.com/docker/for-win/issues/12444). - -## Docker Desktop 4.5.1 -2022-02-15 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/74721/Docker%20Desktop%20Installer.exe) - -### Bug fixes and minor changes - -- Fixed an issue that caused new installations to default to the Hyper-V backend instead of WSL 2. -- Fixed a crash in the Docker Dashboard which would make the systray menu disappear. - -If you are running Docker Desktop on Windows Home, installing 4.5.1 will switch it back to WSL 2 automatically. If you are running another version of Windows, and you want Docker Desktop to use the WSL 2 backend, you must manually switch by enabling the **Use the WSL 2 based engine** option in the **Settings > General** section. -Alternatively, you can edit the Docker Desktop settings file located at `%APPDATA%\Docker\settings.json` and manually switch the value of the `wslEngineEnabled` field to `true`. - -## Docker Desktop 4.5.0 -2022-02-10 - -### Security - -- Fixed [CVE-2022-23774](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23774){: target="_blank" rel="noopener" class="_"} where Docker Desktop allows attackers to move arbitrary files. - -### New - -- Docker Desktop 4.5.0 introduces a new version of the Docker menu which creates a consistent user experience across all operating systems. For more information, see the blog post [New Docker Menu & Improved Release Highlights with Docker Desktop 4.5](https://www.docker.com/blog/new-docker-menu-improved-release-highlights-with-docker-desktop-4-5/){: target="_blank" rel="noopener" class="_"} -- The 'docker version' output now displays the version of Docker Desktop installed on the machine. - -### Upgrades - -- [Amazon ECR Credential Helper v0.6.0](https://github.com/awslabs/amazon-ecr-credential-helper/releases/tag/v0.6.0){: target="blank" rel="noopener" class=""} - -### Bug fixes and minor changes - -- Increased the filesystem watch (inotify) limits by setting `fs.inotify.max_user_watches=1048576` and `fs.inotify.max_user_instances=8192` in Linux. Fixes [docker/for-mac#6071](https://github.com/docker/for-mac/issues/6071). -- Fixed an issue related to compose app started with version 2, but the dashboard only deals with version 1 -- Fixed an issue where Docker Desktop incorrectly prompted users to sign in after they quit Docker Desktop and start the application. - -### Known issues - -Installing Docker Desktop 4.5.0 from scratch has a bug which defaults Docker Desktop to use the Hyper-V backend instead of WSL 2. This means, Windows Home users will not be able to start Docker Desktop as WSL 2 is the only supported backend. To work around this issue, you must uninstall 4.5.0 from your machine and then download and install Docker Desktop 4.5.1 or a higher version. Alternatively, you can edit the Docker Desktop settings.json file located at `%APPDATA%\Docker\settings.json` and manually switch the value of the `wslEngineEnabled` field to `true`. - -## Docker Desktop 4.4.4 -2022-01-24 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/73704/Docker%20Desktop%20Installer.exe) - -### Bug fixes and minor changes - -- Fixed logging in from WSL 2. Fixes [docker/for-win#12500](https://github.com/docker/for-win/issues/12500). - -### Known issues - -- Clicking **Proceed to Desktop** after signing in through the browser, sometimes does not bring the Dashboard to the front. -- After logging in, when the Dashboard receives focus, it sometimes stays in the foreground even when clicking a background window. As a workaround you need to click the Dashboard before clicking another application window. -- The tips of the week show on top of the mandatory login dialog when an organization restriction is enabled via a `registry.json` file. - -## Docker Desktop 4.4.3 -2022-01-14 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/73365/Docker%20Desktop%20Installer.exe) - -### Bug fixes and minor changes - -- Disabled Dashboard shortcuts to prevent capturing them even when minimized or un-focussed. Fixes [docker/for-win#12495](https://github.com/docker/for-win/issues/12495). - -### Known issues - -- Clicking **Proceed to Desktop** after signing in through the browser, sometimes does not bring the Dashboard to the front. -- After logging in, when the Dashboard receives focus, it sometimes stays in the foreground even when clicking a background window. As a workaround you need to click the Dashboard before clicking another application window. -- The tips of the week show on top of the mandatory login dialog when an organization restriction is enabled via a `registry.json` file. - -## Docker Desktop 4.4.2 -2022-01-13 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/73305/Docker%20Desktop%20Installer.exe) - -### Security - -- Fixed [CVE-2021-45449](https://docs.docker.com/security/#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. - -Docker Desktop version 4.3.0 and 4.3.1 has a bug that may log sensitive information (access token or password) on the user's machine during login. -This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user has logged in while on 4.3.0, 4.3.1. Gaining access to this data would require having access to the user’s local files. - -### New - -- Easy, Secure sign in with Auth0 and Single Sign-on - - Single Sign-on: Users with a Docker Business subscription can now configure SSO to authenticate using their identity providers (IdPs) to access Docker. For more information, see [Single Sign-on](../../../single-sign-on/index.md). - - Signing in to Docker Desktop now takes you through the browser so that you get all the benefits of auto-filling from password managers. - -### Upgrades - -- [Docker Engine v20.10.12](https://docs.docker.com/engine/release-notes/#201012) -- [Compose v2.2.3](https://github.com/docker/compose/releases/tag/v2.2.3) -- [Kubernetes 1.22.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.5) -- [docker scan v0.16.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.16.0){: target="_blank" rel="noopener" class="_"} - -### Bug fixes and minor changes - -- Docker Desktop displays an error if `registry.json` contains more than one organization in the `allowedOrgs` field. If you are using multiple organizations for different groups of developers, you must provision a separate `registry.json` file for each group. -- Fixed a regression in Compose that reverted the container name separator from `-` to `_`. Fixes [docker/compose-switch](https://github.com/docker/compose-switch/issues/24). -- Doing a `Reset to factory defaults` no longer shuts down Docker Desktop. - -### Known issues - -- Clicking «Proceed to Desktop» after logging in in the browser, sometimes does not bring the Dashboard to the front. -- After logging in, when the Dashboard receives focus, it sometimes stays in the foreground even when clicking a background window. As a workaround you need to click the Dashboard before clicking another application window. -- The tips of the week show on top of the mandatory login dialog when an organization restriction is enabled via a `registry.json` file. -- When the Dashboard is open, even if it does not have focus or is minimized, it will still catch keyboard shortcuts (e.g. ctrl-r for Restart) - -## Docker Desktop 4.3.2 -2021-12-21 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/72729/Docker%20Desktop%20Installer.exe) - -### Security - -- Fixed [CVE-2021-45449](https://docs.docker.com/security/#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. - -Docker Desktop version 4.3.0 and 4.3.1 has a bug that may log sensitive information (access token or password) on the user's machine during login. -This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user has logged in while on 4.3.0, 4.3.1. Gaining access to this data would require having access to the user’s local files. - -### Upgrades - -[docker scan v0.14.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.14.0){: target="_blank" rel="noopener" class="_"} - -### Security - -**Log4j 2 CVE-2021-44228**: We have updated the `docker scan` CLI plugin. -This new version of `docker scan` is able to detect [Log4j 2 -CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228){: -target="_blank" rel="noopener" class="_"} and [Log4j 2 -CVE-2021-45046](https://nvd.nist.gov/vuln/detail/CVE-2021-45046) - -For more information, read the blog post [Apache Log4j 2 -CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/){: target="_blank" rel="noopener" class="_"}. - -## Docker Desktop 4.3.1 -2021-12-11 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/72247/Docker%20Desktop%20Installer.exe) - -### Upgrades - -[docker scan v0.11.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.11.0){: target="_blank" rel="noopener" class="_"} - -### Security - -**Log4j 2 CVE-2021-44228**: We have updated the `docker scan` CLI plugin for you. -Older versions of `docker scan` in Docker Desktop 4.3.0 and earlier versions are -not able to detect [Log4j 2 -CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228){: -target="_blank" rel="noopener" class="_"}. - -For more information, read the -blog post [Apache Log4j 2 -CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/){: target="_blank" rel="noopener" class="_"}. - -## Docker Desktop 4.3.0 -2021-12-02 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/71786/Docker%20Desktop%20Installer.exe) - - -### Upgrades - -- [Docker Engine v20.10.11](https://docs.docker.com/engine/release-notes/#201011) -- [containerd v1.4.12](https://github.com/containerd/containerd/releases/tag/v1.4.12) -- [Buildx 0.7.1](https://github.com/docker/buildx/releases/tag/v0.7.1) -- [Compose v2.2.1](https://github.com/docker/compose/releases/tag/v2.2.1) -- [Kubernetes 1.22.4](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.4) -- [Docker Hub Tool v0.4.4](https://github.com/docker/hub-tool/releases/tag/v0.4.4) -- [Go 1.17.3](https://golang.org/doc/go1.17) - -### Bug fixes and minor changes - -- Fixed an issue which prevented users from saving files from a volume using the Save As option in the Volumes UI. Fixes [docker/for-win#12407](https://github.com/docker/for-win/issues/12407). -- Fixed an issue that caused Docker Desktop to fail during startup if the home directory path contains a character used in regular expressions. Fixes [docker/for-win#12374](https://github.com/docker/for-win/issues/12374). -- Added a self-diagnose warning if the host lacks Internet connectivity. -- Docker Desktop now uses cgroupv2. If you need to run `systemd` in a container then: - - Ensure your version of `systemd` supports cgroupv2. [It must be at least `systemd` 247](https://github.com/systemd/systemd/issues/19760#issuecomment-851565075). Consider upgrading any `centos:7` images to `centos:8`. - - Containers running `systemd` need the following options: [`--privileged - --cgroupns=host -v - /sys/fs/cgroup:/sys/fs/cgroup:rw`](https://serverfault.com/questions/1053187/systemd-fails-to-run-in-a-docker-container-when-using-cgroupv2-cgroupns-priva). - -### Known issue - -Docker Dashboard incorrectly displays the container memory usage as zero on -Hyper-V based machines. -You can use the [`docker stats`](../../../engine/reference/commandline/stats.md) -command on the command line as a workaround to view the -actual memory usage. See -[docker/for-mac#6076](https://github.com/docker/for-mac/issues/6076). - -### Deprecation - -- The following internal DNS names are deprecated and will be removed from a future release: `docker-for-desktop`, `docker-desktop`, `docker.for.mac.host.internal`, `docker.for.mac.localhost`, `docker.for.mac.gateway.internal`. You must now use `host.docker.internal`, `vm.docker.internal`, and `gateway.docker.internal`. -- Removed: Custom RBAC rules have been removed from Docker Desktop as it gives `cluster-admin` privileges to all Service Accounts. Fixes [docker/for-mac/#4774](https://github.com/docker/for-mac/issues/4774). - -## Docker Desktop 4.2.0 -2021-11-09 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/70708/Docker%20Desktop%20Installer.exe) - -### New - -**Pause/Resume**: You can now pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. For more information, see [Pause/Resume](../index.md#pauseresume). - -- Ships [Docker Public Roadmap#226](https://github.com/docker/roadmap/issues/226){: target="_blank" rel="noopener" class="_"} - -**Software Updates**: The option to turn off automatic check for updates is now available for users on all Docker subscriptions, including Docker Personal and Docker Pro. All update-related settings have been moved to the **Software Updates** section. For more information, see [Software updates](../index.md#software-updates). - -- Ships [Docker Public Roadmap#228](https://github.com/docker/roadmap/issues/228){: target="_blank" rel="noopener" class="_"} - -**Window management**: The Docker Dashboard window size and position persists when you close and reopen Docker Desktop. - -### Upgrades - -- [Docker Engine v20.10.10](https://docs.docker.com/engine/release-notes/#201010) -- [containerd v1.4.11](https://github.com/containerd/containerd/releases/tag/v1.4.11) -- [runc v1.0.2](https://github.com/opencontainers/runc/releases/tag/v1.0.2) -- [Go 1.17.2](https://golang.org/doc/go1.17) -- [Compose v2.1.1](https://github.com/docker/compose/releases/tag/v2.1.1) -- [docker-scan 0.9.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.9.0) - -### Bug fixes and minor changes - -- Improved: Self-diagnose now also checks for overlap between host IPs and `docker networks`. -- Fixed the position of the indicator that displays the availability of an update on the Docker Dashboard. -- Fixed Docker Desktop sometimes hanging when clicking Exit in the fatal error dialog. -- Fixed an issue that frequently displayed the **Download update** popup when an update has been downloaded but hasn't been applied yet [docker/for-win#12188](https://github.com/docker/for-win/issues/12188). -- Fixed installing a new update killing the application before it has time to shut down. -- Fixed: Installation of Docker Desktop now works even with group policies preventing users to start prerequisite services (e.g. LanmanServer) [docker/for-win#12291](https://github.com/docker/for-win/issues/12291). - - -## Docker Desktop 4.1.1 -2021-10-12 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/69879/Docker%20Desktop%20Installer.exe) - -### Bug fixes and minor changes - -- Fixed a regression in WSL 2 integrations for some distros (e.g. Arch or Alpine). Fixes [docker/for-win#12229](https://github.com/docker/for-win/issues/12229) -- Fixed update notification overlay sometimes getting out of sync between the Settings button and the Software update button in the Dashboard. - -## Docker Desktop 4.1.0 -2021-09-30 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/69386/Docker%20Desktop%20Installer.exe) - -### New - -- **Software Updates**: The Settings tab now includes a new section to help you manage Docker Desktop updates. The **Software Updates** section notifies you whenever there's a new update and allows you to download the update or view information on what's included in the newer version. For more information, see [Software Updates](../index.md#software-updates). -- **Compose V2** You can now specify whether to use [Docker Compose V2](../../../compose/index.md#compose-v2-and-the-new-docker-compose-command) in the General settings. -- **Volume Management**: Volume management is now available for users on any subscription, including Docker Personal. For more information, see [Explore volumes](../../dashboard.md#explore-volumes). Ships [Docker Public Roadmap#215](https://github.com/docker/roadmap/issues/215){: target="_blank" rel="noopener" class="_"} - -### Upgrades - -- [Compose V2](https://github.com/docker/compose/releases/tag/v2.0.0) -- [Buildx 0.6.3](https://github.com/docker/buildx/releases/tag/v0.6.3) -- [Kubernetes 1.21.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.5) -- [Go 1.17.1](https://github.com/golang/go/releases/tag/go1.17.1) -- [Alpine 3.14](https://alpinelinux.org/posts/Alpine-3.14.0-released.html) -- [Qemu 6.1.0](https://wiki.qemu.org/ChangeLog/6.1) -- Base distro to debian:bullseye - -### Bug fixes and minor changes - -- Fixed a bug related to anti-malware software triggering, self-diagnose avoids calling the `net.exe` utility. -- Fixed filesystem corruption in the WSL 2 Linux VM in self-diagnose. This can be caused by [microsoft/WSL#5895](https://github.com/microsoft/WSL/issues/5895). -- Fixed `SeSecurityPrivilege` requirement issue. See [docker/for-win#12037](https://github.com/docker/for-win/issues/12037). -- Fixed CLI context switch sync with UI. See [docker/for-win#11721](https://github.com/docker/for-win/issues/11721). -- Added the key `vpnKitMaxPortIdleTime` to `settings.json` to allow the idle network connection timeout to be disabled or extended. -- Fixed a crash on exit. See [docker/for-win#12128](https://github.com/docker/for-win/issues/12128). -- Fixed a bug where the CLI tools would not be available in WSL 2 distros. -- Fixed switching from Linux to Windows containers that was stuck because access rights on panic.log. See [for-win#11899](https://github.com/docker/for-win/issues/11899). - -### Known Issue - -Docker Desktop may fail to start when upgrading to 4.1.0 on some WSL-based distributions such as ArchWSL. See [docker/for-win#12229](https://github.com/docker/for-win/issues/12229) - -## Docker Desktop 4.0.1 -2021-09-13 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/68347/Docker Desktop Installer.exe) - -### Upgrades - -- [Compose V2 RC3](https://github.com/docker/compose/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 -2021-08-31 - -> Download Docker Desktop -> -> [For Windows](https://desktop.docker.com/win/main/amd64/67817/Docker Desktop Installer.exe) - -### New - -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. - -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. -- 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 Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop. -- 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. - -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). - -### Upgrades - -- [Compose V2 RC2](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.2) - - Fixed project name to be case-insensitive for `compose down`. See [docker/compose-cli#2023](https://github.com/docker/compose-cli/issues/2023) - - Fixed non-normalized project name. - - Fixed port merging on partial reference. -- [Kubernetes 1.21.4](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.4) - -### Bug fixes and minor changes - -- Fixed a bug where the CLI tools would not be available in WSL 2 distros. -- Fixed a bug when switching from Linux to Windows containers due to access rights on `panic.log`. [for-win#11899](https://github.com/docker/for-win/issues/11899) diff --git a/desktop/windows/troubleshoot.md b/desktop/windows/troubleshoot.md deleted file mode 100644 index 81841dad14..0000000000 --- a/desktop/windows/troubleshoot.md +++ /dev/null @@ -1,45 +0,0 @@ - -### Diagnosing from the terminal - -On occasions it is useful to run the diagnostics yourself, for instance if -Docker Desktop for Windows cannot start. - -First locate the `com.docker.diagnose`, that should be in `C:\Program -Files\Docker\Docker\resources\com.docker.diagnose.exe`. - -To create *and upload* diagnostics in Powershell, run: - -```powershell - PS C:\> & "C:\Program Files\Docker\Docker\resources\com.docker.diagnose.exe" gather -upload -``` - -After the diagnostics have finished, you should have the following output, -containing your diagnostic ID: - -```sh -Diagnostics Bundle: C:\Users\User\AppData\Local\Temp\CD6CF862-9CBD-4007-9C2F-5FBE0572BBC2\20180720152545.zip -Diagnostics ID: CD6CF862-9CBD-4007-9C2F-5FBE0572BBC2/20180720152545 (uploaded) -``` - -If you have a paid Docker subscription, open the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID to the Diagnostics ID field. Click **Submit** to request Docker Desktop support. - -### Self-diagnose tool - -Docker Desktop contains a self-diagnose tool which helps you to identify some common -problems. Before you run the self-diagnose tool, locate `com.docker.diagnose.exe`. This is usually installed in `C:\Program -Files\Docker\Docker\resources\com.docker.diagnose.exe`. - -To run the self-diagnose tool in Powershell: - -```powershell -PS C:\> & "C:\Program Files\Docker\Docker\resources\com.docker.diagnose.exe" check -``` - -The tool runs a suite of checks and displays **PASS** or **FAIL** next to each check. If there are any failures, it highlights the most relevant at the end. - -> **Feedback** -> -> Let us know your feedback on the self-diagnose tool by creating an issue in the [for-win](https://github.com/docker/for-win/issues) GitHub repository. - - - diff --git a/engine/breaking_changes.md b/engine/breaking_changes.md index eb57e37613..ad292d4ca2 100644 --- a/engine/breaking_changes.md +++ b/engine/breaking_changes.md @@ -17,8 +17,7 @@ The following list compiles any updates to Docker Engine that created backwards-incompatibility for old versions of Docker tools. > **Note**: In the case of your local environment, you should be updating your - Docker Engine using [Docker Desktop for Mac](../desktop/mac/index.md), - [Docker Desktop for Windows](../desktop/windows/index.md). That way all your tools stay + Docker Engine using [Docker Desktop](../desktop/index.md). That way all your tools stay in sync with Docker Engine. ## Engine 1.10 diff --git a/engine/scan/index.md b/engine/scan/index.md index 92d7c4c41f..97fc93c995 100644 --- a/engine/scan/index.md +++ b/engine/scan/index.md @@ -47,8 +47,8 @@ latest version to fix this issue. If you are using the `docker scan` plugin shipped with Docker Desktop, update Docker Desktop to version 4.3.1 or -higher. See the release notes for [Mac](../../desktop/mac/release-notes/index.md) and -[Windows](../../desktop/windows/release-notes/index.md) for download information. +higher. See the release notes for [Mac](../../desktop/release-notes.md) and +[Windows](../../desktop/release-notes.md) for download information. If you are using Linux, run the following command to manually install the latest version of `docker scan`: diff --git a/engine/swarm/swarm-tutorial/index.md b/engine/swarm/swarm-tutorial/index.md index e735936eaa..37813852f5 100644 --- a/engine/swarm/swarm-tutorial/index.md +++ b/engine/swarm/swarm-tutorial/index.md @@ -55,8 +55,7 @@ single-node and multi-node swarm scenarios on Linux machines. #### Use Docker Desktop for Mac or Docker Desktop for Windows -Alternatively, install the latest [Docker Desktop for Mac](../../../desktop/mac/index.md) or -[Docker Desktop for Windows](../../../desktop/windows/index.md) application on one +Alternatively, install the latest [Docker Desktop](../../../desktop/index.md) application on one computer. You can test both single-node and multi-node swarm from this computer. * You can use Docker Desktop for Mac or Windows to test _single-node_ features diff --git a/go/mac-desktop-pause.md b/go/mac-desktop-pause.md index 301be81acd..ace34309c6 100644 --- a/go/mac-desktop-pause.md +++ b/go/mac-desktop-pause.md @@ -2,5 +2,5 @@ title: Pause and Resume Docker Desktop description: Instructions on how to pause and resume Docker Desktop keywords: pause, resume, docker desktop, mac -redirect_to: /desktop/mac/#pauseresume +redirect_to: /desktop/use-desktop/pause/ --- diff --git a/go/win-desktop-pause.md b/go/win-desktop-pause.md index 8aed4f2522..96796ac232 100644 --- a/go/win-desktop-pause.md +++ b/go/win-desktop-pause.md @@ -2,5 +2,5 @@ title: Pause and Resume Docker Desktop description: Instructions on how to pause and resume Docker Desktop keywords: pause, resume, docker desktop, windows -redirect_to: /desktop/windows/#pauseresume +redirect_to: /desktop/use-desktop/pause/ --- diff --git a/registry/insecure.md b/registry/insecure.md index 461f9ba969..8e869dd81d 100644 --- a/registry/insecure.md +++ b/registry/insecure.md @@ -97,11 +97,11 @@ This is more secure than the insecure registry solution. 3. Click **Finish**. Restart Docker. - **Docker Desktop for Mac**: Follow the instructions in - [Adding custom CA certificates](../desktop/mac/index.md#add-tls-certificates){: target="_blank" rel="noopener" class="_"}. + [Adding custom CA certificates](../desktop/faqs/macfaqs.md#add-custom-ca-certificates-server-side){: target="_blank" rel="noopener" class="_"}. Restart Docker. - **Docker Desktop for Windows**: Follow the instructions in - [Adding custom CA certificates](../desktop/windows/index.md#adding-tls-certificates){: target="_blank" rel="noopener" class="_"}. + [Adding custom CA certificates](../desktop/faqs/windowsfaqs.md#how-do-i-add-custom-ca-certificates){: target="_blank" rel="noopener" class="_"}. Restart Docker. diff --git a/samples/dotnetcore.md b/samples/dotnetcore.md index 39b7eda3bc..f5c1529393 100644 --- a/samples/dotnetcore.md +++ b/samples/dotnetcore.md @@ -38,8 +38,8 @@ clone our [ASP.NET Docker Sample](https://github.com/dotnet/dotnet-docker/tree/m [Windows Containers](https://docs.microsoft.com/virtualization/windowscontainers/about/). The tags below are multi-arch meaning they pull either Windows or Linux containers depending on what mode is set in - [Docker Desktop for Windows](../desktop/windows/index.md). Read more on - [switching containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers). + Docker Desktop for Windows. Read more on + [switching containers](../desktop/faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). 3. The `Dockerfile` assumes that your application is called `aspnetapp`. Change the `Dockerfile` to use the DLL file of your project. @@ -79,8 +79,8 @@ obj/ [Windows Containers](https://docs.microsoft.com/virtualization/windowscontainers/about/). The tags below are multi-arch meaning they pull either Windows or Linux containers depending on what mode is set in - [Docker Desktop for Windows](../desktop/windows/index.md). Read more on - [switching containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers). + Docker Desktop for Windows. Read more on + [switching containers](../desktop/faqs/windowsfaqs.md#how-do-i-switch-between-windows-and-linux-containers). 3. The `Dockerfile` assumes that your application is called `aspnetapp`. Change the `Dockerfile` to use the DLL file of your project. This method assumes that your project is already built and it copies the build artifacts from the publish folder. Refer to the Microsoft documentation on [Containerize a .Net Core app](https://docs.microsoft.com/en-us/dotnet/core/docker/build-container?tabs=windows#create-the-dockerfile){: target="blank" rel="noopener" class=“"}. The `docker build` step here will be much faster than method 1, as all the artifacts are built outside of the `docker build` step and the size of the base image is much smaller compared to the build base image. @@ -112,7 +112,7 @@ $ docker run -d -p 8080:80 --name myapp aspnetapp ## View the web page running from a container * Go to [localhost:8080](http://localhost:8080) to access your app in a web browser. -* If you are using the Nano [Windows Container](../desktop/windows/index.md) +* If you are using the Nano Windows Container and have not updated to the Windows Creator Update there is a bug affecting how [Windows 10 talks to Containers via "NAT"](https://github.com/Microsoft/Virtualization-Documentation/issues/181#issuecomment-252671828) (Network Address Translation). You must hit the IP of the container diff --git a/security/index.md b/security/index.md index 34ca3cef21..5496827eb7 100644 --- a/security/index.md +++ b/security/index.md @@ -16,8 +16,8 @@ For detailed information, see [CVE-2021-45449](https://cve.mitre.org/cgi-bin/cve ### References -* [Release Notes (Windows)](../desktop/windows/release-notes/index.md) -* [Release Notes (Mac)](../desktop/mac/release-notes/index.md) +* [Release Notes (Windows)](../desktop/release-notes.md) +* [Release Notes (Mac)](../desktop/release-notes.md) ## Log4j 2 CVE-2021-44228