Add Docker Desktop Overview topic (#10718)

* - Added a new Overview topic for Docker Desktop
- Moved Dashboard up one level and removed OS-specific topics and images from the Mac and Windows directories

* Updated the Desktop TOC
- Moved Install topics above Getting started topic
- Moved Open source licensing up one level
- Removed OS-specific topics

* Fix review comments

_data/toc.yaml

@@ -1116,14 +1116,14 @@ manuals:
     title: Docker Compose release notes
 - sectiontitle: Docker Desktop
   section:
+  - path: /desktop/
+    title: Overview
   - sectiontitle: Mac
     section:
-    - path: /docker-for-mac/
-      title: Getting started
     - path: /docker-for-mac/install/
       title: Install Docker Desktop for Mac
-    - path: /docker-for-mac/dashboard/
-      title: Dashboard
+    - path: /docker-for-mac/
+      title: Getting started
     - path: /docker-for-mac/kubernetes/
       title: Deploy on Kubernetes
     - path: /docker-for-mac/docker-toolbox/
@@ -1142,20 +1142,16 @@ manuals:
       title: Logs and troubleshooting
     - path: /docker-for-mac/faqs/
       title: FAQs
-    - path: /docker-for-mac/opensource/
-      title: Open source licensing
     - path: /docker-for-mac/release-notes/
       title: Stable release notes
     - path: /docker-for-mac/edge-release-notes/
       title: Edge release notes
   - sectiontitle: Windows
     section:
-    - path: /docker-for-windows/
-      title: Getting started
     - path: /docker-for-windows/install/
       title: Install Docker Desktop for Windows
-    - path: /docker-for-windows/dashboard/
-      title: Dashboard
+    - path: /docker-for-windows/
+      title: Getting started
     - path: /docker-for-windows/kubernetes/
       title: Deploy on Kubernetes
     - path: /docker-for-windows/networking/
@@ -1166,14 +1162,16 @@ manuals:
       title: Logs and troubleshooting
     - path: /docker-for-windows/faqs/
       title: FAQs
-    - path: /docker-for-windows/opensource/
-      title: Open source licensing
     - path: /docker-for-windows/release-notes/
       title: Stable release notes
     - path: /docker-for-windows/edge-release-notes/
       title: Edge release notes
     - path: /docker-for-windows/wsl-tech-preview/
       title: Docker Desktop WSL 2 backend
+  - path: /desktop/dashboard/
+    title: Dashboard
+  - path: /desktop/opensource/
+    title: Open source licensing
 - sectiontitle: Docker Hub
   section:
   - path: /docker-hub/

desktop/dashboard.md

@@ -2,6 +2,9 @@
 description: Docker Desktop Dashboard
 keywords: Docker Desktop Dashboard, container view
 title: Docker Desktop Dashboard
+redirect_from:
+- /docker-for-mac/dashboard/
+- /docker-for-windows/dashboard/
 ---
 
 The Docker Desktop Dashboard provides a simple interface that enables you to interact with containers and applications, and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their status. It provides an intuitive interface to perform common actions to inspect, interact with, and manage your Docker objects including containers and Docker Compose-based applications.
@@ -16,9 +19,9 @@ The Docker Desktop Dashboard offers the following benefits:
 
 In addition, the Dashboard UI allows you to:
 
-- Navigate to the [Settings](index.md#preferences) menu to configure Docker Desktop preferences
-- Access the [Troubleshoot](troubleshoot.md) menu to debug and perform restart operations
-- Sign into [Docker Hub](index.md#docker-hub) using your Docker ID
+- Navigate to the **Preferences** (**Settings** in Windows) menu to configure Docker Desktop preferences
+- Access the **Troubleshoot** menu to debug and perform restart operations
+- Sign into [Docker Hub](https://hub.docker.com/) using your Docker ID
 
 To access the Docker Desktop Dashboard, from the Docker menu, select **Dashboard**. The Dashboard provides a runtime view of all your containers and applications.
 
@@ -44,7 +47,7 @@ This creates a new Redis container. From the Docker menu, select **Dashboard** t
 
 Now, let us start a sample application. You can download the [Example voting app](https://github.com/dockersamples/example-voting-app) from the Docker samples page. The example voting app is a distributed application that runs across multiple Docker containers.
 
-![Example voting app architecture diagram](../docker-for-windows/images/example-app-architecture.png){:width="600px"}
+![Example voting app architecture diagram](images/example-app-architecture.png){:width="600px"}
 
 The example voting app contains:
 
@@ -128,4 +131,4 @@ Click **Port** to open the port exposed by the container in a browser.
 
 ## Feedback
 
-We would like to hear from you about the new Dashboard UI. Let us know your feedback by creating an issue in the [docker/for-mac](https://github.com/docker/for-mac/issues) GitHub repository.
+We would like to hear from you about the new Dashboard UI. Let us know your feedback by creating an issue in the [docker/for-mac](https://github.com/docker/for-mac/issues) or [docker/for-win](https://github.com/docker/for-win/issues) GitHub repository.

desktop/index.md

@@ -0,0 +1,57 @@
+---
+description: Docker Desktop overview
+keywords: Desktop, Docker, GUI, run, docker, local, machine
+title: Docker Desktop overview
+toc_min: 1
+toc_max: 2
+---
+
+Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes [Docker Engine](../engine/), Docker CLI client, [Docker Compose](../compose/), [Notary](../notary/getting_started/), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
+
+Docker Desktop works with your choice of development tools and languages and gives you access to a vast library of certified images and templates in [Docker Hub](https://hub.docker.com/). This enables development teams to extend their environment to rapidly auto-build, continuously integrate and collaborate using a secure repository.
+
+Some of the key features of Docker Desktop include:
+
+* Ability to containerize and share any application on any cloud platform, in multiple languages and frameworks
+* Easy installation and setup of a complete Docker development environment
+* Includes the latest version of Kubernetes
+* Automatic updates to keep you up to date and secure
+* On Windows, the ability to toggle between Linux and Windows Server environments to build applications
+* Fast and reliable performance with native Windows Hyper-V virtualization
+* Ability to work natively on Linux through WSL 2 on Windows machines
+* Volume mounting for code and data, including file change notifications and easy access to running containers on the localhost network
+* In-container development and debugging with supported IDEs
+
+## Download and install
+
+Docker Desktop is available for Mac and Windows. For download information, system requirements, and installation instructions, see:
+
+* [Install Docker Desktop on Mac](../docker-for-mac/install.md)
+* [Install Docker Desktop on Windows](../docker-for-windows/install.md)
+
+## Get started
+
+For information on how to get to get started with Docker Desktop and to learn about various UI options and their usage, see:
+
+* [Get started with Docker Desktop on Mac](../docker-for-mac/index.md)
+* [Get started with Docker Desktop on Windows](../docker-for-windows/index.md)
+
+## Stable and Edge versions
+
+Docker Desktop offers Stable and Edge download channels.
+
+The Stable release provides a general availability release-ready installer for a fully baked and tested, more reliable app. The Stable version of Docker Desktop includes the latest released version of Docker Engine. The release schedule is synced every three months for major releases, with patch releases to fix minor issues, and to stay up to date with Docker Engine as required. You can choose to opt out of the usage statistics and telemetry data on the Stable channel.
+
+Docker Desktop Edge release is our preview version. It offers an installer with the latest features and comes with the experimental features turned on. When using the Edge release, bugs, crashes, and issues can occur as the new features may not be fully tested. However, you get a chance to preview new functionality, experiment, and provide feedback as Docker Desktop evolves. Edge releases are typically more frequent than Stable releases. Telemetry data and usage statistics are sent by default on the Edge version.
+
+## Release notes
+
+For information about new features, improvements, and bug fixes in Docker Desktop Stable releases, see:
+
+* [Docker Desktop for Mac Stable Release notes](../docker-for-mac/release-notes.md)
+* [Docker Desktop for Windows Stable Release notes](../docker-for-windows/release-notes.md)
+
+For information about new features, improvements, and bug fixes in Docker Desktop Edge releases, see:
+
+* [Docker Desktop for Mac Edge Release notes](../docker-for-mac/edge-release-notes.md)
+* [Docker Desktop for Windows Edge Release notes](../docker-for-windows/edge-release-notes.md)

desktop/opensource.md

@@ -3,6 +3,9 @@ description: Docker's use of Open Source
 keywords: docker, opensource
 title: Open source components and licensing
 notoc: true
+redirect_from:
+- /docker-for-mac/opensource/
+- /docker-for-windows/opensource/
 ---
 
 Docker Desktop is built using open source software. For information about the

docker-for-mac/opensource.md

@@ -1,21 +0,0 @@
----
-description: Docker's use of Open Source
-keywords: docker, opensource
-title: Open source components and licensing
-notoc: true
----
-
-Docker Desktop Editions are built using open source software.
-For details on the licensing, choose
-![whale menu](images/whale-x.png){: .inline} →
-**About Docker** from within the application, then click **Acknowledgements**.
-
-Docker Desktop Editions distribute some components that are licensed under the
-GNU General Public License. You can download the source for these components
-[here](https://download.docker.com/opensource/License.tar.gz).
-
-The sources for `qemu-img` can be obtained
-[here](http://wiki.qemu-project.org/download/qemu-2.4.1.tar.bz2). The sources
-for the `gettext` and `glib` libraries that `qemu-img` requires were obtained
-from [Homebrew](https://brew.sh) and may be retrieved using `brew install
---build-from-source gettext glib`.

docker-for-windows/dashboard.md

@@ -1,131 +0,0 @@
----
-description: Docker Desktop Dashboard
-keywords: Docker Desktop Dashboard, container view
-title: Docker Desktop Dashboard
----
-
-The Docker Desktop Dashboard provides a simple interface that enables you to interact with containers and applications, and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their status. It provides an intuitive interface to perform common actions to inspect, interact with, and manage your Docker objects including containers and Docker Compose-based applications.
-
-The Docker Desktop Dashboard offers the following benefits:
-
-- A GUI to abstract core information from the CLI
-- Access to container logs directly in the UI to search and explore container behavior
-- Access to combined Compose logs from the UI to understand Compose applications
-- Quick visibility into ports being used by containers
-- Monitor container resource utilization
-
-In addition, the Dashboard UI allows you to:
-
-- Navigate to the [Settings](index.md#docker-settings-dialog) menu to configure Docker Desktop preferences
-- Access the [Troubleshoot](troubleshoot.md) menu to debug and perform restart operations
-- Sign into [Docker Hub](index.md#docker-hub) using your Docker ID
-
-To access the Docker Desktop Dashboard, from the Docker menu, select **Dashboard**. The Dashboard provides a runtime view of all your containers and applications.
-
-![Docker Desktop Dashboard](images/dashboard-settings.png)
-
-## Explore running containers and applications
-
-From the Docker menu, select **Dashboard**. This lists all your running containers and applications. Note that you must have running containers and applications to see them listed on the Docker Desktop Dashboard.
-
-The following sections guide you through the process of creating a sample Redis container and a sample application to demonstrate the core functionalities in Docker Desktop Dashboard.
-
-### Start a Redis container
-
-To start a Redis container, open your preferred CLI and run the following command:
-
-`docker run -dt redis`
-
-This creates a new Redis container. From the Docker menu, select **Dashboard** to see the new Redis container.
-
-![Redis container](images/redis-container.png){:width="700px"}
-
-### Start a sample application
-
-Now, let us start a sample application. You can download the [Example voting app](https://github.com/dockersamples/example-voting-app) from the Docker samples page. The example voting app is a distributed application that runs across multiple Docker containers.
-
-![Example voting app architecture diagram](images/example-app-architecture.png){:width="600px"}
-
-The example voting application contains:
-
-- A front-end web app in [Python](https://github.com/dockersamples/example-voting-app/blob/master/vote) or [ASP.NET Core](https://github.com/dockersamples/example-voting-app/blob/master/vote/dotnet) which lets you vote between two options
-- A [Redis](https://hub.docker.com/_/redis/) or [NATS](https://hub.docker.com/_/nats/) queue which collects new votes
-- A [.NET Core](https://github.com/dockersamples/example-voting-app/blob/master/worker/src/Worker), [Java](https://github.com/dockersamples/example-voting-app/blob/master/worker/src/main) or [.NET Core 2.1](https://github.com/dockersamples/example-voting-app/blob/master/worker/dotnet) worker which consumes votes and stores them
-- A [Postgres](https://hub.docker.com/_/postgres/) or [TiDB](https://hub.docker.com/r/dockersamples/tidb/tags/) database backed by a Docker volume
-- A [Node.js](https://github.com/dockersamples/example-voting-app/blob/master/result) or [ASP.NET Core SignalR](https://github.com/dockersamples/example-voting-app/blob/master/result/dotnet) web app which shows the results of the voting in real time
-
-To start the application, navigate to the directory containing the example voting application in the CLI and run `docker-compose up --build`.
-
-```
-$ docker-compose up --build
-Creating network "example-voting-app-master_front-tier" with the default driver
-Creating network "example-voting-app-master_back-tier" with the default driver
-Creating volume "example-voting-app-master_db-data" with default driver
-Building vote
-Step 1/7 : FROM python:2.7-alpine
-2.7-alpine: Pulling from library/python
-Digest: sha256:d2cc8451e799d4a75819661329ea6e0d3e13b3dadd56420e25fcb8601ff6ba49
-Status: Downloaded newer image for python:2.7-alpine
- ---> 1bf48bb21060
-Step 2/7 : WORKDIR /app
- ---> Running in 7a6a0c9d8b61
-Removing intermediate container 7a6a0c9d8b61
- ---> b1242f3c6d0c
-Step 3/7 : ADD requirements.txt /app/requirements.txt
- ---> 0f5d69b65243
-Step 4/7 : RUN pip install -r requirements.txt
- ---> Running in 92788dc9d682
-
-...
-Successfully built 69da1319c6ce
-Successfully tagged example-voting-app-master_worker:latest
-Creating example-voting-app-master_vote_1   ... done
-Creating example-voting-app-master_result_1 ... done
-Creating db                                 ... done
-Creating redis                              ... done
-Creating example-voting-app-master_worker_1 ... done
-Attaching to db, redis, example-voting-app-master_result_1, example-voting-app-master_vote_1, example-voting-app-master_worker_1
-...
-```
-
-When the application successfully starts, from the Docker menu, select **Dashboard** to see the example voting application. Expand the application to see the containers running inside the application.
-
-![App Dashboard view](images/app-dashboard-view.png){:width="700px"}
-
-Now that you can see the list of running containers and applications on the Dashboard, let us explore some of the actions you can perform:
-
-- Click **Port** to open the port exposed by the container in a browser.
-- Click **CLI** to open a terminal and run commands on the container.
-- Click **Stop**, **Start**, **Restart**, or **Delete** to perform lifecycle operations on the container.
-
-Use the **Search** option to search for a specific object. You can also sort your containers and applications using various options. Click the **Sort by** drop-down to see a list of available options.
-
-## Interact with containers and applications
-
-From the Docker Desktop Dashboard, select the example voting application we started earlier.
-
-The **application view** lists all the containers running on the application and contains a detailed logs view. It also allows you to start, stop, or delete the application.
-
-Hover over the containers to see some of the core actions you can perform. Use the **Search** option at the bottom to search the application logs for specific events, or select the **Copy** icon to copy the logs to your clipboard.
-
-![Application view](images/application-view.png){:width="700px"}
-
-Click on a specific container for detailed information about the container. The **container view** displays **Logs**, **Inspect**, and **Stats** tabs and provides quick action buttons to perform various actions.
-
-![Explore the app](images/container-view.png){:width="700px"}
-
-- Select **Logs** to see logs from the container. You can also search the logs for specific events and copy the logs to your clipboard.
-
-- Select **Inspect** to view low-level information about the container. You can see the local path, version number of the image, SHA-256, port mapping, and other details.
-
-- Select **Stats** to view information about the container resource utilization. You can see the amount of CPU, disk I/O, memory, and network I/O used by the container.
-
-You can also use the quick action buttons on the top bar to perform common actions such as opening a CLI to run commands in a container, and perform lifecycle operations such as stop, start, restart, or delete your container.
-
-Click **Port** to open the port exposed by the container in a browser.
-
-![Spring app browser view](images/app-browser-view.png){:width="700px"}
-
-## Feedback
-
-We would like to hear from you about the new Dashboard UI. Let us know your feedback by creating an issue in the [docker/for-win](https://github.com/docker/for-win/issues) GitHub repository.