diff --git a/content/guides/angular/deploy.md b/content/guides/angular/deploy.md index a7677816641..daceb152080 100644 --- a/content/guides/angular/deploy.md +++ b/content/guides/angular/deploy.md @@ -11,7 +11,7 @@ description: Learn how to deploy locally to test and debug your Kubernetes deplo Before you begin, make sure you’ve completed the following: - Complete all the previous sections of this guide, starting with [Containerize Angular application](containerize.md). -- [Enable Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Enable Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-kubernetes) in Docker Desktop. > **New to Kubernetes?** > Visit the [Kubernetes basics tutorial](https://kubernetes.io/docs/tutorials/kubernetes-basics/) to get familiar with how clusters, pods, deployments, and services work. @@ -195,7 +195,7 @@ What you accomplished: Explore official references and best practices to sharpen your Kubernetes deployment workflow: - [Kubernetes documentation](https://kubernetes.io/docs/home/) – Learn about core concepts, workloads, services, and more. -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) – Use Docker Desktop’s built-in Kubernetes support for local testing and development. +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/kubernetes.md) – Use Docker Desktop’s built-in Kubernetes support for local testing and development. - [`kubectl` CLI reference](https://kubernetes.io/docs/reference/kubectl/) – Manage Kubernetes clusters from the command line. - [Kubernetes Deployment resource](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) – Understand how to manage and scale applications using Deployments. - [Kubernetes Service resource](https://kubernetes.io/docs/concepts/services-networking/service/) – Learn how to expose your application to internal and external traffic. \ No newline at end of file diff --git a/content/guides/bun/deploy.md b/content/guides/bun/deploy.md index 7a8690941ef..0093a908619 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](/manuals//desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals//desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) + - [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 e023bdd5b12..120067302ba 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/deno/deploy.md b/content/guides/deno/deploy.md index 447d7f4a85f..7e00828ec9f 100644 --- a/content/guides/deno/deploy.md +++ b/content/guides/deno/deploy.md @@ -11,7 +11,7 @@ aliases: ## Prerequisites - Complete all the previous sections of this guide, starting with [Containerize a Deno application](containerize.md). -- [Turn on Kubernetes](/manuals//desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals//desktop/use-desktop/kubernetes.md#enable-kubernetes) in Docker Desktop. ## Overview @@ -137,5 +137,5 @@ In this section, you learned how to use Docker Desktop to deploy your Deno appli Related information: - [Kubernetes documentation](https://kubernetes.io/docs/home/) - - [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) + - [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 837917a0bab..c97a4bfd4c7 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/golang/deploy.md b/content/guides/golang/deploy.md index 0b47f0ebc9c..f63703e5613 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 092998d20b8..663fe4fd71c 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 5c6ca2960b8..d3fa1017ac9 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 e6b96660db7..bd45d5ec017 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 b9289155939..5f562afb710 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-kubernetes) in Docker Desktop. ## Overview @@ -256,5 +256,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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 6aa8c4aba51..70c10b216fa 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/reactjs/deploy.md b/content/guides/reactjs/deploy.md index 86d25d3dbf4..c41b81f1e0a 100644 --- a/content/guides/reactjs/deploy.md +++ b/content/guides/reactjs/deploy.md @@ -11,7 +11,7 @@ description: Learn how to deploy locally to test and debug your Kubernetes deplo Before you begin, make sure you’ve completed the following: - Complete all the previous sections of this guide, starting with [Containerize React.js application](containerize.md). -- [Enable Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Enable Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-kubernetes) in Docker Desktop. > **New to Kubernetes?** > Visit the [Kubernetes basics tutorial](https://kubernetes.io/docs/tutorials/kubernetes-basics/) to get familiar with how clusters, pods, deployments, and services work. @@ -188,7 +188,7 @@ What you accomplished: Explore official references and best practices to sharpen your Kubernetes deployment workflow: - [Kubernetes documentation](https://kubernetes.io/docs/home/) – Learn about core concepts, workloads, services, and more. -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) – Use Docker Desktop’s built-in Kubernetes support for local testing and development. +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/kubernetes.md) – Use Docker Desktop’s built-in Kubernetes support for local testing and development. - [`kubectl` CLI reference](https://kubernetes.io/docs/reference/kubectl/) – Manage Kubernetes clusters from the command line. - [Kubernetes Deployment resource](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) – Understand how to manage and scale applications using Deployments. - [Kubernetes Service resource](https://kubernetes.io/docs/concepts/services-networking/service/) – Learn how to expose your application to internal and external traffic. \ No newline at end of file diff --git a/content/guides/ruby/deploy.md b/content/guides/ruby/deploy.md index 91d511d2d03..0fe06fb3bb7 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/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 ac48e760ace..7379b617410 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](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Turn on Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-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/features/kubernetes.md) +- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/use-desktop/kubernetes.md) - [Swarm mode overview](/manuals/engine/swarm/_index.md) diff --git a/content/guides/vuejs/deploy.md b/content/guides/vuejs/deploy.md index 64966133dac..92a8f4e9e9b 100644 --- a/content/guides/vuejs/deploy.md +++ b/content/guides/vuejs/deploy.md @@ -11,7 +11,7 @@ description: Learn how to deploy locally to test and debug your Kubernetes deplo Before you begin, make sure you’ve completed the following: - Complete all the previous sections of this guide, starting with [Containerize Vue.js application](containerize.md). -- [Enable Kubernetes](/manuals/desktop/features/kubernetes.md#install-and-turn-on-kubernetes) in Docker Desktop. +- [Enable Kubernetes](/manuals/desktop/use-desktop/kubernetes.md#enable-kubernetes) in Docker Desktop. > **New to Kubernetes?** > Visit the [Kubernetes basics tutorial](https://kubernetes.io/docs/tutorials/kubernetes-basics/) to get familiar with how clusters, pods, deployments, and services work. @@ -195,7 +195,7 @@ What you accomplished: Explore official references and best practices to sharpen your Kubernetes deployment workflow: - [Kubernetes documentation](https://kubernetes.io/docs/home/) – Learn about core concepts, workloads, services, and more. -- [Deploy on Kubernetes with Docker Desktop](/manuals/desktop/features/kubernetes.md) – Use Docker Desktop’s built-in Kubernetes support for local testing and development. +- [Deploy on Kubernetes with Docker Desktop](/manuals) – Use Docker Desktop’s built-in Kubernetes support for local testing and development. - [`kubectl` CLI reference](https://kubernetes.io/docs/reference/kubectl/) – Manage Kubernetes clusters from the command line. - [Kubernetes Deployment resource](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) – Understand how to manage and scale applications using Deployments. - [Kubernetes Service resource](https://kubernetes.io/docs/concepts/services-networking/service/) – Learn how to expose your application to internal and external traffic. \ No newline at end of file diff --git a/content/includes/deploy.md b/content/includes/deploy.md index 0512c4418de..22702a8684e 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](/manuals/desktop/features/kubernetes.md) 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/use-desktop/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 03202e0ee3b..8bd9d72d970 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](/manuals/desktop/features/kubernetes.md) in Docker Desktop. +> [integrated Kubernetes feature](/manuals/desktop/use-desktop/kubernetes.md) in Docker Desktop. diff --git a/content/manuals/desktop/_index.md b/content/manuals/desktop/_index.md index 9401832d9bb..e2eef9cdd08 100644 --- a/content/manuals/desktop/_index.md +++ b/content/manuals/desktop/_index.md @@ -21,7 +21,7 @@ grid: link: /desktop/use-desktop/ - title: Explore its key features description: | - Find information about [Docker VMM](/desktop/features/vmm/), [WSL](/desktop/features/wsl/), [deploying on Kubernetes](/desktop/features/kubernetes/), and more. + Find information about [Networking](/desktop/features/networking/), [Docker VMM](/desktop/features/vmm/), [WSL](/desktop/features/wsl/), and more. icon: category - title: View the release notes description: Find out about new features, improvements, and bug fixes. diff --git a/content/manuals/desktop/images/k8s-settings.png b/content/manuals/desktop/images/k8s-settings.png deleted file mode 100644 index aa8882b7647..00000000000 Binary files a/content/manuals/desktop/images/k8s-settings.png and /dev/null differ diff --git a/content/manuals/desktop/previous-versions/archive-mac.md b/content/manuals/desktop/previous-versions/archive-mac.md index 692afebd842..5de481dc4e0 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](/manuals/desktop/features/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/use-desktop/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 262e7c79339..3f6b0433cd3 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](/manuals/desktop/features/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/use-desktop/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 a5ee343fa87..ed7c1cef0f1 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](/manuals/desktop/features/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/use-desktop/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 c3edd29dc41..9c4ced0e43b 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-windows.md +++ b/content/manuals/desktop/previous-versions/edge-releases-windows.md @@ -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](/manuals/desktop/features/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/use-desktop/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 ee25705c0fc..b8c4c6792d8 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -331,7 +331,7 @@ We are aware of [CVE-2025-23266](https://nvd.nist.gov/vuln/detail/CVE-2025-23266 - Fixed an issue pulling images with zstd differential layers when the containerd image store is enabled. - Fixed a bug causing containers launching with the `--restart` flag to not restart properly when using Enhanced Container Isolation. -- Improved interaction between [Kubernetes custom registry images](/manuals/desktop/features/kubernetes.md#configuring-a-custom-image-registry-for-kubernetes-control-plane-images) and Enhanced Container Isolation (ECI), so the [ECI Docker Socket image list](/manuals/enterprise/security/hardened-desktop/enhanced-container-isolation/config.md) no longer needs to be manually updated when using a custom registry for Kubernetes control plane images. +- Improved interaction between [Kubernetes custom registry images](/manuals/desktop/use-desktop/kubernetes.md#configuring-a-custom-image-registry-for-kubernetes-control-plane-images) and Enhanced Container Isolation (ECI), so the [ECI Docker Socket image list](/manuals/enterprise/security/hardened-desktop/enhanced-container-isolation/config.md) no longer needs to be manually updated when using a custom registry for Kubernetes control plane images. - Fixed a bug where a Docker Desktop Kubernetes cluster in kind mode fails to start after restarting Docker Desktop if the user is required to be signed in but is currently signed out. - Fixed a bug that prevented the mounting of MCP secrets into containers when [Enhanced Container Isolation](/enterprise/security/hardened-desktop/enhanced-container-isolation/) is enabled. - Fixed a bug preventing the use of `--publish-all` when `--publish` was already specified. diff --git a/content/manuals/desktop/settings-and-maintenance/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md index a90501ece96..54535b5faa1 100644 --- a/content/manuals/desktop/settings-and-maintenance/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -427,9 +427,9 @@ You can only start and stop builders using the `docker-container` driver. Docker Desktop includes a standalone Kubernetes server, so that you can test deploying your Docker workloads on Kubernetes. To turn on Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, -select **Enable Kubernetes**. +select **Enable Kubernetes**. This can also be done from the **Kubernetes** view. -With Docker Desktop version 4.38 and later, you can choose your cluster provisioning method: +You can choose your cluster provisioning method: - **Kubeadm** creates a single-node cluster and the version is set by Docker Desktop. - **kind** creates a multi-node cluster and you can set the version and number of nodes. @@ -439,7 +439,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/features/kubernetes.md). +see [Explore the Kubernetes view](/manuals/desktop/use-desktop/kubernetes.md). ## Software updates diff --git a/content/manuals/desktop/troubleshoot-and-support/faqs/general.md b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md index 13c950c0ba5..192ccc7e122 100644 --- a/content/manuals/desktop/troubleshoot-and-support/faqs/general.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md @@ -27,7 +27,7 @@ This includes: - Viewing remote images in the Docker Dashboard - 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/features/kubernetes.md) (Images are download when you enable Kubernetes for the first time) +- [Kubernetes](/manuals/desktop/use-desktop/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 diff --git a/content/manuals/desktop/use-desktop/_index.md b/content/manuals/desktop/use-desktop/_index.md index b12be1c3ef6..791b64cfa35 100644 --- a/content/manuals/desktop/use-desktop/_index.md +++ b/content/manuals/desktop/use-desktop/_index.md @@ -12,7 +12,7 @@ When you open Docker Desktop, the Docker Desktop Dashboard displays. ![Docker Desktop Dashboard on Containers view](../images/dashboard.png) -It provides a centralized interface to manage your [containers](container.md), [images](images.md), [volumes](volumes.md), and [builds](builds.md). +It provides a centralized interface to manage your [containers](container.md), [images](images.md), [volumes](volumes.md), [builds](builds.md), and [Kubernetes resources](kubernetes.md). In addition, the Docker Desktop Dashboard lets you: diff --git a/content/manuals/desktop/features/kubernetes.md b/content/manuals/desktop/use-desktop/kubernetes.md similarity index 63% rename from content/manuals/desktop/features/kubernetes.md rename to content/manuals/desktop/use-desktop/kubernetes.md index c142b748590..ece85d88a8a 100644 --- a/content/manuals/desktop/features/kubernetes.md +++ b/content/manuals/desktop/use-desktop/kubernetes.md @@ -1,48 +1,46 @@ --- description: See how you can deploy to Kubernetes on Docker Desktop keywords: deploy, kubernetes, kubectl, orchestration, Docker Desktop -title: Deploy on Kubernetes with Docker Desktop -linkTitle: Deploy on Kubernetes +title: Explore the Kubernetes view +linkTitle: Kubernetes aliases: - /docker-for-windows/kubernetes/ - /docker-for-mac/kubernetes/ - /desktop/kubernetes/ -weight: 60 +- /desktop/features/kubernetes/ +weight: 50 --- Docker Desktop includes a standalone Kubernetes server and client, as well as Docker CLI integration, enabling local Kubernetes development and testing directly on your machine. -The Kubernetes server runs as a single or multi-node cluster, within Docker container(s). This lightweight setup helps you explore Kubernetes features, test workloads, and work with container orchestration in parallel with other Docker functionalities. +The Kubernetes server runs as a single or multi-node cluster, within Docker containers. This lightweight setup helps you explore Kubernetes features, test workloads, and work with container orchestration in parallel with other Docker features. -Kubernetes on Docker Desktop runs alongside other workloads, including Swarm services and standalone containers. +## Enable Kubernetes -![k8s settings](../images/k8s-settings.png) +With Docker Desktop version 4.51 and later, you can manage Kubernetes directly from the **Kubernetes** view in the Docker Desktop Dashboard. -## What happens when I enable Kubernetes in Docker Desktop? +1. Open the Docker Desktop Dashboard and select the **Kubernetes** view. +2. Select **Create cluster**. +3. Choose your cluster type: + - **Kubeadm** creates a single-node cluster and the version is set by Docker Desktop. + - **kind** creates a multi-node cluster and you can set the version and number of nodes. + For more detailed information on each cluster type, see [Cluster provisioining method](#cluster-provisioning-method). +4. Optional: Select **Show system containers (advanced)** to view internal containers when using Docker commands. +5. Select **Create**. -The following actions are triggered in the Docker Desktop backend and VM: +This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\resources\bin\kubectl.exe` (Windows). If you installed `kubectl` using Homebrew, or by some other method, and experience conflicts, remove `/usr/local/bin/kubectl`. + + > [!NOTE] + > + > Docker Desktop for Linux does not include `kubectl` by default. You can install it separately by following the [Kubernetes installation guide](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/). Ensure the `kubectl` binary is installed at `/usr/local/bin/kubectl`. + +The following actions are also triggered in the Docker Desktop backend and VM: - Generation of certificates and cluster configuration - Download and installation of Kubernetes internal components - Cluster bootup - Installation of additional controllers for networking and storage -Turning the Kubernetes server on or off in Docker Desktop does not affect your other workloads. - -## Install and turn on Kubernetes - -1. Open the Docker Desktop Dashboard and navigate to **Settings**. -2. Select the **Kubernetes** tab. -3. Toggle on **Enable Kubernetes**. -4. Choose your [cluster provisioning method](#cluster-provisioning-method). -5. Select **Apply** to save the settings. - -This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\resources\bin\kubectl.exe` (Windows). - - > [!NOTE] - > - > Docker Desktop for Linux does not include `kubectl` by default. You can install it separately by following the [Kubernetes installation guide](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/). Ensure the `kubectl` binary is installed at `/usr/local/bin/kubectl`. - When Kubernetes is enabled, its status is displayed in the Docker Desktop Dashboard footer and the Docker menu. You can check which version of Kubernetes you're on with: @@ -60,20 +58,14 @@ provisioners. version, it's slower to provision than `kind`, and it's not supported by [Enhanced Container Isolation](/manuals/enterprise/security/hardened-desktop/enhanced-container-isolation/index.md) (ECI), meaning that if ECI is enabled the cluster works but it's not protected by ECI. -`kind` is the newer provisioner, and it's available if you are signed in and are -using Docker Desktop version 4.38 or later. It supports multi-node clusters (for +`kind` is the newer provisioner. It supports multi-node clusters (for a more realistic Kubernetes setup), you can choose the Kubernetes version, it's -faster to provision than `kubeadm`, and it's supported by ECI (i.e., when ECI is +faster to provision than `kubeadm`, and it's supported by ECI - when ECI is enabled, the Kubernetes cluster runs in unprivileged Docker containers, thus -making it more secure). Note however that `kind` requires that Docker Desktop be -configured to use the [containerd image store](containerd.md) (the default image -store in Docker Desktop 4.34 and later). - -The following table summarizes this comparison. +making it more secure. | Feature | `kubeadm` | `kind` | | :------ | :-----: | :--: | -| Availability | Docker Desktop 4.0+ | Docker Desktop 4.38+ (requires sign in) | | Multi-node cluster support | No | Yes | | Kubernetes version selector | No | Yes | | Speed to provision | ~1 min | ~30 seconds | @@ -81,57 +73,53 @@ The following table summarizes this comparison. | Works with containerd image store | Yes | Yes | | Works with Docker image store | Yes | No | -## Using the kubectl command +## Dashboard view + +When a Kubernetes cluster is enabled, the **Kubernetes** view displays a live dashboard view showing: + +- A namespace selector at the top +- A real-time list of resources - pods, services, deployments - in the selected namespace +- Automatic updates when resources are created, deleted, or modified + +## Verify installation + +Confirm that your cluster is running: -Kubernetes integration automatically installs the Kubernetes CLI command -at `/usr/local/bin/kubectl` on Mac and at `C:\Program Files\Docker\Docker\Resources\bin\kubectl.exe` on Windows. This location may not be in your shell's `PATH` -variable, so you may need to type the full path of the command or add it to -the `PATH`. +```console +$ kubectl get nodes +NAME STATUS ROLES AGE VERSION +docker-desktop Ready control-plane 3h v1.29.1 +``` -If you have already installed `kubectl` and it is -pointing to some other environment, such as `minikube` or a Google Kubernetes Engine cluster, ensure you change the context so that `kubectl` is pointing to `docker-desktop`: +If kubectl is pointing to another environment, switch to the Docker Desktop context: ```console -$ kubectl config get-contexts $ kubectl config use-context docker-desktop ``` -> [!TIP] +>[!TIP] > -> If the `kubectl` config get-contexts command returns an empty result, try: +> If no contexts appear, try: > > - Running the command in the Command Prompt or PowerShell. > - Setting the `KUBECONFIG` environment variable to point to your `.kube/config` file. -### Verify installation - -To confirm that Kubernetes is running, list the available nodes: - -```console -$ kubectl get nodes -NAME STATUS ROLES AGE VERSION -docker-desktop Ready control-plane 3h v1.29.1 -``` - -If you installed `kubectl` using Homebrew, or by some other method, and -experience conflicts, remove `/usr/local/bin/kubectl`. For more information about `kubectl`, see the [`kubectl` documentation](https://kubernetes.io/docs/reference/kubectl/overview/). -## Upgrade your cluster - -Kubernetes clusters are not automatically upgraded with Docker Desktop updates. To upgrade the cluster, you must manually select **Reset Kubernetes Cluster** in settings. +## Edit or stop your cluster -## Additional settings +When Kubernetes is enabled: -### Viewing system containers +- Select **Edit cluster** to modify configuration. For example, switch between **kubeadm** and **kind**, or change the number of nodes. +- Select **Stop** to disable the cluster. Progress is displayed, and the **Kubernetes** view returns to the **Create cluster** screen. This stops and removes Kubernetes containers, and also removes the `/usr/local/bin/kubectl` command. -By default, Kubernetes system containers are hidden. To inspect these containers, enable **Show system containers (advanced)**. +## Upgrade your cluster -You can now view the running Kubernetes containers with `docker ps` or in the Docker Desktop Dashboard. +Kubernetes clusters are not automatically upgraded with Docker Desktop updates. To upgrade the cluster, you must manually select **Reset cluster** in the **Kubernetes** settings. -### Configuring a custom image registry for Kubernetes control plane images +## Configuring a custom image registry for Kubernetes control plane images Docker Desktop uses containers to run the Kubernetes control plane. By default, Docker Desktop pulls the associated container images from Docker Hub. The images pulled depend on the [cluster provisioning mode](#cluster-provisioning-method). @@ -187,25 +175,13 @@ also match what Docker Desktop expects. The recommended approach to set this up is the following: -1) Start Docker Desktop. - -2) In Settings > Kubernetes, enable the *Show system containers* setting. - -3) In Settings > Kubernetes, start Kubernetes using the desired cluster provisioning method: `kubeadm` or `kind`. - -4) Wait for Kubernetes to start. - -5) Use `docker ps` to view the container images used by Docker Desktop for the Kubernetes control plane. - -6) Clone or mirror those images (with matching tags) to your custom registry. - -7) Stop the Kubernetes cluster. - -8) Configure the `KubernetesImagesRepository` setting to point to your custom registry. - -9) Restart Docker Desktop. - -10) Verify that the Kubernetes cluster is using the custom registry images using the `docker ps` command. +1. Start Kubernetes using the desired cluster provisioning method: `kubeadm` or `kind`. +2. Once Kubernetes has started, use `docker ps` to view the container images used by Docker Desktop for the Kubernetes control plane. +3. Clone or mirror those images (with matching tags) to your custom registry. +4. Stop the Kubernetes cluster. +5. Configure the `KubernetesImagesRepository` setting to point to your custom registry. +6. Restart Docker Desktop. +7. Verify that the Kubernetes cluster is using the custom registry images using the `docker ps` command. > [!NOTE] > @@ -230,14 +206,5 @@ The recommended approach to set this up is the following: ```console $ kubectl config use-context docker-desktop ``` - You can then try checking the logs of the [Kubernetes system containers](#viewing-system-containers) if you have enabled that setting. + You can then try checking the logs of the Kubernetes system containers if you have enabled that setting. - If you're experiencing cluster issues after updating, reset your Kubernetes cluster. Resetting a Kubernetes cluster can help resolve issues by essentially reverting the cluster to a clean state, and clearing out misconfigurations, corrupted data, or stuck resources that may be causing problems. If the issue still persists, you may need to clean and purge data, and then restart Docker Desktop. - -## Turn off and uninstall Kubernetes - -To turn off Kubernetes in Docker Desktop: - -1. From the Docker Desktop Dashboard, select the **Settings** icon. -2. Select the **Kubernetes** tab. -3. Deselect the **Enable Kubernetes** checkbox. -4. Select **Apply** to save the settings. This stops and removes Kubernetes containers, and also removes the `/usr/local/bin/kubectl` command. diff --git a/content/manuals/desktop/use-desktop/pause.md b/content/manuals/desktop/use-desktop/pause.md index e7b882097f0..a51a826a4fa 100644 --- a/content/manuals/desktop/use-desktop/pause.md +++ b/content/manuals/desktop/use-desktop/pause.md @@ -2,7 +2,7 @@ description: understand what pausing Docker Desktop Dashboard means keywords: Docker Desktop Dashboard, manage, containers, gui, dashboard, pause, user manual title: Pause Docker Desktop -weight: 60 +weight: 70 --- Pausing Docker Desktop temporarily suspends the Linux VM running Docker Engine. This saves the current state of all containers in memory and freezes all running processes, significantly reducing CPU and memory usage which is helpful for conserving battery on laptops. diff --git a/content/manuals/desktop/use-desktop/resource-saver.md b/content/manuals/desktop/use-desktop/resource-saver.md index 10162288b35..03ce4070c87 100644 --- a/content/manuals/desktop/use-desktop/resource-saver.md +++ b/content/manuals/desktop/use-desktop/resource-saver.md @@ -3,7 +3,7 @@ description: Understand what Docker Desktop Resource Saver mode is and how to co keywords: Docker Dashboard, resource saver, manage, containers, gui, dashboard, user manual title: Docker Desktop's Resource Saver mode linkTitle: Resource Saver mode -weight: 50 +weight: 60 --- Resource Saver mode significantly reduces Docker diff --git a/content/manuals/dhi/how-to/helm.md b/content/manuals/dhi/how-to/helm.md index c4e3e951461..4b8f6a8f5f1 100644 --- a/content/manuals/dhi/how-to/helm.md +++ b/content/manuals/dhi/how-to/helm.md @@ -36,7 +36,7 @@ To follow along with this guide, you need: - A Kubernetes cluster set up and [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/) installed. To test locally, you can use Docker Desktop with Kubernetes enabled. For more information, see [Install Docker - Desktop](/desktop/install/windows-install/) and [Enable Kubernetes](/desktop/features/kubernetes/). + Desktop](/desktop/install/windows-install/) and [Enable Kubernetes](/desktop/use-desktop/kubernetes/). - Helm installed. For more information, see the [Helm installation guide](https://helm.sh/docs/intro/install/). - Access to DHI. For more information about starting a free trial, see [Get started with Docker Hardened Images](/dhi/get-started/). diff --git a/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md index 148bfe1f641..a1b03fdd2e6 100644 --- a/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md @@ -340,7 +340,7 @@ The following tables describe all available settings in the `admin-settings.json |Parameter|OS|Description|Version| |:-------------------------------|---|:-------------------------------|---| -|`kubernetes`| | If `enabled` is set to true, a Kubernetes single-node cluster is started when Docker Desktop starts. If `showSystemContainers` is set to true, Kubernetes containers are displayed in the Docker Desktop Dashboard and when you run `docker ps`. The [imagesRepository](../../../../desktop/features/kubernetes.md#configuring-a-custom-image-registry-for-kubernetes-control-plane-images) setting lets you specify which repository Docker Desktop pulls control-plane Kubernetes images from. | | +|`kubernetes`| | If `enabled` is set to true, a Kubernetes single-node cluster is started when Docker Desktop starts. If `showSystemContainers` is set to true, Kubernetes containers are displayed in the Docker Desktop Dashboard and when you run `docker ps`. The [imagesRepository](/manuals/desktop/use-desktop/kubernetes.md#configuring-a-custom-image-registry-for-kubernetes-control-plane-images) setting lets you specify which repository Docker Desktop pulls control-plane Kubernetes images from. | | > [!NOTE] >