diff --git a/_vendor/github.com/docker/cli/docs/reference/run.md b/_vendor/github.com/docker/cli/docs/reference/run.md index 186f1f8b5e..4d8671bef4 100644 --- a/_vendor/github.com/docker/cli/docs/reference/run.md +++ b/_vendor/github.com/docker/cli/docs/reference/run.md @@ -134,7 +134,7 @@ You can identify a container in three ways: The UUID identifier is a random ID assigned to the container by the daemon. The daemon generates a random string name for containers automatically. You can -also defined a custom name using [the `--name` flag](https://docs.docker.com/reference/cli/docker/container/run/#name). +also define a custom name using [the `--name` flag](https://docs.docker.com/reference/cli/docker/container/run/#name). Defining a `name` can be a handy way to add meaning to a container. If you specify a `name`, you can use it when referring to the container in a user-defined network. This works for both background and foreground Docker diff --git a/_vendor/modules.txt b/_vendor/modules.txt index d7da8a8f55..785e9a66bc 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v27.3.1+incompatible # github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 # github.com/docker/buildx v0.18.0 -# github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible +# github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible # github.com/docker/compose/v2 v2.30.2 # github.com/docker/scout-cli v1.15.0 diff --git a/content/get-started/docker-concepts/running-containers/sharing-local-files.md b/content/get-started/docker-concepts/running-containers/sharing-local-files.md index 844a4cc415..d8dacb66fc 100644 --- a/content/get-started/docker-concepts/running-containers/sharing-local-files.md +++ b/content/get-started/docker-concepts/running-containers/sharing-local-files.md @@ -61,7 +61,7 @@ Read-only bind mounts let the container access the mounted files on the host for > **Synchronized File Share** > -> As your codebase grows larger, traditional methods of file sharing like bind mounts may become inefficient or slow, especially in development environments where frequent access to files is necessary. [Synchronized file shares](/desktop/synchronized-file-sharing/) improve bind mount performance by leveraging synchronized filesystem caches. This optimization ensures that file access between the host and virtual machine (VM) is fast and efficient. +> As your codebase grows larger, traditional methods of file sharing like bind mounts may become inefficient or slow, especially in development environments where frequent access to files is necessary. [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md) improve bind mount performance by leveraging synchronized filesystem caches. This optimization ensures that file access between the host and virtual machine (VM) is fast and efficient. ## Try it out diff --git a/content/guides/bake/index.md b/content/guides/bake/index.md index ba42268f56..c099ec1c52 100644 --- a/content/guides/bake/index.md +++ b/content/guides/bake/index.md @@ -33,7 +33,7 @@ This guide assumes that you're familiar with: - You have a recent version of Docker installed on your machine. - You have Git installed for cloning repositories. -- You're using the [containerd](/manuals/desktop/containerd.md) image store. +- You're using the [containerd](/manuals/desktop/features/containerd.md) image store. ## Introduction diff --git a/content/guides/bun/deploy.md b/content/guides/bun/deploy.md index 7659c97fd9..7a8690941e 100644 --- a/content/guides/bun/deploy.md +++ b/content/guides/bun/deploy.md @@ -11,7 +11,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize a Bun application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals//desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -137,5 +137,5 @@ In this section, you learned how to use Docker Desktop to deploy your Bun applic Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) - - [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) + - [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/cpp/deploy.md b/content/guides/cpp/deploy.md index 2c3a1ef66e..e023bdd5b1 100644 --- a/content/guides/cpp/deploy.md +++ b/content/guides/cpp/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize a C++ application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -139,5 +139,5 @@ In this section, you learned how to use Docker Desktop to deploy your C++ applic Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/dotnet/deploy.md b/content/guides/dotnet/deploy.md index 17a6f5f218..ed1b464e95 100644 --- a/content/guides/dotnet/deploy.md +++ b/content/guides/dotnet/deploy.md @@ -13,7 +13,7 @@ aliases: - Complete all the previous sections of this guide, starting with [Containerize a .NET application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -220,5 +220,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/genai-pdf-bot/containerize.md b/content/guides/genai-pdf-bot/containerize.md index 57dac619b8..eae8f42ae2 100644 --- a/content/guides/genai-pdf-bot/containerize.md +++ b/content/guides/genai-pdf-bot/containerize.md @@ -12,7 +12,7 @@ aliases: > [!NOTE] > -> GenAI applications can often benefit from GPU acceleration. Currently Docker Desktop supports GPU acceleration only on [Windows with the WSL2 backend](/manuals/desktop/gpu.md#using-nvidia-gpus-with-wsl2). Linux users can also access GPU acceleration using a native installation of the [Docker Engine](/manuals/engine/install/_index.md). +> GenAI applications can often benefit from GPU acceleration. Currently Docker Desktop supports GPU acceleration only on [Windows with the WSL2 backend](/manuals/desktop/features/gpu.md#using-nvidia-gpus-with-wsl2). Linux users can also access GPU acceleration using a native installation of the [Docker Engine](/manuals/engine/install/_index.md). - You have installed the latest version of [Docker Desktop](/get-started/get-docker.md) or, if you are a Linux user and are planning to use GPU acceleration, [Docker Engine](/manuals/engine/install/_index.md). Docker adds new features regularly and some parts of this guide may work only with the latest version of Docker Desktop. - You have a [git client](https://git-scm.com/downloads). The examples in this section use a command-line based git client, but you can use any client. diff --git a/content/guides/genai-pdf-bot/develop.md b/content/guides/genai-pdf-bot/develop.md index b8a5a9ba59..7a0dcae854 100644 --- a/content/guides/genai-pdf-bot/develop.md +++ b/content/guides/genai-pdf-bot/develop.md @@ -107,7 +107,7 @@ To run Ollama in a container and provide GPU access: 1. Install the prerequisites. - For Docker Engine on Linux, install the [NVIDIA Container Toolkit](https://github.com/NVIDIA/nvidia-container-toolkit). - - For Docker Desktop on Windows 10/11, install the latest [NVIDIA driver](https://www.nvidia.com/Download/index.aspx) and make sure you are using the [WSL2 backend](/manuals/desktop/wsl/_index.md#turn-on-docker-desktop-wsl-2) + - For Docker Desktop on Windows 10/11, install the latest [NVIDIA driver](https://www.nvidia.com/Download/index.aspx) and make sure you are using the [WSL2 backend](/manuals/desktop/features/wsl/_index.md#turn-on-docker-desktop-wsl-2) 2. Add the Ollama service and a volume in your `compose.yaml`. The following is the updated `compose.yaml`: diff --git a/content/guides/golang/deploy.md b/content/guides/golang/deploy.md index 02c9e740c1..0b47f0ebc9 100644 --- a/content/guides/golang/deploy.md +++ b/content/guides/golang/deploy.md @@ -13,7 +13,7 @@ aliases: - Complete all the previous sections of this guide, starting with [Build your Go image](build-images.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -245,5 +245,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/java/deploy.md b/content/guides/java/deploy.md index 86e144c526..092998d20b 100644 --- a/content/guides/java/deploy.md +++ b/content/guides/java/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize your app](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -151,5 +151,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/nodejs/deploy.md b/content/guides/nodejs/deploy.md index 3c6af6e61f..5c6ca2960b 100644 --- a/content/guides/nodejs/deploy.md +++ b/content/guides/nodejs/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize a Node.js application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -139,5 +139,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/php/deploy.md b/content/guides/php/deploy.md index b0f9e14bf9..e6b96660db 100644 --- a/content/guides/php/deploy.md +++ b/content/guides/php/deploy.md @@ -13,7 +13,7 @@ aliases: - Complete all the previous sections of this guide, starting with [Containerize a PHP application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -142,5 +142,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/python/deploy.md b/content/guides/python/deploy.md index 6b955d93ce..bec86653b9 100644 --- a/content/guides/python/deploy.md +++ b/content/guides/python/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Use containers for python development](develop.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -253,5 +253,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/r/deploy.md b/content/guides/r/deploy.md index e24e8350e8..6aa8c4aba5 100644 --- a/content/guides/r/deploy.md +++ b/content/guides/r/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize a R application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -143,5 +143,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/rag-ollama/develop.md b/content/guides/rag-ollama/develop.md index 8d2ee55422..280da32957 100644 --- a/content/guides/rag-ollama/develop.md +++ b/content/guides/rag-ollama/develop.md @@ -81,7 +81,7 @@ To run Ollama in a container and provide GPU access: 1. Install the prerequisites. - For Docker Engine on Linux, install the [NVIDIA Container Toolkilt](https://github.com/NVIDIA/nvidia-container-toolkit). - - For Docker Desktop on Windows 10/11, install the latest [NVIDIA driver](https://www.nvidia.com/Download/index.aspx) and make sure you are using the [WSL2 backend](/manuals/desktop/wsl/_index.md#turn-on-docker-desktop-wsl-2) + - For Docker Desktop on Windows 10/11, install the latest [NVIDIA driver](https://www.nvidia.com/Download/index.aspx) and make sure you are using the [WSL2 backend](/manuals/desktop/features/wsl/_index.md#turn-on-docker-desktop-wsl-2) 2. The `docker-compose.yaml` file already contains the necessary instructions. In your own apps, you'll need to add the Ollama service in your `docker-compose.yaml`. The following is the updated `docker-compose.yaml`: diff --git a/content/guides/ruby/deploy.md b/content/guides/ruby/deploy.md index 1504155084..d86ef14bd2 100644 --- a/content/guides/ruby/deploy.md +++ b/content/guides/ruby/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize a Ruby on Rails application](containerize.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -163,5 +163,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/rust/deploy.md b/content/guides/rust/deploy.md index 5c6cf703f5..ac48e760ac 100644 --- a/content/guides/rust/deploy.md +++ b/content/guides/rust/deploy.md @@ -12,7 +12,7 @@ aliases: ## Prerequisites - Complete the previous sections of this guide, starting with [Develop your Rust application](develop.md). -- [Turn on Kubernetes](/desktop/kubernetes/#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. ## Overview @@ -234,5 +234,5 @@ In this section, you learned how to use Docker Desktop to deploy your applicatio Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/includes/deploy.md b/content/includes/deploy.md index 44d9ff2be0..0512c4418d 100644 --- a/content/includes/deploy.md +++ b/content/includes/deploy.md @@ -25,4 +25,4 @@ To enable Kubernetes: This starts a Kubernetes single-node cluster when Docker Desktop starts. -For detailed information, see [Deploy on Kubernetes](/desktop/kubernetes/) and [Describing apps using Kubernetes YAML](/guides/deployment-orchestration/kube-deploy/#describing-apps-using-kubernetes-yaml). +For detailed information, see [Deploy on Kubernetes](/manuals/desktop/features/kubernetes.md) and [Describing apps using Kubernetes YAML](/guides/deployment-orchestration/kube-deploy/#describing-apps-using-kubernetes-yaml). diff --git a/content/includes/swarm-mode.md b/content/includes/swarm-mode.md index 7a9cc2e1a0..03202e0ee3 100644 --- a/content/includes/swarm-mode.md +++ b/content/includes/swarm-mode.md @@ -7,4 +7,4 @@ > If you're not planning on deploying with Swarm, use > [Docker Compose](/compose/) instead. > If you're developing for a Kubernetes deployment, consider using the -> [integrated Kubernetes feature](/desktop/kubernetes/) in Docker Desktop. +> [integrated Kubernetes feature](/manuals/desktop/features/kubernetes.md) in Docker Desktop. diff --git a/content/manuals/build/building/multi-platform.md b/content/manuals/build/building/multi-platform.md index 45b88878b5..ba26733633 100644 --- a/content/manuals/build/building/multi-platform.md +++ b/content/manuals/build/building/multi-platform.md @@ -79,7 +79,7 @@ The steps for enabling the containerd image store depends on whether you're using Docker Desktop or Docker Engine standalone: - If you're using Docker Desktop, enable the containerd image store in the - [Docker Desktop settings](/manuals/desktop/containerd.md). + [Docker Desktop settings](/manuals/desktop/features/containerd.md). - If you're using Docker Engine standalone, enable the containerd image store using the [daemon configuration file](/manuals/engine/storage/containerd.md). diff --git a/content/manuals/build/cache/backends/_index.md b/content/manuals/build/cache/backends/_index.md index 4a9aea4e61..6dd4a8a9de 100644 --- a/content/manuals/build/cache/backends/_index.md +++ b/content/manuals/build/cache/backends/_index.md @@ -18,7 +18,7 @@ environments usually have little-to-no persistence between runs, but it's still important to keep the runtime of image builds as low as possible. The default `docker` driver supports the `inline`, `local`, `registry`, and -`gha` cache backends, but only if you have enabled the [containerd image store](/manuals/desktop/containerd.md). +`gha` cache backends, but only if you have enabled the [containerd image store](/manuals/desktop/features/containerd.md). Other cache backends require you to select a different [driver](/manuals/build/builders/drivers/_index.md). > [!WARNING] diff --git a/content/manuals/build/metadata/attestations/_index.md b/content/manuals/build/metadata/attestations/_index.md index 84ccfac5c0..73cd8a3e2e 100644 --- a/content/manuals/build/metadata/attestations/_index.md +++ b/content/manuals/build/metadata/attestations/_index.md @@ -60,7 +60,7 @@ $ docker buildx build --sbom=true --provenance=true . > > - Use a `docker-container` driver with the `--push` flag to push the image to > a registry directly. -> - Enable the [containerd image store](/manuals/desktop/containerd.md). +> - Enable the [containerd image store](/manuals/desktop/features/containerd.md). > [!NOTE] > diff --git a/content/manuals/compose/how-tos/environment-variables/envvars.md b/content/manuals/compose/how-tos/environment-variables/envvars.md index 05196b5ce4..668ccbb678 100644 --- a/content/manuals/compose/how-tos/environment-variables/envvars.md +++ b/content/manuals/compose/how-tos/environment-variables/envvars.md @@ -171,7 +171,7 @@ When enabled, Compose displays a navigation menu where you can choose to open th > Available in Docker Compose version [2.26.0](/manuals/compose/releases/release-notes.md#2260) and later, and Docker Desktop version 4.29 and later. -This is an opt-out variable. When turned off it deactivates the experimental features such as the navigation menu or [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md). +This is an opt-out variable. When turned off it deactivates the experimental features such as the navigation menu or [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md). * Supported values: * `true` or `1`, to enable, diff --git a/content/manuals/desktop/_index.md b/content/manuals/desktop/_index.md index 4c2eeea375..3c1a08355b 100644 --- a/content/manuals/desktop/_index.md +++ b/content/manuals/desktop/_index.md @@ -29,7 +29,7 @@ grid: description: | Find information on networking features, deploying on Kubernetes, and more. icon: category - link: /desktop/kubernetes/ + link: /desktop/features/kubernetes/ - title: Give feedback description: Provide feedback on Docker Desktop or Docker Desktop features. icon: sms diff --git a/content/manuals/desktop/features/_index.md b/content/manuals/desktop/features/_index.md new file mode 100644 index 0000000000..b62f571d01 --- /dev/null +++ b/content/manuals/desktop/features/_index.md @@ -0,0 +1,6 @@ +--- +build: + render: never +title: Features and capabilities +weight: 30 +--- \ No newline at end of file diff --git a/content/manuals/desktop/containerd.md b/content/manuals/desktop/features/containerd.md similarity index 98% rename from content/manuals/desktop/containerd.md rename to content/manuals/desktop/features/containerd.md index 58c645431f..e78c444832 100644 --- a/content/manuals/desktop/containerd.md +++ b/content/manuals/desktop/features/containerd.md @@ -1,9 +1,11 @@ --- title: containerd image store -weight: 50 +weight: 10 description: How to activate the containerd integration feature in Docker Desktop keywords: Docker, containerd, engine, image store, lazy-pull toc_max: 3 +aliases: +- /desktop/containerd/ --- This page provides information about the ongoing integration of `containerd` for diff --git a/content/manuals/desktop/dev-environments/_index.md b/content/manuals/desktop/features/dev-environments/_index.md similarity index 95% rename from content/manuals/desktop/dev-environments/_index.md rename to content/manuals/desktop/features/dev-environments/_index.md index c13a82948e..85cdf92858 100644 --- a/content/manuals/desktop/dev-environments/_index.md +++ b/content/manuals/desktop/features/dev-environments/_index.md @@ -4,12 +4,14 @@ keywords: Dev Environments, share, local, Compose title: Overview of Dev Environments linkTitle: Dev Environments (Beta) weight: 40 +aliases: +- /desktop/dev-environments/ --- {{< include "dev-envs-changing.md" >}} {{% experimental title="Beta" %}} -The Dev Environments feature is currently in [Beta](../../release-lifecycle.md#beta). +The Dev Environments feature is currently in [Beta](/manuals/release-lifecycle.md#beta). {{% /experimental %}} Dev Environments let you create a configurable developer environment with all the code and tools you need to quickly get up and running. diff --git a/content/manuals/desktop/dev-environments/create-dev-env.md b/content/manuals/desktop/features/dev-environments/create-dev-env.md similarity index 99% rename from content/manuals/desktop/dev-environments/create-dev-env.md rename to content/manuals/desktop/features/dev-environments/create-dev-env.md index f1676b3229..c0a2bc3244 100644 --- a/content/manuals/desktop/dev-environments/create-dev-env.md +++ b/content/manuals/desktop/features/dev-environments/create-dev-env.md @@ -4,6 +4,7 @@ keywords: Dev Environments, share, Docker Desktop, Compose, launch title: Launch a dev environment aliases: - /desktop/dev-environments/create-compose-dev-env/ +- /desktop/dev-environments/create-dev-env/ weight: 10 --- diff --git a/content/manuals/desktop/dev-environments/dev-cli.md b/content/manuals/desktop/features/dev-environments/dev-cli.md similarity index 95% rename from content/manuals/desktop/dev-environments/dev-cli.md rename to content/manuals/desktop/features/dev-environments/dev-cli.md index 68233d07be..c7d51bb0bf 100644 --- a/content/manuals/desktop/dev-environments/dev-cli.md +++ b/content/manuals/desktop/features/dev-environments/dev-cli.md @@ -2,13 +2,15 @@ description: Set up a dev Environments keywords: Dev Environments, share, docker dev, Docker Desktop title: Use the docker dev CLI plugin +aliases: +- /desktop/dev-environments/dev-cli/ --- {{< include "dev-envs-changing.md" >}} Use the new `docker dev` CLI plugin to get the full Dev Environments experience from the terminal in addition to the Dashboard. -It is available with [Docker Desktop 4.13.0 and later](../release-notes.md). +It is available with [Docker Desktop 4.13.0 and later](/manuals/desktop/release-notes.md). ### Usage diff --git a/content/manuals/desktop/dev-environments/set-up.md b/content/manuals/desktop/features/dev-environments/set-up.md similarity index 98% rename from content/manuals/desktop/dev-environments/set-up.md rename to content/manuals/desktop/features/dev-environments/set-up.md index e711b219d7..7c1fd89982 100644 --- a/content/manuals/desktop/dev-environments/set-up.md +++ b/content/manuals/desktop/features/dev-environments/set-up.md @@ -3,6 +3,8 @@ description: Set up a dev Environments keywords: Dev Environments, share, set up, Compose, Docker Desktop title: Set up a dev environment weight: 20 +aliases: +- /desktop/dev-environments/set-up/ --- {{< include "dev-envs-changing.md" >}} diff --git a/content/manuals/desktop/dev-environments/share.md b/content/manuals/desktop/features/dev-environments/share.md similarity index 97% rename from content/manuals/desktop/dev-environments/share.md rename to content/manuals/desktop/features/dev-environments/share.md index e36659c1cf..79f8703def 100644 --- a/content/manuals/desktop/dev-environments/share.md +++ b/content/manuals/desktop/features/dev-environments/share.md @@ -3,6 +3,8 @@ description: Dev Environments keywords: Dev Environments, share, Docker Desktop title: Distribute your dev environment weight: 30 +aliases: +- /desktop/dev-environments/share/ --- {{< include "dev-envs-changing.md" >}} diff --git a/content/manuals/desktop/gpu.md b/content/manuals/desktop/features/gpu.md similarity index 98% rename from content/manuals/desktop/gpu.md rename to content/manuals/desktop/features/gpu.md index fe3e2358aa..494d178291 100644 --- a/content/manuals/desktop/gpu.md +++ b/content/manuals/desktop/features/gpu.md @@ -1,10 +1,12 @@ --- title: GPU support in Docker Desktop linkTitle: GPU support -weight: 90 +weight: 80 description: How to use GPU in Docker Desktop keywords: gpu, gpu support, nvidia, wsl2, docker desktop, windows toc_max: 3 +aliases: +- /desktop/gpu/ --- > [!NOTE] diff --git a/content/manuals/desktop/kubernetes.md b/content/manuals/desktop/features/kubernetes.md similarity index 99% rename from content/manuals/desktop/kubernetes.md rename to content/manuals/desktop/features/kubernetes.md index 7cf2c7121c..5742400aa0 100644 --- a/content/manuals/desktop/kubernetes.md +++ b/content/manuals/desktop/features/kubernetes.md @@ -5,7 +5,8 @@ title: Deploy on Kubernetes with Docker Desktop aliases: - /docker-for-windows/kubernetes/ - /docker-for-mac/kubernetes/ -weight: 110 +- /desktop/kubernetes/ +weight: 60 --- Docker Desktop includes a standalone Kubernetes server and client, diff --git a/content/manuals/desktop/networking.md b/content/manuals/desktop/features/networking.md similarity index 98% rename from content/manuals/desktop/networking.md rename to content/manuals/desktop/features/networking.md index d3243859b9..71156eebdf 100644 --- a/content/manuals/desktop/networking.md +++ b/content/manuals/desktop/features/networking.md @@ -10,7 +10,8 @@ aliases: - /docker-for-win/networking/ - /docker-for-windows/networking/ - /desktop/windows/networking/ -weight: 120 +- /desktop/networking/ +weight: 50 --- Docker Desktop provides several networking features to make it easier to @@ -50,7 +51,7 @@ See [Proxies](/manuals/desktop/settings-and-maintenance/settings.md#proxies) ### SOCKS5 proxy support -{{< introduced desktop 4.28.0 "release-notes.md#4280" >}} +{{< introduced desktop 4.28.0 "../release-notes.md#4280" >}} > [!NOTE] > diff --git a/content/manuals/desktop/synchronized-file-sharing.md b/content/manuals/desktop/features/synchronized-file-sharing.md similarity index 97% rename from content/manuals/desktop/synchronized-file-sharing.md rename to content/manuals/desktop/features/synchronized-file-sharing.md index 94dbb57307..789a9c159f 100644 --- a/content/manuals/desktop/synchronized-file-sharing.md +++ b/content/manuals/desktop/features/synchronized-file-sharing.md @@ -1,8 +1,10 @@ --- title: Synchronized file shares -weight: 70 +weight: 30 description: Get started with Synchronized file shares on Docker Desktop. keyword: mutagen, file sharing, docker desktop, bind mounts +aliases: +- /desktop/synchronized-file-sharing/ --- > [!NOTE] @@ -11,7 +13,7 @@ keyword: mutagen, file sharing, docker desktop, bind mounts Synchronized file shares is an alternative file sharing mechanism that provides fast and flexible host-to-VM file sharing, enhancing bind mount performance through the use of synchronized filesystem caches. -![Image of Synchronized file shares pane](images/synched-file-shares.webp) +![Image of Synchronized file shares pane](../images/synched-file-shares.webp) ## Who is it for? diff --git a/content/manuals/desktop/vmm.md b/content/manuals/desktop/features/vmm.md similarity index 97% rename from content/manuals/desktop/vmm.md rename to content/manuals/desktop/features/vmm.md index 132ad7af4d..990f9c1f96 100644 --- a/content/manuals/desktop/vmm.md +++ b/content/manuals/desktop/features/vmm.md @@ -8,7 +8,9 @@ params: text: New keywords: virtualization software, resource allocation, mac, docker desktop, vm monitoring, vm performance, apple silicon description: Discover Docker Desktop for Mac's Virtual Machine Manager (VMM) options, including the new Docker VMM for Apple Silicon, offering enhanced performance and efficiency -weight: 150 +weight: 90 +aliases: +- /desktop/vmm/ --- The Virtual Machine Manager (VMM) in Docker Desktop for Mac is responsible for creating and managing the virtual machine used to run containers. Depending on your system architecture and performance needs, you can choose from multiple VMM options in Docker Desktop's [settings](/manuals/desktop/settings-and-maintenance/settings.md#general). This page provides an overview of the available options. diff --git a/content/manuals/desktop/wasm.md b/content/manuals/desktop/features/wasm.md similarity index 98% rename from content/manuals/desktop/wasm.md rename to content/manuals/desktop/features/wasm.md index c8c36392f4..741637fc12 100644 --- a/content/manuals/desktop/wasm.md +++ b/content/manuals/desktop/features/wasm.md @@ -1,13 +1,15 @@ --- title: Wasm workloads (Beta) -weight: 60 +weight: 20 description: How to run Wasm workloads with Docker Desktop keywords: Docker, WebAssembly, wasm, containerd, engine toc_max: 3 +aliases: +- /desktop/wasm/ --- {{% experimental title="Beta" %}} -The Wasm feature is currently in [Beta](../release-lifecycle.md#beta). +The Wasm feature is currently in [Beta](/manuals/release-lifecycle.md#beta). We recommend that you do not use this feature in production environments as this feature may change or be removed from future releases. {{% /experimental %}} diff --git a/content/manuals/desktop/wsl/_index.md b/content/manuals/desktop/features/wsl/_index.md similarity index 98% rename from content/manuals/desktop/wsl/_index.md rename to content/manuals/desktop/features/wsl/_index.md index 383563a3de..117ba46403 100644 --- a/content/manuals/desktop/wsl/_index.md +++ b/content/manuals/desktop/features/wsl/_index.md @@ -5,11 +5,12 @@ keywords: wsl, wsl2, installing wsl2, wsl installation, docker wsl2, wsl docker, tech preview, wsl install docker, install docker wsl, how to install docker in wsl title: Docker Desktop WSL 2 backend on Windows linkTitle: WSL -weight: 80 +weight: 100 aliases: - /docker-for-windows/wsl/ - /docker-for-windows/wsl-tech-preview/ - /desktop/windows/wsl/ +- /desktop/wsl/ --- Windows Subsystem for Linux (WSL) 2 is a full Linux kernel built by Microsoft, which lets Linux distributions run without managing virtual machines. With Docker Desktop running on WSL 2, users can leverage Linux workspaces and avoid maintaining both Linux and Windows build scripts. In addition, WSL 2 provides improvements to file system sharing and boot time. @@ -106,4 +107,4 @@ Docker Desktop does not require any particular Linux distros to be installed. Th - [Explore best practices](best-practices.md) - [Understand how to develop with Docker and WSL 2](use-wsl.md) -- [Learn about GPU support with WSL 2](../gpu.md) +- [Learn about GPU support with WSL 2](/manuals/desktop/features/gpu.md) diff --git a/content/manuals/desktop/wsl/best-practices.md b/content/manuals/desktop/features/wsl/best-practices.md similarity index 98% rename from content/manuals/desktop/wsl/best-practices.md rename to content/manuals/desktop/features/wsl/best-practices.md index ce190dd548..393604b2ce 100644 --- a/content/manuals/desktop/wsl/best-practices.md +++ b/content/manuals/desktop/features/wsl/best-practices.md @@ -3,6 +3,8 @@ title: Best practices description: Best practices for using Docker Desktop with WSL 2 keywords: wsl, docker desktop, best practices tags: [Best practices] +aliases: +- /desktop/wsl/best-practices/ --- - Always use the latest version of WSL. At a minimum you must use WSL version 1.1.3.0., otherwise Docker Desktop may not work as expected. Testing, development, and documentation is based on the newest kernel versions. Older versions of WSL can cause: diff --git a/content/manuals/desktop/wsl/use-wsl.md b/content/manuals/desktop/features/wsl/use-wsl.md similarity index 97% rename from content/manuals/desktop/wsl/use-wsl.md rename to content/manuals/desktop/features/wsl/use-wsl.md index 4601532b44..8d77202c83 100644 --- a/content/manuals/desktop/wsl/use-wsl.md +++ b/content/manuals/desktop/features/wsl/use-wsl.md @@ -2,6 +2,8 @@ title: Use WSL description: How to develop with Docker and WSL 2 and understand GPU support for WSL keywords: wsl, wsl 2, develop, docker desktop, windows +aliases: +- /desktop/wsl/use-wsl/ --- The following section describes how to start developing your applications using Docker and WSL 2. We recommend that you have your code in your default Linux distribution for the best development experience using Docker and WSL 2. After you have turned on the WSL 2 feature on Docker Desktop, you can start working with your code inside the Linux distro and ideally with your IDE still in Windows. This workflow is straightforward if you are using [VS Code](https://code.visualstudio.com/download). diff --git a/content/manuals/desktop/previous-versions/2.x-windows.md b/content/manuals/desktop/previous-versions/2.x-windows.md index 8a3b5d11f5..fdeae97381 100644 --- a/content/manuals/desktop/previous-versions/2.x-windows.md +++ b/content/manuals/desktop/previous-versions/2.x-windows.md @@ -244,7 +244,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### Known issues -- Some CLI commands fail if you are running Docker Desktop in the experimental Linux Containers on Windows (LCOW) mode. As alternatives, we recommend running either traditional Linux containers, or the [WSL 2 backend](../wsl/_index.md). +- Some CLI commands fail if you are running Docker Desktop in the experimental Linux Containers on Windows (LCOW) mode. As alternatives, we recommend running either traditional Linux containers, or the [WSL 2 backend](/manuals/desktop/features/wsl/_index.md). **WSL 2** @@ -284,7 +284,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### Known issues -- Some CLI commands fail if you are running Docker Desktop in the experimental Linux Containers on Windows (LCOW) mode. As alternatives, we recommend running either traditional Linux containers, or the experimental [WSL backend](../wsl/_index.md). +- Some CLI commands fail if you are running Docker Desktop in the experimental Linux Containers on Windows (LCOW) mode. As alternatives, we recommend running either traditional Linux containers, or the experimental [WSL backend](/manuals/desktop/features/wsl/_index.md). - It is not possible to resize the disk image using the Docker Desktop **Settings** UI. If you would like to update the size of the disk image (for example, to 128 GB), run the following command in PowerShell: ```powershell @@ -322,7 +322,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### Known issues -- DockerNAT has been removed from Docker Desktop 2.2.0.0 as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](../networking.md#use-cases-and-workarounds-for-all-platforms). +- DockerNAT has been removed from Docker Desktop 2.2.0.0 as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](/manuals/desktop/features/networking.md#use-cases-and-workarounds-for-all-platforms). However, if your current setup relies on IP addresses for communication, you can use a temporary workaround to reinstate DockerNAT. To do this, open `C:\Program Files\Docker\Docker\resources\MobyLinux.ps1` and add `$SwitchName = "DockerNAT"` between line 175 and 176. Note that the temporary workaround to reinstate DockerNAT may be removed from future releases. @@ -348,7 +348,7 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus - **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior. For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../_index.md). -- **WSL 2 backend:** The experimental Docker Desktop WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](../wsl/_index.md). +- **WSL 2 backend:** The experimental Docker Desktop WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](/manuals/desktop/features/wsl/_index.md). - **New file sharing implementation:** Docker Desktop introduces a new file sharing implementation that replaces Samba, CIFS, and Hyper-V networking. The new implementation offers improved I/O performance. Additionally, when using the new file system: diff --git a/content/manuals/desktop/previous-versions/3.x-mac.md b/content/manuals/desktop/previous-versions/3.x-mac.md index 25491a7e57..3444a12d02 100644 --- a/content/manuals/desktop/previous-versions/3.x-mac.md +++ b/content/manuals/desktop/previous-versions/3.x-mac.md @@ -49,7 +49,7 @@ This page contains release notes for Docker Desktop for Mac 3.x. ### New -**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments/_index.md). +**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](/manuals/desktop/features/dev-environments/_index.md). ### Upgrades @@ -77,7 +77,7 @@ This page contains release notes for Docker Desktop for Mac 3.x. ### New -**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments/_index.md). +**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](/manuals/desktop/features/dev-environments/_index.md). **Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](/manuals/compose/releases/migrate.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository. @@ -90,7 +90,7 @@ This page contains release notes for Docker Desktop for Mac 3.x. ### New -**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments/_index.md). +**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](/manuals/desktop/features/dev-environments/_index.md). **Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](/manuals/compose/releases/migrate.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository. diff --git a/content/manuals/desktop/previous-versions/3.x-windows.md b/content/manuals/desktop/previous-versions/3.x-windows.md index 861b1b88ec..b93c1c7435 100644 --- a/content/manuals/desktop/previous-versions/3.x-windows.md +++ b/content/manuals/desktop/previous-versions/3.x-windows.md @@ -56,7 +56,7 @@ This page contains release notes for Docker Desktop for Windows 3.x. ### New -**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments/_index.md). +**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](/manuals/desktop/features/dev-environments/_index.md). ### Upgrades @@ -84,7 +84,7 @@ This page contains release notes for Docker Desktop for Windows 3.x. ### New -**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments/_index.md). +**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](/manuals/desktop/features/dev-environments/_index.md). **Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](/manuals/compose/releases/migrate.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository. @@ -98,7 +98,7 @@ This page contains release notes for Docker Desktop for Windows 3.x. ### New -**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments/_index.md). +**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](/manuals/desktop/features/dev-environments/_index.md). **Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](/manuals/compose/releases/migrate.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository. diff --git a/content/manuals/desktop/previous-versions/archive-mac.md b/content/manuals/desktop/previous-versions/archive-mac.md index 28003bd6bc..692afebd84 100644 --- a/content/manuals/desktop/previous-versions/archive-mac.md +++ b/content/manuals/desktop/previous-versions/archive-mac.md @@ -31,7 +31,7 @@ This page contains release notes for older versions of Docker Desktop for Mac. - Linux Kernel 4.9.93 with CEPH, DRBD, RBD, MPLS_ROUTING and MPLS_IPTUNNEL enabled * New - - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md) + - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](/manuals/desktop/features/kubernetes.md) - Add an experimental SOCKS server to allow access to container networks, see [docker/for-mac#2670](https://github.com/docker/for-mac/issues/2670#issuecomment-372365274). Also see [docker/for-mac#2721](https://github.com/docker/for-mac/issues/2721) - Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625) diff --git a/content/manuals/desktop/previous-versions/archive-windows.md b/content/manuals/desktop/previous-versions/archive-windows.md index efeb4f928e..262e7c7933 100644 --- a/content/manuals/desktop/previous-versions/archive-windows.md +++ b/content/manuals/desktop/previous-versions/archive-windows.md @@ -47,7 +47,7 @@ This page contains release notes for older versions of Docker Desktop for Window - Linux Kernel 4.9.93 with CEPH, DRBD, RBD, MPLS_ROUTING and MPLS_IPTUNNEL enabled * New - - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See [the Kubernetes section](../kubernetes.md) + - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See [the Kubernetes section](/manuals/desktop/features/kubernetes.md) * Bug fixes and minor changes - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/reference/cli/docker/image/save/#examples) and [backup volumes](/manuals/engine/storage/volumes.md#back-up-restore-or-migrate-data-volumes) diff --git a/content/manuals/desktop/previous-versions/edge-releases-mac.md b/content/manuals/desktop/previous-versions/edge-releases-mac.md index ed99dc8196..98c379f98a 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-mac.md +++ b/content/manuals/desktop/previous-versions/edge-releases-mac.md @@ -924,7 +924,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) * New - - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md) + - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](/manuals/desktop/features/kubernetes.md) - 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/content/manuals/desktop/previous-versions/edge-releases-windows.md b/content/manuals/desktop/previous-versions/edge-releases-windows.md index ad0d9393fa..1ef855df01 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-windows.md +++ b/content/manuals/desktop/previous-versions/edge-releases-windows.md @@ -480,7 +480,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Bug fixes and minor changes - Added a prerequisite check in the installer for the `LanmanServer` service. Fixes [docker/for-win#5150](https://github.com/docker/for-win/issues/5150). -- DockerNAT has been removed from Docker Desktop as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](../networking.md). +- DockerNAT has been removed from Docker Desktop as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](/manuals/desktop/features/networking.md). - Ceph support has been removed from Docker Desktop to save disk space. - Fixed an issue that caused the Windows log file archive to grow indefinitely. Fixes [docker/for-win#5113](https://github.com/docker/for-win/issues/5113). @@ -516,7 +516,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Known issues -- DockerNAT has been removed from Docker Desktop 2.2.0.0 as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](../networking.md). +- DockerNAT has been removed from Docker Desktop 2.2.0.0 as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](/manuals/desktop/features/networking.md). However, if your current setup relies on IP addresses for communication, you can use a temporary workaround to reinstate DockerNAT. To do this, open `C:\Program Files\Docker\Docker\resources\MobyLinux.ps1` and add `$SwitchName = "DockerNAT"` between line 175 and 176. Note that the temporary workaround to reinstate DockerNAT may be removed from future releases. @@ -624,7 +624,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus To access the Dashboard UI, select the Docker menu from the system tray and then click **Dashboard**. -- **WSL 2 backend:** The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](../wsl/_index.md). +- **WSL 2 backend:** The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](/manuals/desktop/features/wsl/_index.md). - **New file sharing implementation:** Docker Desktop introduces a new file sharing implementation which uses gRPC, FUSE, and Hypervisor sockets instead of Samba, CIFS, and Hyper-V networking. The new implementation offers improved I/O performance. Additionally, when using the new file system: @@ -699,7 +699,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus #### New -- [Docker Desktop WSL 2 Tech Preview](../wsl/_index.md) +- [Docker Desktop WSL 2 Tech Preview](/manuals/desktop/features/wsl/_index.md) #### Bug fixes and minor changes @@ -1094,7 +1094,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - [Docker 18.02.0-ce-rc1](https://github.com/docker/docker-ce/releases/tag/v18.02.0-ce-rc1) * New - - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md). + - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as docker commands. See [the Kubernetes section](/manuals/desktop/features/kubernetes.md). - LCOW containers can now be run next to Windows containers (on Windows RS3 build 16299 and later). Use `--platform=linux` in Windows container mode to run Linux Containers On Windows. Note that LCOW is still experimental, and requires daemon `experimental` option. * Bug fixes and minor changes diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 4a99b03bcc..7d34d886cc 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -164,7 +164,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec - [Host networking](/manuals/engine/network/drivers/host.md#docker-desktop) support on Docker Desktop is now generally available. - If you authenticate via the CLI, you can now authenticate through a browser-based flow, removing the need for manual PAT generation. -- Windows now supports automatic reclamation of disk space in Docker Desktop for WSL2 installations [using a managed virtual hard disk](/manuals/desktop/wsl/best-practices.md). +- Windows now supports automatic reclamation of disk space in Docker Desktop for WSL2 installations [using a managed virtual hard disk](/manuals/desktop/features/wsl/best-practices.md). - Deploying Docker Desktop via the [MSI installer](/manuals/desktop/setup/install/msi/_index.md) is now generally available. - Two new methods to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) (windows registry key and `.plist` file) are now generally available. - Fresh installations of Docker Desktop now use the containerd image store by default. @@ -480,7 +480,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL #### For all platforms -- Docker Desktop now supports [SOCKS5 proxies](networking.md#socks5-proxy-support). Requires a Business subscription. +- Docker Desktop now supports [SOCKS5 proxies](/manuals/desktop/features/networking.md#socks5-proxy-support). Requires a Business subscription. - Added a new setting to manage the onboarding survey in [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md). #### For Windows @@ -491,7 +491,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL - [Docker Compose v2.27.0](https://github.com/docker/compose/releases/tag/v2.27.0) - [Docker Engine v26.1.1](https://docs.docker.com/engine/release-notes/26.1/#2611) -- [Wasm](/manuals/desktop/wasm/_index.md) runtimes: +- [Wasm](/manuals/desktop/features/wasm.md) runtimes: - Updated `runwasi` shims to `v0.4.0` - Updated `deislabs` shims to `v0.11.1` - Updated `spin` shim to `v0.13.1` @@ -564,7 +564,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - [Docker socket mount restrictions](/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/config.md) with ECI is now generally available. - Docker Engine and CLI updated to [Moby 26.0](https://github.com/moby/moby/releases/tag/v26.0.0). This includes Buildkit 0.13, sub volumes mounts, networking updates, and improvements to the containerd multi-platform image store UX. - New and improved Docker Desktop error screens: swift troubleshooting, easy diagnostics uploads, and actionable remediation. -- Compose supports [Synchronized file shares (experimental)](synchronized-file-sharing.md). +- Compose supports [Synchronized file shares (experimental)](/manuals/desktop/features/synchronized-file-sharing.md). - New [interactive Compose CLI (experimental)](/manuals/compose/how-tos/environment-variables/envvars.md#compose_menu). - Beta release of: - Air-Gapped Containers with [Settings Management](/manuals/security/for-admins/hardened-desktop/air-gapped-containers/_index.md). @@ -592,7 +592,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - Fixed an issue with `.dockerignore` to avoid ignoring application files that start with "compose". - Improved how Java applications are started based on Spring Boot version. Fixes [docker/for-mac#7171](https://github.com/docker/for-mac/issues/7171). - Removed non-official Docker image used for Rust cross-compilation. -- The maximum number of files per [Synchronized file share](synchronized-file-sharing.md) now exceeds 2 million. +- The maximum number of files per [Synchronized file share](/manuals/desktop/features/synchronized-file-sharing.md) now exceeds 2 million. - Fixed an issue that caused the warning: "_The value provided to Autocomplete is invalid._" when selecting the **Export to local image** field. - **Run Cloud** can now be accessed from the Docker Desktop Dashboard. - Opting out from sending analytics will now also disable collecting data for bug reports. @@ -639,7 +639,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st ### New - [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md) now allows admins to set the default file-sharing implementation and specify which paths developer can add file shares to. -- Added support for `socks5://` HTTP and HTTPS proxy URLs when the [`SOCKS` proxy support beta feature](networking.md) is enabled. +- Added support for `socks5://` HTTP and HTTPS proxy URLs when the [`SOCKS` proxy support beta feature](/manuals/desktop/features/networking.md) is enabled. - Users can now filter volumes to see which ones are in use in the **Volumes** tab. ### Upgrades @@ -648,7 +648,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - [Docker Engine v25.0.3](https://docs.docker.com/engine/release-notes/25.0/#2503) - [Docker Scout CLI v1.5.0](https://github.com/docker/scout-cli/releases/tag/v1.5.0) - [Qemu 8.1.5](https://wiki.qemu.org/ChangeLog/8.1) -- [Wasm](/manuals/desktop/wasm/_index.md) runtimes: +- [Wasm](/manuals/desktop/features/wasm.md) runtimes: - Updated runwasi shims to `v0.4.0`, including: - wasmtime `v17.0`, with initial support for WASI preview 2 - wasmedge `v0.13.5` @@ -756,9 +756,9 @@ This can be resolved by adding the user to the **docker-users** group. Before st ### New - Docker init now supports Java and is generally available to all users. -- [Synchronized File Shares](synchronized-file-sharing.md) provides fast and flexible host-to-VM file sharing within Docker Desktop. Utilizing the technology behind [Docker’s acquisition of Mutagen](https://www.docker.com/blog/mutagen-acquisition/), this feature provides an alternative to virtual bind mounts that uses synchronized filesystem caches, improving performance for developers working with large codebases. +- [Synchronized File Shares](/manuals/desktop/features/synchronized-file-sharing.md) provides fast and flexible host-to-VM file sharing within Docker Desktop. Utilizing the technology behind [Docker’s acquisition of Mutagen](https://www.docker.com/blog/mutagen-acquisition/), this feature provides an alternative to virtual bind mounts that uses synchronized filesystem caches, improving performance for developers working with large codebases. - Organization admins can now [configure Docker socket mount permissions](/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/config.md) when ECI is enabled. -- [Containerd Image Store](containerd.md) support is now generally available to all users. +- [Containerd Image Store](/manuals/desktop/features/containerd.md) support is now generally available to all users. - Get a debug shell into any container or image with the new [`docker debug` command](/reference/cli/docker/debug.md) (Beta). - Organization admins, with a Docker Business subscription, can now configure a custom list of extensions with [Private Extensions Marketplace](/manuals/extensions/private-marketplace.md) enabled (Beta) @@ -868,7 +868,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - [Compose v2.23.3](https://github.com/docker/compose/releases/tag/v2.23.3) - [Docker Scout CLI v1.2.0](https://github.com/docker/scout-cli/releases/tag/v1.2.0). - [Buildx v0.12.0](https://github.com/docker/buildx/releases/tag/v0.12.0) -- [Wasm](/manuals/desktop/wasm/_index.md) runtimes: +- [Wasm](/manuals/desktop/features/wasm.md) runtimes: - wasmtime, wasmedge and wasmer `v0.3.1`. - lunatic, slight, spin, and wws `v0.10.0`. - Wasmtime is now based on wasmtime `v14.0` and supports wasi preview-2 components @@ -1070,7 +1070,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - [Compose v2.22.0](https://github.com/docker/compose/releases/tag/v2.22.0) - [Go 1.21.1](https://github.com/golang/go/releases/tag/go1.21.1) -- [Wasm](/manuals/desktop/wasm.md) runtimes: +- [Wasm](/manuals/desktop/features/wasm.md) runtimes: - wasmtime, wasmedge `v0.2.0`. - lunatic, slight, spin, and wws`v0.9.1`. - Added wasmer wasm shims. @@ -1131,7 +1131,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - [Compose v2.21.0](https://github.com/docker/compose/releases/tag/v2.21.0) - [Docker Engine v24.0.6](https://docs.docker.com/engine/release-notes/24.0/#2406) - [Docker Scout CLI v0.24.1](https://github.com/docker/scout-cli/releases/tag/v0.24.1). -- [Wasm](/manuals/desktop/wasm.md) runtimes: +- [Wasm](/manuals/desktop/features/wasm.md) runtimes: - wasmtime, wasmedge revision `d0a1a1cd`. - slight and spin wasm `v0.9.0`. @@ -1715,7 +1715,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st - Substantial performance improvements for macOS users with the option of enabling the new VirtioFS file sharing technology. Available for macOS 12.5 and above. - Docker Desktop for Mac no longer needs to install the privileged helper process `com.docker.vmnetd` on install or on the first run. For more information see [Permission requirements for Mac](https://docs.docker.com/desktop/mac/permission-requirements/). -- Added [WebAssembly capabilities](wasm/_index.md). Use with the [containerd integration](containerd/_index.md). +- Added [WebAssembly capabilities](/manuals/desktop/features/wasm.md). Use with the [containerd integration](/manuals/desktop/features/containerd.md). - Improved the descriptions for beta and experimental settings to clearly explain the differences and how people can access them. - Available disk space of VM now displays in the footer of Docker Desktop Dashboard for Mac and Linux. - A disk space warning now displays in the footer if available space is below 3GB. diff --git a/content/manuals/desktop/settings-and-maintenance/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md index 80c8f339ff..149c328e9c 100644 --- a/content/manuals/desktop/settings-and-maintenance/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -50,7 +50,7 @@ If you choose the integrated terminal, you can run commands in a running contain execution attacks. - {{< badge color=blue text="Windows only" >}}**Use the WSL 2 based engine**. WSL 2 provides better performance than the - Hyper-V backend. For more information, see [Docker Desktop WSL 2 backend](/manuals/desktop/wsl/_index.md). + Hyper-V backend. For more information, see [Docker Desktop WSL 2 backend](/manuals/desktop/features/wsl/_index.md). - {{< badge color=blue text="Windows only" >}}**Add the `*.docker.internal` names to the host's `/etc/hosts` file (Password required)**. Lets you resolve `*.docker.internal` DNS names from both the host and your containers. @@ -58,7 +58,7 @@ If you choose the integrated terminal, you can run commands in a running contain Turns on the containerd image store. This brings new features like faster container startup performance by lazy-pulling images, and the ability to run Wasm applications with Docker. - For more information, see [containerd image store](/manuals/desktop/containerd.md). + For more information, see [containerd image store](/manuals/desktop/features/containerd.md). - {{< badge color=blue text="Mac only" >}} **Choose Virtual Machine Manager (VMM)**. Choose the Virtual Machine Manager for creating and managing the Docker Desktop Linux VM. - Select **Docker VMM** for the latest and most performant Hypervisor/Virtual Machine Manager. This option is available only on Apple Silicon Macs running macOS 12.5 or later and is currently in Beta. @@ -67,7 +67,7 @@ If you choose the integrated terminal, you can run commands in a running contain > Turn this setting on to make Docker Desktop run faster. - Alternatively, you can choose **Apple Virtualization framework**, **QEMU** (for Apple Silicon), or **HyperKit** (for Intel Macs). For macOS 12.5 and later, Apple Virtualization framework is the default setting. - For more information, see [Virtual Machine Manager](/manuals/desktop/vmm.md). + For more information, see [Virtual Machine Manager](/manuals/desktop/features/vmm.md). - {{< badge color=blue text="Mac only" >}}**Choose file sharing implementation for your containers**. Choose whether you want to share files using **VirtioFS**, **gRPC FUSE**, or **osxfs (Legacy)**. VirtioFS is only available for macOS 12.5 and later, and is turned on by default. > [!TIP] @@ -171,7 +171,7 @@ the host while running and testing the code in a container. Synchronized file shares is an alternative file sharing mechanism that provides fast and flexible host-to-VM file sharing, enhancing bind mount performance through the use of synchronized filesystem caches. Available with Pro, Team, and Business subscriptions. -To learn more, see [Synchronized file share](/manuals/desktop/synchronized-file-sharing.md). +To learn more, see [Synchronized file share](/manuals/desktop/features/synchronized-file-sharing.md). #### Virtual file shares @@ -231,7 +231,7 @@ containers. Alternatively, you can opt not to share it by selecting **Cancel**. ### Proxies -Docker Desktop supports the use of HTTP/HTTPS and [SOCKS5 proxies](/manuals/desktop/networking.md#socks5-proxy-support). +Docker Desktop supports the use of HTTP/HTTPS and [SOCKS5 proxies](/manuals/desktop/features/networking.md#socks5-proxy-support). HTTP/HTTPS proxies can be used when: @@ -319,7 +319,7 @@ to set Ubuntu as your default WSL distro, run `wsl --set-default ubuntu`). You can also select any additional distributions you would like to enable the WSL 2 integration on. For more details on configuring Docker Desktop to use WSL 2, see -[Docker Desktop WSL 2 backend](/manuals/desktop/wsl/_index.md). +[Docker Desktop WSL 2 backend](/manuals/desktop/features/wsl/_index.md). ## Docker Engine @@ -431,7 +431,7 @@ using Docker commands. Select **Reset Kubernetes cluster** to delete all stacks and Kubernetes resources. For more information about using the Kubernetes integration with Docker Desktop, -see [Deploy on Kubernetes](/manuals/desktop/kubernetes.md). +see [Deploy on Kubernetes](/manuals/desktop/features/kubernetes.md). ## Software Updates diff --git a/content/manuals/desktop/setup/install/windows-install.md b/content/manuals/desktop/setup/install/windows-install.md index 6c7d5f86e1..c2fcc1559c 100644 --- a/content/manuals/desktop/setup/install/windows-install.md +++ b/content/manuals/desktop/setup/install/windows-install.md @@ -58,7 +58,7 @@ _For checksums, see [Release notes](/manuals/desktop/release-notes.md)_ - Enable hardware virtualization in BIOS. For more information, see [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). -For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals/desktop/wsl/_index.md). +For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals/desktop/features/wsl/_index.md). > [!NOTE] > @@ -143,7 +143,7 @@ For more information on Windows containers, refer to the following documentation [forked here to use containers](https://github.com/friism/MusicStore), is a good example of a multi-container application. - To understand how to connect to Windows containers from the local host, see - [I want to connect to a container from Windows](/manuals/desktop/networking.md#i-want-to-connect-to-a-container-from-the-host) + [I want to connect to a container from Windows](/manuals/desktop/features/networking.md#i-want-to-connect-to-a-container-from-the-host) > [!NOTE] > diff --git a/content/manuals/desktop/troubleshoot-and-support/faqs/general.md b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md index 6016e3fa10..4962c2807a 100644 --- a/content/manuals/desktop/troubleshoot-and-support/faqs/general.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md @@ -24,10 +24,10 @@ This includes: - [Image Access Management](/manuals/security/for-developers/access-tokens.md) - [Static vulnerability scanning](/manuals/docker-hub/vulnerability-scanning.md) - Viewing remote images in the Docker Dashboard -- Setting up [Dev Environments](/manuals/desktop/dev-environments/_index.md) +- Setting up [Dev Environments](/manuals/desktop/features/dev-environments/_index.md) - Docker Build when using [BuildKit](/manuals/build/buildkit/_index.md#getting-started). You can work around this by disabling BuildKit. Run `DOCKER_BUILDKIT=0 docker build .` to disable BuildKit. -- [Kubernetes](/manuals/desktop/kubernetes.md) (Images are download when you enable Kubernetes for the first time) +- [Kubernetes](/manuals/desktop/features/kubernetes.md) (Images are download when you enable Kubernetes for the first time) - Checking for updates - [In-app diagnostics](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md#diagnose-from-the-app) (including the [Self-diagnose tool](/manuals/desktop/troubleshoot-and-support/troubleshoot/_index.md#diagnose-from-the-app)) - Sending usage statistics @@ -59,7 +59,7 @@ 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. -For more information and examples, see [how to connect from a container to a service on the host](/manuals/desktop/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). +For more information and examples, see [how to connect from a container to a service on the host](/manuals/desktop/features/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). ### Can I pass through a USB device to a container? @@ -90,7 +90,7 @@ You can then sign in to your machine with the user ID specified, and launch Dock > [!NOTE] > -> If you are using the WSL 2 backend, first make sure that you meet the [minimum required version](/manuals/desktop/wsl/best-practices.md) for WSL 2. Otherwise, update WSL 2 first. +> If you are using the WSL 2 backend, first make sure that you meet the [minimum required version](/manuals/desktop/features/wsl/best-practices.md) for WSL 2. Otherwise, update WSL 2 first. To run Docker Desktop on Windows without requiring administrator privileges, install via the command line and pass the `—always-run-service` installer flag. diff --git a/content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md index 2a89e76a53..6dd0e0e8e0 100644 --- a/content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md +++ b/content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md @@ -290,7 +290,7 @@ In the subsequent screen, verify that Hyper-V is enabled. #### Virtualization must be turned on -In addition to [Hyper-V](#hyper-v) or [WSL 2](/manuals/desktop/wsl/_index.md), virtualization must be turned on. Check the +In addition to [Hyper-V](#hyper-v) or [WSL 2](/manuals/desktop/features/wsl/_index.md), virtualization must be turned on. Check the Performance tab on the Task Manager. Alternatively, you can type 'systeminfo' into your terminal. If you see 'Hyper-V Requirements: A hypervisor has been detected. Features required for Hyper-V will not be displayed', then virtualization is enabled. ![Task Manager](../images/virtualization-enabled.png) diff --git a/content/manuals/desktop/use-desktop/resource-saver.md b/content/manuals/desktop/use-desktop/resource-saver.md index 929163bf23..9d4dcb57ba 100644 --- a/content/manuals/desktop/use-desktop/resource-saver.md +++ b/content/manuals/desktop/use-desktop/resource-saver.md @@ -71,7 +71,7 @@ utilization. To reduce memory utilization on WSL, we instead recommend that users enable WSL's `autoMemoryReclaim` feature as described in the -[Docker Desktop WSL docs](../wsl/_index.md). Finally, since Docker Desktop does not +[Docker Desktop WSL docs](/manuals/desktop/features/wsl/_index.md). Finally, since Docker Desktop does not stop the Linux VM on WSL, exit from Resource Saver mode is immediate (there's no exit delay). diff --git a/content/manuals/engine/storage/_index.md b/content/manuals/engine/storage/_index.md index 255d796dbf..ccf0b83e4d 100644 --- a/content/manuals/engine/storage/_index.md +++ b/content/manuals/engine/storage/_index.md @@ -114,7 +114,7 @@ You can't use Docker CLI commands to directly manage bind mounts. > [!TIP] > > Working with large repositories or monorepos, or with virtual file systems that are no longer scaling with your codebase? -> Check out [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md). It provides fast and flexible host-to-VM file sharing by enhancing bind mount performance through the use of synchronized filesystem caches. +> Check out [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md). It provides fast and flexible host-to-VM file sharing by enhancing bind mount performance through the use of synchronized filesystem caches. ### tmpfs diff --git a/content/manuals/engine/storage/bind-mounts.md b/content/manuals/engine/storage/bind-mounts.md index 570b3cd04e..d841270d44 100644 --- a/content/manuals/engine/storage/bind-mounts.md +++ b/content/manuals/engine/storage/bind-mounts.md @@ -28,7 +28,7 @@ manage bind mounts. > [!TIP] > > Working with large repositories or monorepos, or with virtual file systems that are no longer scaling with your codebase? -> Check out [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md). It provides fast and flexible host-to-VM file sharing by enhancing bind mount performance through the use of synchronized filesystem caches. +> Check out [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md). It provides fast and flexible host-to-VM file sharing by enhancing bind mount performance through the use of synchronized filesystem caches. ## Choose the -v or --mount flag diff --git a/content/manuals/engine/storage/containerd.md b/content/manuals/engine/storage/containerd.md index e77858c4e5..e228227809 100644 --- a/content/manuals/engine/storage/containerd.md +++ b/content/manuals/engine/storage/containerd.md @@ -12,7 +12,7 @@ aliases: > > The containerd image store is an experimental feature of Docker Engine. > If you're using Docker Desktop, refer to the instructions on the -> [containerd image store with Docker Desktop page](/manuals/desktop/containerd.md). +> [containerd image store with Docker Desktop page](/manuals/desktop/features/containerd.md). containerd, the industry-standard container runtime, uses snapshotters instead of the classic storage drivers for storing image and container data. @@ -20,7 +20,7 @@ While the `overlay2` driver still remains the default driver for Docker Engine, you can opt in to using containerd snapshotters as an experimental feature. To learn more about the containerd image store and its benefits, refer to -[containerd image store on Docker Desktop](/manuals/desktop/containerd.md). +[containerd image store on Docker Desktop](/manuals/desktop/features/containerd.md). ## Enable containerd image store on Docker Engine diff --git a/content/manuals/engine/storage/drivers/select-storage-driver.md b/content/manuals/engine/storage/drivers/select-storage-driver.md index b0f5dc38c1..a4118a301b 100644 --- a/content/manuals/engine/storage/drivers/select-storage-driver.md +++ b/content/manuals/engine/storage/drivers/select-storage-driver.md @@ -53,7 +53,7 @@ the final decision. > > Modifying the storage driver by editing the daemon configuration file isn't > supported on Docker Desktop. Only the default `overlay2` driver or the -> [containerd storage](/manuals/desktop/containerd.md) are supported. The +> [containerd storage](/manuals/desktop/features/containerd.md) are supported. The > following table is also not applicable for the Docker Engine in rootless > mode. For the drivers available in rootless mode, see the [Rootless mode > documentation](/manuals/engine/security/rootless.md). diff --git a/content/manuals/harmonia/_index.md b/content/manuals/harmonia/_index.md index ab61515326..3a2a72b3b1 100644 --- a/content/manuals/harmonia/_index.md +++ b/content/manuals/harmonia/_index.md @@ -138,7 +138,7 @@ Running a container with a cloud engine is just as straightforward as running it ### Step four: Use a file sync for your cloud engine -Project Harmonia takes advantage of [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md) to enable local-to-remote file shares and port mappings. +Project Harmonia takes advantage of [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md) to enable local-to-remote file shares and port mappings. {{< tabs group="method" >}} {{< tab name="Docker Desktop">}} diff --git a/content/manuals/scout/explore/analysis.md b/content/manuals/scout/explore/analysis.md index 8f917ff162..6bc2fe3e13 100644 --- a/content/manuals/scout/explore/analysis.md +++ b/content/manuals/scout/explore/analysis.md @@ -81,7 +81,7 @@ analysis is activated. > [!NOTE] > > The default `docker` driver only supports build attestations if you use the - > [containerd image store](/manuals/desktop/containerd.md). + > [containerd image store](/manuals/desktop/features/containerd.md). 3. Go to the [Images page](https://scout.docker.com/reports/images) in the Docker Scout Dashboard. diff --git a/content/manuals/scout/how-tos/create-exceptions-vex.md b/content/manuals/scout/how-tos/create-exceptions-vex.md index 7cbcdc5a88..5f420ae2f0 100644 --- a/content/manuals/scout/how-tos/create-exceptions-vex.md +++ b/content/manuals/scout/how-tos/create-exceptions-vex.md @@ -24,7 +24,7 @@ To create exceptions using OpenVEX documents, you need: - The latest version of Docker Desktop or the Docker Scout CLI plugin - The [`vexctl`](https://github.com/openvex/vexctl) command line tool. -- The [containerd image store](/manuals/desktop/containerd.md) must be enabled +- The [containerd image store](/manuals/desktop/features/containerd.md) must be enabled - Write permissions to the registry repository where the image is stored ## Introduction to VEX diff --git a/content/manuals/scout/how-tos/view-create-sboms.md b/content/manuals/scout/how-tos/view-create-sboms.md index 103c2d797c..c05cdc838d 100644 --- a/content/manuals/scout/how-tos/view-create-sboms.md +++ b/content/manuals/scout/how-tos/view-create-sboms.md @@ -76,7 +76,7 @@ $ docker build --tag / \ ``` To build images with SBOM attestations, you must use either the [containerd -image store](/manuals/desktop/containerd.md) feature, or use a `docker-container` +image store](/manuals/desktop/features/containerd.md) feature, or use a `docker-container` builder together with the `--push` flag to push the image (with attestations) directly to a registry. The classic image store doesn't support manifest lists or image indices, which is required for adding attestations to an image. diff --git a/content/manuals/scout/quickstart.md b/content/manuals/scout/quickstart.md index ca108f9b78..39d631e080 100644 --- a/content/manuals/scout/quickstart.md +++ b/content/manuals/scout/quickstart.md @@ -204,7 +204,7 @@ Docker Scout uses the provenance attestations to determine how the image was built so that it can provide a better evaluation result. Before you can build an image with attestations, -you must enable the [containerd image store](/manuals/desktop/containerd.md) +you must enable the [containerd image store](/manuals/desktop/features/containerd.md) (or create a custom builder using the `docker-container` driver). The classic image store doesn't support manifest lists, which is how the provenance attestations are attached to an image. diff --git a/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md b/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md index d3993b474e..e08b9d22a8 100644 --- a/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md +++ b/content/manuals/security/for-admins/hardened-desktop/air-gapped-containers.md @@ -84,4 +84,4 @@ The `FindProxyForURL` can return the following values: In this particular example, HTTP and HTTPS requests for `internal.corp` are sent via the HTTP proxy `10.0.0.1:3128`. Requests to connect to IPs on the subnet `192.168.0.0/24` connect directly. All other requests are blocked. -To restrict traffic connecting to ports on the developers local machine, [match the special hostname `host.docker.internal`](/manuals/desktop/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). +To restrict traffic connecting to ports on the developers local machine, [match the special hostname `host.docker.internal`](/manuals/desktop/features/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). diff --git a/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/faq.md b/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/faq.md index 313b550925..dde563e71b 100644 --- a/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/faq.md +++ b/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/faq.md @@ -80,7 +80,7 @@ Desktop 4.19 and on all supported platforms (Windows with WSL 2 or Hyper-V, Mac, and Linux). ECI does not yet protect Docker Desktop Kubernetes pods, Extension containers, -and [Dev Environments containers](/manuals/desktop/dev-environments/_index.md). +and [Dev Environments containers](/manuals/desktop/features/dev-environments/_index.md). ### Does ECI protect containers launched prior to enabling ECI? diff --git a/content/reference/compose-file/services.md b/content/reference/compose-file/services.md index 798b3ad69e..85a20df449 100644 --- a/content/reference/compose-file/services.md +++ b/content/reference/compose-file/services.md @@ -1907,7 +1907,7 @@ expressed in the short form. > [!TIP] > > Working with large repositories or monorepos, or with virtual file systems that are no longer scaling with your codebase? -> Compose now takes advantage of [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md) and automatically creates file shares for bind mounts. +> Compose now takes advantage of [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md) and automatically creates file shares for bind mounts. > Ensure you're signed in to Docker with a paid subscription and have enabled both **Access experimental features** and **Manage Synchronized file shares with Compose** in Docker Desktop's settings. ### volumes_from diff --git a/content/reference/compose-file/volumes.md b/content/reference/compose-file/volumes.md index 6d87ffa19d..fb026e2669 100644 --- a/content/reference/compose-file/volumes.md +++ b/content/reference/compose-file/volumes.md @@ -14,7 +14,7 @@ To use a volume across multiple services, you must explicitly grant each service > [!TIP] > > Working with large repositories or monorepos, or with virtual file systems that are no longer scaling with your codebase? -> Compose now takes advantage of [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md) and automatically creates file shares for bind mounts. +> Compose now takes advantage of [Synchronized file shares](/manuals/desktop/features/synchronized-file-sharing.md) and automatically creates file shares for bind mounts. > Ensure you're signed in to Docker with a paid subscription and have enabled both **Access experimental features** and **Manage Synchronized file shares with Compose** in Docker Desktop's settings. ## Example diff --git a/data/engine-cli/docker_container_restart.yaml b/data/engine-cli/docker_container_restart.yaml index 2b9a97c183..464e1454ae 100644 --- a/data/engine-cli/docker_container_restart.yaml +++ b/data/engine-cli/docker_container_restart.yaml @@ -10,6 +10,7 @@ options: shorthand: s value_type: string description: Signal to send to the container + details_url: '#signal' deprecated: false hidden: false experimental: false @@ -21,6 +22,7 @@ options: value_type: int default_value: "0" description: Seconds to wait before killing the container + details_url: '#time' deprecated: false hidden: false experimental: false @@ -42,6 +44,37 @@ examples: |- ```console $ docker restart my_container ``` + + + ### Stop container with signal (-s, --signal) {#signal} + + The `--signal` flag sends the system call signal to the container to exit. + This signal can be a signal name in the format `SIG`, for instance + `SIGKILL`, or an unsigned number that matches a position in the kernel's + syscall table, for instance `9`. Refer to [signal(7)](https://man7.org/linux/man-pages/man7/signal.7.html) + for available signals. + + The default signal to use is defined by the image's [`StopSignal`](https://github.com/opencontainers/image-spec/blob/v1.1.0/config.md), + which can be set through the [`STOPSIGNAL`](/reference/dockerfile/#stopsignal) + Dockerfile instruction when building the image, or configured using the + [`--stop-signal`](/reference/cli/docker/container/run/#stop-signal) + option when creating the container. If no signal is configured for the + container, `SIGTERM` is used as default. + + ### Stop container with timeout (-t, --timeout) {#time} + + The `--time` flag sets the number of seconds to wait for the container + to stop after sending the pre-defined (see [`--signal`]{#signal)) system call signal. + If the container does not exit after the timeout elapses, it's forcibly killed + with a `SIGKILL` signal. + + If you set `--time` to `-1`, no timeout is applied, and the daemon + waits indefinitely for the container to exit. + + The default timeout can be specified using the [`--stop-timeout`](/reference/cli/docker/container/run/#stop-timeout) + option when creating the container. If no default is configured for the container, + the Daemon determines the default, and is 10 seconds for Linux containers, and + 30 seconds for Windows containers. deprecated: false hidden: false experimental: false diff --git a/data/engine-cli/docker_container_run.yaml b/data/engine-cli/docker_container_run.yaml index 6070800032..0312bce277 100644 --- a/data/engine-cli/docker_container_run.yaml +++ b/data/engine-cli/docker_container_run.yaml @@ -2126,12 +2126,12 @@ examples: |- policy controls whether the Docker daemon restarts a container after exit. Docker supports the following restart policies: - | Policy | Result | - |:---------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - | `no` | Do not automatically restart the container when it exits. This is the default. | - | `on-failure[:max-retries]` | Restart only if the container exits with a non-zero exit status. Optionally, limit the number of restart retries the Docker daemon attempts. | - | `unless-stopped` | Restart the container unless it's explicitly stopped or Docker itself is stopped or restarted. | - | `always` | Always restart the container regardless of the exit status. When you specify always, the Docker daemon tries to restart the container indefinitely. The container always starts on daemon startup, regardless of the current state of the container. | + | Flag | Description | + | :------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | + | `no` | Don't automatically restart the container. (Default) | + | `on-failure[:max-retries]` | Restart the container if it exits due to an error, which manifests as a non-zero exit code. Optionally, limit the number of times the Docker daemon attempts to restart the container using the `:max-retries` option. The `on-failure` policy only prompts a restart if the container exits with a failure. It doesn't restart the container if the daemon restarts. | + | `always` | Always restart the container if it stops. If it's manually stopped, it's restarted only when Docker daemon restarts or the container itself is manually restarted. | + | `unless-stopped` | Similar to `always`, except that when the container is stopped (manually or otherwise), it isn't restarted even after Docker daemon restarts. | ```console $ docker run --restart=always redis @@ -2252,7 +2252,7 @@ examples: |- It's conventional to use `host.docker.internal` as the hostname referring to `host-gateway`. Docker Desktop automatically resolves this hostname, see - [Explore networking features](/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host). + [Explore networking features](/desktop/features/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host). The following example shows how the special `host-gateway` value works. The example runs an HTTP server that serves a file from host to container over the diff --git a/data/engine-cli/docker_container_stop.yaml b/data/engine-cli/docker_container_stop.yaml index 13b9e613ce..77c07cab63 100644 --- a/data/engine-cli/docker_container_stop.yaml +++ b/data/engine-cli/docker_container_stop.yaml @@ -5,7 +5,7 @@ long: |- The main process inside the container will receive `SIGTERM`, and after a grace period, `SIGKILL`. The first signal can be changed with the `STOPSIGNAL` instruction in the container's Dockerfile, or the `--stop-signal` option to - `docker run`. + `docker run` and `docker create`. usage: docker container stop [OPTIONS] CONTAINER [CONTAINER...] pname: docker container plink: docker_container.yaml @@ -14,6 +14,7 @@ options: shorthand: s value_type: string description: Signal to send to the container + details_url: '#signal' deprecated: false hidden: false experimental: false @@ -25,6 +26,7 @@ options: value_type: int default_value: "0" description: Seconds to wait before killing the container + details_url: '#time' deprecated: false hidden: false experimental: false @@ -46,6 +48,36 @@ examples: |- ```console $ docker stop my_container ``` + + ### Stop container with signal (-s, --signal) {#signal} + + The `--signal` flag sends the system call signal to the container to exit. + This signal can be a signal name in the format `SIG`, for instance + `SIGKILL`, or an unsigned number that matches a position in the kernel's + syscall table, for instance `9`. Refer to [signal(7)](https://man7.org/linux/man-pages/man7/signal.7.html) + for available signals. + + The default signal to use is defined by the image's [`StopSignal`](https://github.com/opencontainers/image-spec/blob/v1.1.0/config.md), + which can be set through the [`STOPSIGNAL`](/reference/dockerfile/#stopsignal) + Dockerfile instruction when building the image, or configured using the + [`--stop-signal`](/reference/cli/docker/container/run/#stop-signal) + option when creating the container. If no signal is configured for the + container, `SIGTERM` is used as default. + + ### Stop container with timeout (-t, --timeout) {#time} + + The `--time` flag sets the number of seconds to wait for the container + to stop after sending the pre-defined (see [`--signal`]{#signal)) system call signal. + If the container does not exit after the timeout elapses, it's forcibly killed + with a `SIGKILL` signal. + + If you set `--time` to `-1`, no timeout is applied, and the daemon + waits indefinitely for the container to exit. + + The default timeout can be specified using the [`--stop-timeout`](/reference/cli/docker/container/run/#stop-timeout) + option when creating the container. If no default is configured for the container, + the Daemon determines the default, and is 10 seconds for Linux containers, and + 30 seconds for Windows containers. deprecated: false hidden: false experimental: false diff --git a/data/engine-cli/docker_image_build.yaml b/data/engine-cli/docker_image_build.yaml index 24523a92b6..7f626cef86 100644 --- a/data/engine-cli/docker_image_build.yaml +++ b/data/engine-cli/docker_image_build.yaml @@ -2,7 +2,7 @@ command: docker image build aliases: docker image build, docker build, docker builder build short: Build an image from a Dockerfile long: |- - > [!NOTE] + > [!IMPORTANT] > This page refers to the **legacy implementation** of `docker build`, > using the legacy (pre-BuildKit) build backend. > This configuration is only relevant if you're building Windows containers. diff --git a/data/redirects.yml b/data/redirects.yml index 656a68c5dc..b6da290635 100644 --- a/data/redirects.yml +++ b/data/redirects.yml @@ -98,7 +98,7 @@ - /go/storage-driver/ "/docker-hub/vulnerability-scanning/": - /go/tip-scanning/ -"/desktop/windows/wsl/": +"/desktop/windows/features/wsl/": # Link used by Docker Desktop to refer users on how to activate WSL 2 - /go/wsl2/ "/reference/api/hub/latest/": diff --git a/go.mod b/go.mod index 9b78e2c74e..f43279e02f 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23.1 require ( github.com/docker/buildx v0.18.0 // indirect - github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible // indirect + github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible // indirect github.com/docker/compose/v2 v2.30.2 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 // indirect @@ -13,7 +13,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.18.0 - github.com/docker/cli => github.com/docker/cli v27.3.1+incompatible + github.com/docker/cli => github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.2 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 diff --git a/go.sum b/go.sum index 5ce80c0d01..b2c5235fe3 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,8 @@ github.com/docker/cli v27.3.0+incompatible h1:h7J5eiGdUbH2Q4EcGr1mFb20qzS7Nrot3E github.com/docker/cli v27.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible h1:KqHavmeo5+ct30Z2UKxbVhUEfuzI9JZFgPdVVaWS4Uc= +github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose-cli v1.0.35 h1:uZyEHLalfqBS2PiTpA1LAULyJmuQ+YtZg7nG4Xl3/Cc= github.com/docker/compose-cli v1.0.35/go.mod h1:mSXI4hFLpRU3EtI8NTo32bNwI0UXSr8jnq+/rYjGAUU= github.com/docker/compose/v2 v2.22.0 h1:3rRz4L7tPU75wRsV8JZh2/aTgerQvPa1cpzZN+tHqUY=