From d5a7305811b60368bd0e2eda7b4cc563d80b3869 Mon Sep 17 00:00:00 2001 From: Daniel Helfand Date: Thu, 12 Aug 2021 11:56:31 -0500 Subject: [PATCH 1/7] fix broken link for setting up local registry with auth --- registry/deploying.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry/deploying.md b/registry/deploying.md index c56277c75e..f9e77d4f9b 100644 --- a/registry/deploying.md +++ b/registry/deploying.md @@ -398,7 +398,7 @@ secrets. > **Warning**: > You **cannot** use authentication with authentication schemes that send > credentials as clear text. You must -> [configure TLS first](deploying.md#running-a-domain-registry) for +> [configure TLS first](deploying.md#run-an-externally-accessible-registry) for > authentication to work. {:.warning} From d0bf342e524abf4ed032e618e69d73db6163664c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 14 Aug 2021 12:52:39 +0200 Subject: [PATCH 2/7] Desktop: move "docker-for-mac" to "desktop/mac" Unifying all content related to Docker Desktop to be withing the desktop directory. Signed-off-by: Sebastiaan van Stijn --- _data/glossary.yaml | 2 +- _data/redirects.csv | 2 +- _data/toc.yaml | 16 ++++++------ _includes/desktop-update.md | 2 +- _layouts/landing.html | 6 ++--- cloud/aci-integration.md | 2 +- cloud/ecs-integration.md | 2 +- compose/cli-command.md | 4 +-- compose/gettingstarted.md | 2 +- compose/install.md | 2 +- compose/release-notes.md | 2 +- desktop/backup-and-restore.md | 2 +- desktop/dev-environments.md | 18 +++++++------- desktop/faqs.md | 16 ++++++------ desktop/index.md | 6 ++--- {docker-for-mac => desktop/mac}/Makefile | 0 .../mac}/apple-silicon.md | 3 ++- .../mac}/edge-release-notes.md | 8 +++--- .../mac}/images/changelog-placeholder.png | Bin .../mac}/images/console.png | Bin .../mac}/images/desktop-mac-2fa.png | Bin .../mac}/images/diagnose-support.png | Bin .../mac}/images/docker-app-drag.png | Bin .../mac}/images/docker-app-in-apps.png | Bin .../mac}/images/docker-tutorial-mac.png | Bin .../mac}/images/hello-world-nginx.png | Bin .../mac}/images/localhost-arm.png | Bin .../mac}/images/menu/prefs-advanced.png | Bin .../mac}/images/menu/prefs-general.png | Bin .../mac}/images/menu/prefs.png | Bin .../mac}/images/menu/troubleshoot.png | Bin .../mac}/images/proxy-settings.png | Bin .../mac}/images/snooze-update.png | Bin .../mac}/images/whale-in-menu-bar.png | Bin .../mac}/images/whale-x.png | Bin {docker-for-mac => desktop/mac}/index.md | 19 ++++++++------- {docker-for-mac => desktop/mac}/install.md | 14 ++++++----- {docker-for-mac => desktop/mac}/networking.md | 3 ++- .../mac}/previous-versions.md | 8 +++--- .../mac}/release-notes.md | 23 +++++++++--------- {docker-for-mac => desktop/mac}/space.md | 2 ++ .../mac}/troubleshoot.md | 11 +++++---- desktop/opensource.md | 2 +- docker-for-windows/troubleshoot.md | 2 +- engine/breaking_changes.md | 6 ++--- engine/install/index.md | 4 +-- engine/swarm/swarm-tutorial/index.md | 2 +- get-docker.md | 4 +-- get-started/index.md | 7 +++--- go/apple-silicon.md | 2 +- machine/get-started.md | 2 +- machine/index.md | 4 +-- machine/install-machine.md | 2 +- registry/insecure.md | 2 +- release-notes/index.md | 10 ++++---- samples/aspnet-mssql-compose.md | 4 +-- toolbox/index.md | 4 +-- 57 files changed, 121 insertions(+), 111 deletions(-) rename {docker-for-mac => desktop/mac}/Makefile (100%) rename {docker-for-mac => desktop/mac}/apple-silicon.md (92%) rename {docker-for-mac => desktop/mac}/edge-release-notes.md (99%) rename {docker-for-mac => desktop/mac}/images/changelog-placeholder.png (100%) rename {docker-for-mac => desktop/mac}/images/console.png (100%) rename {docker-for-mac => desktop/mac}/images/desktop-mac-2fa.png (100%) rename {docker-for-mac => desktop/mac}/images/diagnose-support.png (100%) rename {docker-for-mac => desktop/mac}/images/docker-app-drag.png (100%) rename {docker-for-mac => desktop/mac}/images/docker-app-in-apps.png (100%) rename {docker-for-mac => desktop/mac}/images/docker-tutorial-mac.png (100%) rename {docker-for-mac => desktop/mac}/images/hello-world-nginx.png (100%) rename {docker-for-mac => desktop/mac}/images/localhost-arm.png (100%) rename {docker-for-mac => desktop/mac}/images/menu/prefs-advanced.png (100%) rename {docker-for-mac => desktop/mac}/images/menu/prefs-general.png (100%) rename {docker-for-mac => desktop/mac}/images/menu/prefs.png (100%) rename {docker-for-mac => desktop/mac}/images/menu/troubleshoot.png (100%) rename {docker-for-mac => desktop/mac}/images/proxy-settings.png (100%) rename {docker-for-mac => desktop/mac}/images/snooze-update.png (100%) rename {docker-for-mac => desktop/mac}/images/whale-in-menu-bar.png (100%) rename {docker-for-mac => desktop/mac}/images/whale-x.png (100%) rename {docker-for-mac => desktop/mac}/index.md (96%) rename {docker-for-mac => desktop/mac}/install.md (89%) rename {docker-for-mac => desktop/mac}/networking.md (97%) rename {docker-for-mac => desktop/mac}/previous-versions.md (99%) rename {docker-for-mac => desktop/mac}/release-notes.md (89%) rename {docker-for-mac => desktop/mac}/space.md (98%) rename {docker-for-mac => desktop/mac}/troubleshoot.md (98%) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 0119bc7213..32f7f8e955 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -71,7 +71,7 @@ Docker: | - The docker daemon process running on the host which manages images and containers (also called Docker Engine) Docker Desktop for Mac: | - [Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight + [Docker Desktop for Mac](/desktop/mac/) is an easy-to-install, lightweight Docker development environment designed specifically for the Mac. A native Mac application, Docker Desktop for Mac uses the macOS Hypervisor framework, networking, and filesystem. It's the best solution if you want diff --git a/_data/redirects.csv b/_data/redirects.csv index 3d6af48cf6..938be461b4 100644 --- a/_data/redirects.csv +++ b/_data/redirects.csv @@ -2,7 +2,7 @@ source,destination /engine/quickstart/,/get-started/ /engine/containers/,/engine/tutorials/ /win/,/docker-for-windows/ -/mac/,/docker-for-mac/ +/mac/,/desktop/mac/ /linux/,/engine/ /article-img/,/engine/article-img/ /articles/,/engine/articles/ diff --git a/_data/toc.yaml b/_data/toc.yaml index bc80072f32..77d67fda0b 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1186,21 +1186,21 @@ manuals: title: Overview - sectiontitle: Mac section: - - path: /docker-for-mac/install/ + - path: /desktop/mac/install/ title: Install Docker Desktop for Mac - - path: /docker-for-mac/ + - path: /desktop/mac/ title: User manual - - path: /docker-for-mac/networking/ + - path: /desktop/mac/networking/ title: Networking - - path: /docker-for-mac/space/ + - path: /desktop/mac/space/ title: Disk utilization - - path: /docker-for-mac/troubleshoot/ + - path: /desktop/mac/troubleshoot/ title: Logs and troubleshooting - - path: /docker-for-mac/apple-silicon/ + - path: /desktop/mac/apple-silicon/ title: Apple silicon - - path: /docker-for-mac/release-notes/ + - path: /desktop/mac/release-notes/ title: Release notes - - path: /docker-for-mac/previous-versions/ + - path: /desktop/mac/previous-versions/ title: Previous versions - sectiontitle: Windows section: diff --git a/_includes/desktop-update.md b/_includes/desktop-update.md index 526fa7b7b9..2bd1419002 100644 --- a/_includes/desktop-update.md +++ b/_includes/desktop-update.md @@ -4,6 +4,6 @@ Starting with Docker Desktop 3.0.0, updates to Docker Desktop will be available > To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option. -![Snooze update](../../docker-for-mac/images/snooze-update.png){:width="500px"} +![Snooze update](/desktop/mac/images/snooze-update.png){:width="500px"} Click **Download update** When you are ready to download the update. This downloads the update in the background. After downloading the update, click **Update and restart** from the Docker menu. This installs the latest update and restarts Docker Desktop for the changes to take effect. diff --git a/_layouts/landing.html b/_layouts/landing.html index 348651f96b..3f76cdc93f 100644 --- a/_layouts/landing.html +++ b/_layouts/landing.html @@ -214,7 +214,7 @@

- + What are the system requirements for Docker Desktop?

@@ -232,12 +232,12 @@
Popular articles

Docker Desktop WSL 2 backend

-

Install Docker Desktop on Mac

+

Install Docker Desktop on Mac

Docker Desktop Dashboard

Deploy on Kubernetes

Release notes

Logs and troubleshooting

-

Networking features in Docker Desktop

+

Networking features in Docker Desktop

diff --git a/cloud/aci-integration.md b/cloud/aci-integration.md index bb5566bfea..531bd4fa04 100644 --- a/cloud/aci-integration.md +++ b/cloud/aci-integration.md @@ -26,7 +26,7 @@ To deploy Docker containers on Azure, you must meet the following requirements: 1. Download and install the latest version of Docker Desktop. - - [Download for Mac](../docker-for-mac/install.md) + - [Download for Mac](../desktop/mac/install.md) - [Download for Windows](../docker-for-windows/install.md) Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux). diff --git a/cloud/ecs-integration.md b/cloud/ecs-integration.md index 1a06c6a7fd..2cbcfc122b 100644 --- a/cloud/ecs-integration.md +++ b/cloud/ecs-integration.md @@ -25,7 +25,7 @@ To deploy Docker containers on ECS, you must meet the following requirements: 1. Download and install the latest version of Docker Desktop. - - [Download for Mac](../docker-for-mac/install.md) + - [Download for Mac](../desktop/mac/install.md) - [Download for Windows](../docker-for-windows/install.md) Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux). diff --git a/compose/cli-command.md b/compose/cli-command.md index 47c645e7a0..3caa12a192 100644 --- a/compose/cli-command.md +++ b/compose/cli-command.md @@ -28,7 +28,7 @@ Introduction of the [Compose specification](https://github.com/compose-spec/comp 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. This allows us to include community proposals, experimental implementations by the Docker CLI and/or Engine, and deliver features faster to users. Compose V2 also supports some of the newer additions to the Compose specification, such as [profiles](profiles.md) and [GPU](gpu-support.md) devices. -Additionally, Compose V2 also supports [Apple silicon](../docker-for-mac/apple-silicon.md). +Additionally, Compose V2 also supports [Apple silicon](../desktop/mac/apple-silicon.md). For more information about the flags that are supported in the new compose command, see the [docker-compose compatibility list](cli-command-compatibility.md). @@ -46,7 +46,7 @@ We will progressively turn Docker Compose V2 on automatically for Docker Desktop For Docker Desktop installation instructions, see: -- [Install Docker Desktop on Mac](../docker-for-mac/install.md) +- [Install Docker Desktop on Mac](../desktop/mac/install.md) - [Install Docker Desktop on Windows](../docker-for-windows/install.md) To disable Docker Compose V2 using Docker Desktop: diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md index d4cc4324a6..6edc43c9a9 100644 --- a/compose/gettingstarted.md +++ b/compose/gettingstarted.md @@ -277,7 +277,7 @@ mount is denied, or a service cannot start, try enabling file or drive sharing. Volume mounting requires shared drives for projects that live outside of `C:\Users` (Windows) or `/Users` (Mac), and is required for _any_ project on Docker Desktop for Windows that uses [Linux containers](../docker-for-windows/index.md#switch-between-windows-and-linux-containers). -For more information, see [File sharing](../docker-for-mac/index.md#file-sharing) on Docker +For more information, see [File sharing](../desktop/mac/index.md#file-sharing) on Docker for Mac, and the general examples on how to > [Manage data in containers](../storage/volumes.md). > diff --git a/compose/install.md b/compose/install.md index 7e4df68924..f4090f1a8e 100644 --- a/compose/install.md +++ b/compose/install.md @@ -54,7 +54,7 @@ Python package manager or installing Compose as a container. **Docker Desktop for Mac** includes Compose along with other Docker apps, so Mac users do not need to install Compose separately. -For installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md). +For installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md).
diff --git a/compose/release-notes.md b/compose/release-notes.md index 85d963cb95..c8f5dd4087 100644 --- a/compose/release-notes.md +++ b/compose/release-notes.md @@ -2412,7 +2412,7 @@ The highlights: This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode. - - Fig can be used with the [official Docker OS X installer](../docker-for-mac/install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected. + - Fig can be used with the [official Docker OS X installer](../desktop/mac/install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected. - Fig supports Docker 1.3. diff --git a/desktop/backup-and-restore.md b/desktop/backup-and-restore.md index 769b7292b8..a29dd74fec 100644 --- a/desktop/backup-and-restore.md +++ b/desktop/backup-and-restore.md @@ -53,7 +53,7 @@ computer. After backing up your data, you can uninstall the current version of Docker Desktop and install a different version ([Windows](../docker-for-windows/install.md) -[macOS](../docker-for-mac/install.md), or reset Docker Desktop to factory defaults. +[macOS](mac/install.md), or reset Docker Desktop to factory defaults. ## Restore your data diff --git a/desktop/dev-environments.md b/desktop/dev-environments.md index e07daaeaa1..ea27497a10 100644 --- a/desktop/dev-environments.md +++ b/desktop/dev-environments.md @@ -16,14 +16,14 @@ Dev Environments also allow you to switch between your developer environments or To access Dev Environments, from the Docker menu, select **Dashboard** > **Dev Environments**. -![Dev environment intro](/images/dev-env-create.png){:width="700px"} +![Dev environment intro](images/dev-env-create.png){:width="700px"} ## Prerequisites Dev Environments are available as part of Docker Desktop 3.5.0 release. Download and install **Docker Desktop 3.5.0** or higher: -- [Mac](https://docs.docker.com/docker-for-mac/release-notes/) -- [Windows](https://docs.docker.com/docker-for-windows/release-notes/) +- [Mac](mac/release-notes.md) +- [Windows](../docker-for-windows/release-notes.md) To get started with Dev Environments, you must have the following tools and extension installed on your machine: @@ -41,7 +41,7 @@ If you have already installed Git, and it's not detected properly, run the follo If it doesn't detect Git as a valid command, you must reinstall Git and ensure you choose the option **Git from the command line...** or the **Use Git and optional Unix tools...** on the **Adjusting your PATH environment** step. -![Windows add Git to path](/images/dev-env-gitbash.png){:width="300px"} +![Windows add Git to path](images/dev-env-gitbash.png){:width="300px"} ## Start a single container Dev Environment @@ -56,7 +56,7 @@ The simplest way to get started with Dev Environments is to create a new environ This clones the Git code inside a volume, determines the best image for your Dev Environment, and finally, opens VS Code inside the Dev Environment container. -![Single container Dev environment](/images/dev-env-container.png){:width="700px"} +![Single container Dev environment](images/dev-env-container.png){:width="700px"} In the above example, the names `amazing_mclaren` and `stoic_carver` are randomly generated. You'll most likely see different names when you create your Dev Environment. @@ -64,7 +64,7 @@ Hover over the container and click **Open in VS Code** to start working in VS Co You can launch the application by running the command `make run` in your VS Code terminal. This opens an http server on port 8080. Open [http://localhost:8080](http://localhost:8080) in your browser to see the running application. -![Single container Dev environment](/images/dev-env-localhost.png){:width="700px"} +![Single container Dev environment](images/dev-env-localhost.png){:width="700px"} ### Create a Dev Environment from a specific branch or tag @@ -90,11 +90,11 @@ Let's summarize the tasks we performed so far to start a single container Dev En If you are a member of the Docker [Team plan](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}, you can now share you Dev Environment with your team. When you are ready to share your environment, just click the **Share** button and specify the Docker Hub namespace where you'd like to push your Dev Environment to. -![Share a Dev environment](/images/dev-env-share.png){:width="700px"} +![Share a Dev environment](images/dev-env-share.png){:width="700px"} This creates a Docker image of your dev environment, uploads it to the Docker Hub namespace you have specified in the previous step, and provides a tiny URL which you can use to share your work with your team members. -![Dev environment shared](/images/dev-env-shared.png){:width="700px"} +![Dev environment shared](images/dev-env-shared.png){:width="700px"} Your team members need to open the **Create** dialog, select the **Existing Dev Environment** tab, and then paste the URL. Your Dev Environment now starts in the exact same state as you shared it. @@ -116,7 +116,7 @@ You can also use Dev Environments to collaborate on any Docker Compose-based pro - Creates volumes and networks - Starts the Compose stack -![Compose Dev environment](/images/dev-env-compose.png){:width="700px"} +![Compose Dev environment](images/dev-env-compose.png){:width="700px"} Now your application is up and running, you can check by opening [http://localhost:8080](http://localhost:8080) in your browser. diff --git a/desktop/faqs.md b/desktop/faqs.md index e03f1eabec..19128189da 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -13,7 +13,7 @@ toc_max: 2 ### What are the system requirements for Docker Desktop? -For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](../docker-for-mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](../docker-for-windows/install.md#system-requirements). +For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](../docker-for-windows/install.md#system-requirements). ### What is an experimental feature? @@ -21,7 +21,7 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo ### Where can I find information about diagnosing and troubleshooting Docker Desktop issues? -You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](../docker-for-mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](../docker-for-windows/troubleshoot.md). +You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](../docker-for-windows/troubleshoot.md). If you do not find a solution in Troubleshooting, browse issues on [docker/for-mac](https://github.com/docker/for-mac/issues){: target="_blank" rel="noopener" class="_"} or [docker/for-win](https://github.com/docker/for-win/issues){: target="_blank" rel="noopener" class="_"} GitHub repository, or create a new one. @@ -52,19 +52,19 @@ For details, see [Docker Engine API](../engine/api/index.md). Both Mac and Windows have a changing IP address (or none if you have no network access). On both Mac and Windows, we recommend that you connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. This is for development purposes and does not work in a production environment outside of Docker Desktop. For more information and examples, see how to connect from a container to a service on the host -[on Mac](../docker-for-mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](../docker-for-windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). +[on Mac](mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](../docker-for-windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). ### How do I connect to a container from Mac or Windows? We recommend that you publish a port, or connect from another container. Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work. For more information and examples, see -[I want to connect to a container from Mac](../docker-for-mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](../docker-for-windows/networking.md#i-want-to-connect-to-a-container-from-the-mac). +[I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](../docker-for-windows/networking.md#i-want-to-connect-to-a-container-from-the-mac). ### How do I add custom CA certificates? Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client side certs, see -[Add TLS certificates on Mac](../docker-for-mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](../docker-for-windows/index.md#adding-tls-certificates). +[Add TLS certificates on Mac](mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](../docker-for-windows/index.md#adding-tls-certificates). ### Can I pass through a USB device to a container? @@ -98,7 +98,7 @@ After updating the `settings.json` file, close and restart Docker Desktop to app ### When will Docker Desktop move to a cumulative release stream? -Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](../docker-for-mac/install.md#automatic-updates). +Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](mac/install.md#automatic-updates). ### How do new users install Docker Desktop? @@ -124,7 +124,7 @@ Starting with Docker Desktop 3.0.0, Stable and Edge releases are combined into a ### Does Docker Desktop offer support? -Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](../docker-for-mac/troubleshoot.md#support). +Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support). For information about the pricing plans and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. @@ -151,7 +151,7 @@ For more information, see [Docker Data Processing Agreement](https://www.docker. ### Is Docker Desktop compatible with Apple silicon processors? -Yes, you can now install Docker Desktop for Mac on Apple silicon. For more information, see [Docker Desktop for Apple silicon](../docker-for-mac/apple-silicon.md). +Yes, you can now install Docker Desktop for Mac on Apple silicon. For more information, see [Docker Desktop for Apple silicon](mac/apple-silicon.md). ### What is HyperKit? diff --git a/desktop/index.md b/desktop/index.md index 8831cc36b9..44c4d96555 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -26,19 +26,19 @@ Some of the key features of Docker Desktop include: 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 Mac](mac/install.md) * [Install Docker Desktop on Windows](../docker-for-windows/install.md) ## Configure Docker Desktop To learn about the various UI options and their usage, see: -* [Docker Desktop for Mac user manual](../docker-for-mac/index.md) +* [Docker Desktop for Mac user manual](mac/index.md) * [Docker Desktop for Windows user manual](../docker-for-windows/index.md) ## Release notes For information about new features, improvements, and bug fixes in Docker Desktop releases, see: -* [Docker Desktop for Mac Release notes](../docker-for-mac/release-notes.md) +* [Docker Desktop for Mac Release notes](mac/release-notes.md) * [Docker Desktop for Windows Release notes](../docker-for-windows/release-notes.md) diff --git a/docker-for-mac/Makefile b/desktop/mac/Makefile similarity index 100% rename from docker-for-mac/Makefile rename to desktop/mac/Makefile diff --git a/docker-for-mac/apple-silicon.md b/desktop/mac/apple-silicon.md similarity index 92% rename from docker-for-mac/apple-silicon.md rename to desktop/mac/apple-silicon.md index 6e0390e0c8..0c93731624 100644 --- a/docker-for-mac/apple-silicon.md +++ b/desktop/mac/apple-silicon.md @@ -6,11 +6,12 @@ toc_min: 2 toc_max: 3 redirect_from: - /docker-for-mac/apple-m1/ +- /docker-for-mac/apple-silicon/ --- Docker Desktop for Mac on Apple silicon is now available as a GA release. This enables you to develop applications with your choice of local development environments, and extends development pipelines for ARM-based applications. -Docker Desktop for Apple silicon also supports multi-platform images, which allows you to build and run images for both x86 and ARM architectures without having to set up a complex cross-compilation development environment. Additionally, you can use [docker buildx](../engine/reference/commandline/buildx.md){:target="_blank" rel="noopener" class="_"} to seamlessly integrate multi-platform builds into your build pipeline, and use [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} to identify and share repositories that provide multi-platform images. +Docker Desktop for Apple silicon also supports multi-platform images, which allows you to build and run images for both x86 and ARM architectures without having to set up a complex cross-compilation development environment. Additionally, you can use [docker buildx](../../engine/reference/commandline/buildx.md){:target="_blank" rel="noopener" class="_"} to seamlessly integrate multi-platform builds into your build pipeline, and use [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} to identify and share repositories that provide multi-platform images. Download Docker Desktop for Mac on Apple silicon: diff --git a/docker-for-mac/edge-release-notes.md b/desktop/mac/edge-release-notes.md similarity index 99% rename from docker-for-mac/edge-release-notes.md rename to desktop/mac/edge-release-notes.md index 44e4c714dd..20a1c93d48 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/desktop/mac/edge-release-notes.md @@ -9,7 +9,7 @@ toc_max: 2 This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release. For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see -[What to know before you install](install.md#what-to-know-before-you-install). +[What to know before you install](install.md#system-requirements). ## Docker Desktop Community 2.5.4 2020-12-07 @@ -989,7 +989,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 [https://docs.docker.com/docker-for-mac/kubernetes/](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](../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 @@ -1196,7 +1196,7 @@ TCP connection is idle for more than five minutes (related to - Add daemon options validation - Diagnose can be cancelled & Improved help information. Fixes [docker/for-mac#1134](https://github.com/docker/for-mac/issues/1134), [docker/for-mac#1474](https://github.com/docker/for-mac/issues/1474) -- Support paging of Docker Cloud [repositories](../docker-hub/repos.md) and [organizations](../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538) +- Support paging of Docker Cloud [repositories](../../docker-hub/repos.md) and [organizations](../../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538) ### Docker Community Edition 17.06.1-ce-mac20, 2017-07-18 @@ -2049,7 +2049,7 @@ events or unexpected unmounts. **Bug fixes and minor changes** -* Documentation moved to [https://docs.docker.com/docker-for-mac/](index.md) +* Documentation moved to [https://docs.docker.com/desktop/mac/](index.md) * Allow non-admin users to launch the app for the first time (using admin creds) * Prompt non-admin users for admin password when needed in Preferences * Fixed download links, documentation links diff --git a/docker-for-mac/images/changelog-placeholder.png b/desktop/mac/images/changelog-placeholder.png similarity index 100% rename from docker-for-mac/images/changelog-placeholder.png rename to desktop/mac/images/changelog-placeholder.png diff --git a/docker-for-mac/images/console.png b/desktop/mac/images/console.png similarity index 100% rename from docker-for-mac/images/console.png rename to desktop/mac/images/console.png diff --git a/docker-for-mac/images/desktop-mac-2fa.png b/desktop/mac/images/desktop-mac-2fa.png similarity index 100% rename from docker-for-mac/images/desktop-mac-2fa.png rename to desktop/mac/images/desktop-mac-2fa.png diff --git a/docker-for-mac/images/diagnose-support.png b/desktop/mac/images/diagnose-support.png similarity index 100% rename from docker-for-mac/images/diagnose-support.png rename to desktop/mac/images/diagnose-support.png diff --git a/docker-for-mac/images/docker-app-drag.png b/desktop/mac/images/docker-app-drag.png similarity index 100% rename from docker-for-mac/images/docker-app-drag.png rename to desktop/mac/images/docker-app-drag.png diff --git a/docker-for-mac/images/docker-app-in-apps.png b/desktop/mac/images/docker-app-in-apps.png similarity index 100% rename from docker-for-mac/images/docker-app-in-apps.png rename to desktop/mac/images/docker-app-in-apps.png diff --git a/docker-for-mac/images/docker-tutorial-mac.png b/desktop/mac/images/docker-tutorial-mac.png similarity index 100% rename from docker-for-mac/images/docker-tutorial-mac.png rename to desktop/mac/images/docker-tutorial-mac.png diff --git a/docker-for-mac/images/hello-world-nginx.png b/desktop/mac/images/hello-world-nginx.png similarity index 100% rename from docker-for-mac/images/hello-world-nginx.png rename to desktop/mac/images/hello-world-nginx.png diff --git a/docker-for-mac/images/localhost-arm.png b/desktop/mac/images/localhost-arm.png similarity index 100% rename from docker-for-mac/images/localhost-arm.png rename to desktop/mac/images/localhost-arm.png diff --git a/docker-for-mac/images/menu/prefs-advanced.png b/desktop/mac/images/menu/prefs-advanced.png similarity index 100% rename from docker-for-mac/images/menu/prefs-advanced.png rename to desktop/mac/images/menu/prefs-advanced.png diff --git a/docker-for-mac/images/menu/prefs-general.png b/desktop/mac/images/menu/prefs-general.png similarity index 100% rename from docker-for-mac/images/menu/prefs-general.png rename to desktop/mac/images/menu/prefs-general.png diff --git a/docker-for-mac/images/menu/prefs.png b/desktop/mac/images/menu/prefs.png similarity index 100% rename from docker-for-mac/images/menu/prefs.png rename to desktop/mac/images/menu/prefs.png diff --git a/docker-for-mac/images/menu/troubleshoot.png b/desktop/mac/images/menu/troubleshoot.png similarity index 100% rename from docker-for-mac/images/menu/troubleshoot.png rename to desktop/mac/images/menu/troubleshoot.png diff --git a/docker-for-mac/images/proxy-settings.png b/desktop/mac/images/proxy-settings.png similarity index 100% rename from docker-for-mac/images/proxy-settings.png rename to desktop/mac/images/proxy-settings.png diff --git a/docker-for-mac/images/snooze-update.png b/desktop/mac/images/snooze-update.png similarity index 100% rename from docker-for-mac/images/snooze-update.png rename to desktop/mac/images/snooze-update.png diff --git a/docker-for-mac/images/whale-in-menu-bar.png b/desktop/mac/images/whale-in-menu-bar.png similarity index 100% rename from docker-for-mac/images/whale-in-menu-bar.png rename to desktop/mac/images/whale-in-menu-bar.png diff --git a/docker-for-mac/images/whale-x.png b/desktop/mac/images/whale-x.png similarity index 100% rename from docker-for-mac/images/whale-x.png rename to desktop/mac/images/whale-x.png diff --git a/docker-for-mac/index.md b/desktop/mac/index.md similarity index 96% rename from docker-for-mac/index.md rename to desktop/mac/index.md index 8b7d2adadf..86338c9a50 100644 --- a/docker-for-mac/index.md +++ b/desktop/mac/index.md @@ -2,6 +2,7 @@ description: Getting Started keywords: mac, tutorial, run, docker, local, machine redirect_from: +- /docker-for-mac/ - /docker-for-mac/index/ - /docker-for-mac/mutagen/ - /docker-for-mac/mutagen-caching/ @@ -107,8 +108,8 @@ File share settings are: * Shared folders are designed to allow application code to be edited on the host while being executed in containers. For non-code items such as cache directories or databases, the performance will be much - better if they are stored in the Linux VM, using a [data volume](../storage/volumes.md) - (named volume) or [data container](../storage/volumes.md). + better if they are stored in the Linux VM, using a [data volume](../../storage/volumes.md) + (named volume) or [data container](../../storage/volumes.md). > * If you share the whole of your home directory into a container, MacOS may prompt you to give Docker access to personal areas of your home directory such as @@ -212,7 +213,7 @@ Server: Docker Engine - Community Docker Desktop includes a standalone Kubernetes server that runs on your Mac, so that you can test deploying your Docker workloads on Kubernetes. To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**. -For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../desktop/kubernetes.md){:target="_blank" rel="noopener" class="_"}. +For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../kubernetes.md){:target="_blank" rel="noopener" class="_"}. ### Reset @@ -224,7 +225,7 @@ For information about the reset options, see [Logs and Troubleshooting](troubles ## Dashboard -The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../desktop/dashboard.md). +The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md). ## Add TLS certificates @@ -322,7 +323,7 @@ also in your keychain. To learn more about how to install a CA root certificate for the registry and how to set the client TLS certificate for verification, see -[Verify repository client with certificates](../engine/security/certificates.md) +[Verify repository client with certificates](../../engine/security/certificates.md) in the Docker Engine topics. ## Install shell completion @@ -411,11 +412,11 @@ For information about providing feedback on the documentation or update it yours Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories and organizations directly from the Docker Desktop menu. -For more information, refer to the following [Docker Hub topics](../docker-hub/index.md){:target="_blank" +For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){:target="_blank" class="_"}: -* [Organizations and Teams in Docker Hub](../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"} -* [Builds](../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"} +* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"} +* [Builds](../../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"} ### Two-factor authentication @@ -444,7 +445,7 @@ After you have successfully authenticated, you can access your organizations and walkthroughs and source code. * For a summary of Docker command line interface (CLI) commands, see - [Docker CLI Reference Guide](../engine/api/index.md){: target="_blank" rel="noopener" class="_"}. + [Docker CLI Reference Guide](../../engine/api/index.md){: target="_blank" rel="noopener" class="_"}. * Check out the blog post, [What’s New in Docker 17.06 Community Edition (CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" rel="noopener" class="_"}. diff --git a/docker-for-mac/install.md b/desktop/mac/install.md similarity index 89% rename from docker-for-mac/install.md rename to desktop/mac/install.md index 50b1118178..bea5660118 100644 --- a/docker-for-mac/install.md +++ b/desktop/mac/install.md @@ -2,6 +2,8 @@ description: How to install Docker Desktop on Mac keywords: mac, install, download, run, docker, local title: Install Docker Desktop on Mac +redirect_from: +- /docker-for-mac/install/ --- Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, installation instructions, and automatic updates. @@ -57,8 +59,8 @@ Your Mac must meet the following requirements to successfully install Docker Des ## What's included in the installer The Docker Desktop installation includes - [Docker Engine](../engine/index.md), Docker CLI client, - [Docker Compose](../compose/index.md), [Docker Content Trust](../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). + [Docker Engine](../../engine/index.md), Docker CLI client, + [Docker Compose](../../compose/index.md), [Docker Content Trust](../../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). ## Install and run Docker Desktop on Mac @@ -104,7 +106,7 @@ To uninstall Docker Desktop from your Mac: > > Uninstalling Docker Desktop destroys Docker containers, images, volumes, and > other Docker related data local to the machine, and removes the files generated -> by the application. Refer to the [back up and restore data](../desktop/backup-and-restore.md) +> by the application. Refer to the [back up and restore data](../backup-and-restore.md) > section to learn how to preserve important data before uninstalling. ## Where to go next @@ -113,8 +115,8 @@ To uninstall Docker Desktop from your Mac: - [Docker Desktop for Apple silicon](apple-silicon.md) for detailed information about Docker Desktop for Apple silicon. - [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](../desktop/faqs.md) provide answers to frequently asked questions. +- [FAQs](../faqs.md) provide answers to frequently asked questions. - [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -- [Get started with Docker](../get-started/index.md) provides a general Docker tutorial. -* [Back up and restore data](../desktop/backup-and-restore.md) provides instructions +- [Get started with Docker](../../get-started/index.md) provides a general Docker tutorial. +* [Back up and restore data](../backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/docker-for-mac/networking.md b/desktop/mac/networking.md similarity index 97% rename from docker-for-mac/networking.md rename to desktop/mac/networking.md index 311f416287..524f17f48e 100644 --- a/docker-for-mac/networking.md +++ b/desktop/mac/networking.md @@ -2,6 +2,7 @@ description: Networking keywords: mac, networking redirect_from: +- /docker-for-mac/networking/ - /mackit/networking/ title: Networking features in Docker Desktop for Mac --- @@ -130,5 +131,5 @@ container to random ports on the host. $ docker run -d -P --name webserver nginx ``` -See the [run command](../engine/reference/commandline/run.md) for more details on +See the [run command](../../engine/reference/commandline/run.md) for more details on publish options used with `docker run`. diff --git a/docker-for-mac/previous-versions.md b/desktop/mac/previous-versions.md similarity index 99% rename from docker-for-mac/previous-versions.md rename to desktop/mac/previous-versions.md index 3de8693eac..12bb77069d 100644 --- a/docker-for-mac/previous-versions.md +++ b/desktop/mac/previous-versions.md @@ -4,6 +4,8 @@ keywords: Docker Desktop for Mac, release notes title: Release notes for previous versions toc_min: 1 toc_max: 2 +redirect_from: +- /docker-for-mac/previous-versions/ --- This page contains release notes for older versions of Docker Desktop for Mac. @@ -248,7 +250,7 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New - **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](../desktop/dashboard.md). +For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../dashboard.md). - Introduced a new user interface for the Docker Desktop **Preferences** menu. - The Restart, Reset, and Uninstall options are now available on the **Troubleshoot** menu. @@ -476,7 +478,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. - 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 [https://docs.docker.com/docker-for-mac/kubernetes/](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](../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) @@ -597,7 +599,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. - VM entirely built with Linuxkit - VM disk size can be changed in disk preferences. (See [docker/for-mac#1037](https://github.com/docker/for-mac/issues/1037)) - For systems running APFS on SSD on High Sierra, use `raw` format VM disks by default. This improves disk throughput (from 320MiB/sec to 600MiB/sec in `dd` on a 2015 MacBook Pro) and disk space handling. - Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See https://docs.docker.com/docker-for-mac/faqs/#disk-usage + Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See [Disk utilization](space.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/docker-for-mac/release-notes.md b/desktop/mac/release-notes.md similarity index 89% rename from docker-for-mac/release-notes.md rename to desktop/mac/release-notes.md index 25f25e0eca..cb959cbbf3 100644 --- a/docker-for-mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -2,6 +2,7 @@ description: Change log / release notes for Docker Desktop Mac keywords: Docker Desktop for Mac, release notes redirect_from: +- /docker-for-mac/release-notes/ - /mackit/release-notes/ - /docker-for-mac/edge-release-notes/ title: Docker for Mac release notes @@ -21,8 +22,8 @@ This page contains information about the new features, improvements, known issue ### New -- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../desktop/dev-environments.md#start-a-dev-environment-from-a-local-folder). -- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes). +- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../dev-environments.md#start-a-dev-environment-from-a-local-folder). +- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../dashboard.md#explore-volumes). ### Upgrades @@ -50,7 +51,7 @@ This page contains information about the new features, improvements, known issue ### 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](../desktop/dev-environments.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](../dev-environments.md). ### Upgrades @@ -82,9 +83,9 @@ This page contains information about the new features, improvements, known issue ### 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](../desktop/dev-environments.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](../dev-environments.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. For more information, see [Compose V2 beta](../compose/cli-command.md). 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](../compose/cli-command-compatibility.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. +**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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. ### Bug fixes and minor changes @@ -98,9 +99,9 @@ This page contains information about the new features, improvements, known issue ### 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](../desktop/dev-environments.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](../dev-environments.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. For more information, see [Compose V2 beta](../compose/cli-command.md). 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](../compose/cli-command-compatibility.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. +**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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. ### Upgrades @@ -133,15 +134,15 @@ This page contains information about the new features, improvements, known issue ### New -**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes). +**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../dashboard.md#explore-volumes). -**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. For more information, see [Compose V2 beta](../compose/cli-command.md). 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](../compose/cli-command-compatibility.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. +**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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. -**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../docker-for-windows/install.md#updates). +**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../../docker-for-windows/install.md#updates). ### Deprecation -- Docker Desktop no longer installs Notary. You can now use [Docker Content Trust](../engine/security/trust.md) for image signing. +- Docker Desktop no longer installs Notary. You can now use [Docker Content Trust](../../engine/security/trust/index.md) for image signing. ### Upgrades diff --git a/docker-for-mac/space.md b/desktop/mac/space.md similarity index 98% rename from docker-for-mac/space.md rename to desktop/mac/space.md index aae3422474..ef1887a634 100644 --- a/docker-for-mac/space.md +++ b/desktop/mac/space.md @@ -2,6 +2,8 @@ description: Disk utilization keywords: mac, disk title: Disk utilization in Docker for Mac +redirect_from: +- /docker-for-mac/space/ --- Docker Desktop stores Linux containers and images in a single, large "disk image" file in the Mac filesystem. This is different from Docker on Linux, which usually stores containers and images in the `/var/lib/docker` directory. diff --git a/docker-for-mac/troubleshoot.md b/desktop/mac/troubleshoot.md similarity index 98% rename from docker-for-mac/troubleshoot.md rename to desktop/mac/troubleshoot.md index 566ed3ac73..0494a9ff1a 100644 --- a/docker-for-mac/troubleshoot.md +++ b/desktop/mac/troubleshoot.md @@ -2,6 +2,7 @@ description: Troubleshooting, logs, and known issues keywords: mac, troubleshooting, logs, issues redirect_from: +- /docker-for-mac/troubleshoot/ - /mackit/troubleshoot/ title: Logs and troubleshooting toc_max: 2 @@ -27,7 +28,7 @@ The Troubleshoot page contains the following options: * **Support**: Developers on Pro and Team plans can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support). -* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](/docker-for-mac/index/#kubernetes). +* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes). * **Clean / Purge data**: This option resets all Docker data _without_ a reset to factory defaults. Selecting this option results in the loss of existing settings. @@ -177,7 +178,7 @@ ways, and create reports. #### View the Docker Daemon logs -Refer to the [read the logs](../config/daemon/index.md#read-the-logs) section +Refer to the [read the logs](../../config/daemon/index.md#read-the-logs) section to learn how to view the Docker Daemon logs. @@ -207,7 +208,7 @@ For more about using client and server side certificates, see If you are using mounted volumes and get runtime errors indicating an application file is not found, access to a volume mount is denied, or a service -cannot start, such as when using [Docker Compose](../compose/gettingstarted.md), +cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md), you might need to enable [file sharing](index.md#file-sharing). Volume mounting requires shared drives for projects that live outside of the @@ -418,8 +419,8 @@ As a Team, you can get support for Docker Desktop for the number of machines equ Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages: -* [Mac system requirements](../docker-for-mac/install.md#system-requirements) -* [Windows system requirements](../docker-for-windows/install.md#system-requirements) +* [Mac system requirements](install.md#system-requirements) +* [Windows system requirements](../../docker-for-windows/install.md#system-requirements) ### Can I run Docker Desktop on Virtualized hardware? diff --git a/desktop/opensource.md b/desktop/opensource.md index ca051fd79a..54da60df2a 100644 --- a/desktop/opensource.md +++ b/desktop/opensource.md @@ -9,7 +9,7 @@ redirect_from: --- Docker Desktop is built using open source software. For information about the -licensing, choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} +licensing, choose ![whale menu](mac/images/whale-x.png){: .inline} →  **About Docker Desktop** and then **Acknowledgements**. Docker Desktop distributes some components that are licensed under the diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 725bf56576..afd4754d4d 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -414,7 +414,7 @@ As a Team, you can get support for Docker Desktop for the number of machines equ Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages: * [Windows system requirements](../docker-for-windows/install.md#system-requirements) -* [Mac system requirements](../docker-for-mac/install.md#system-requirements) +* [Mac system requirements](../desktop/mac/install.md#system-requirements) ### Can I run Docker Desktop on Virtualized hardware? diff --git a/engine/breaking_changes.md b/engine/breaking_changes.md index 570ac6d994..20a910eafb 100644 --- a/engine/breaking_changes.md +++ b/engine/breaking_changes.md @@ -10,15 +10,15 @@ Every Engine release strives to be backward compatible with its predecessors, and interface stability is always a priority at Docker. In all cases, feature removal is communicated three releases -in advance and documented as part of the [deprecated features](deprecated.md) +in advance and documented as part of the [deprecated features](/engine/deprecated/) page. The following list compiles any updates to Docker Engine that created backwards-incompatibility for old versions of Docker tools. > **Note**: In the case of your local environment, you should be updating your - Docker Engine using [Docker Desktop for Mac](/docker-for-mac), - [Docker Desktop for Windows](/docker-for-windows). That way all your tools stay + Docker Engine using [Docker Desktop for Mac](../desktop/mac/index.md), + [Docker Desktop for Windows](../docker-for-windows/index.md). That way all your tools stay in sync with Docker Engine. ## Engine 1.10 diff --git a/engine/install/index.md b/engine/install/index.md index 704af3b3d4..4e6ae12fc5 100644 --- a/engine/install/index.md +++ b/engine/install/index.md @@ -32,7 +32,7 @@ redirect_from: ## Supported platforms Docker Engine is available on a variety of [Linux platforms](#server), -[macOS](../../docker-for-mac/install.md) and [Windows 10](../../docker-for-windows/install.md) +[macOS](../../desktop/mac/install.md) and [Windows 10](../../docker-for-windows/install.md) through Docker Desktop, and as a [static binary installation](binaries.md). Find your preferred operating system below. @@ -42,7 +42,7 @@ your preferred operating system below. | Platform | x86_64 / amd64 | arm64 (Apple Silicon) | |:------------------------------------------------------------------|:------------------------------------------------:|:------------------------------------------------:| -| [Docker Desktop for Mac (macOS)](../../docker-for-mac/install.md) | [{{ yes }}](../../docker-for-mac/install.md) | [{{ yes }}](../../docker-for-mac/install.md) | +| [Docker Desktop for Mac (macOS)](../../desktop/mac/install.md) | [{{ yes }}](../../desktop/mac/install.md) | [{{ yes }}](../../desktop/mac/install.md) | | [Docker Desktop for Windows](../../docker-for-windows/install.md) | [{{ yes }}](../../docker-for-windows/install.md) | | ### Server diff --git a/engine/swarm/swarm-tutorial/index.md b/engine/swarm/swarm-tutorial/index.md index 639e3d9452..fa6bf1771e 100644 --- a/engine/swarm/swarm-tutorial/index.md +++ b/engine/swarm/swarm-tutorial/index.md @@ -56,7 +56,7 @@ single-node and multi-node swarm scenarios on Linux machines. #### Use Docker Desktop for Mac or Docker Desktop for Windows -Alternatively, install the latest [Docker Desktop for Mac](../../../docker-for-mac/index.md) or +Alternatively, install the latest [Docker Desktop for Mac](../../../desktop/mac/index.md) or [Docker Desktop for Windows](../../../docker-for-windows/index.md) application on one computer. You can test both single-node and multi-node swarm from this computer, but you need to use Docker Machine to test the multi-node scenarios. diff --git a/get-docker.md b/get-docker.md index d07d571fc0..af8b804c6f 100644 --- a/get-docker.md +++ b/get-docker.md @@ -25,9 +25,9 @@ section and choose the best installation path for you.
- Docker Desktop for Mac + Docker Desktop for Mac
-

Docker Desktop for Mac

+

Docker Desktop for Mac

A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.

diff --git a/get-started/index.md b/get-started/index.md index 206b362b31..f36e545b69 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -85,7 +85,7 @@ machine. If you do not have Docker installed, choose your preferred operating sy [Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn} [Linux](../engine/install/index.md){: .button .primary-btn} -For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md) and [Install Docker Desktop on Windows](../docker-for-windows/install.md). +For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../docker-for-windows/install.md). {% include eula.md %} @@ -118,9 +118,8 @@ you a quick view of the containers running on your machine. The Docker Dashboard It gives you quick access to container logs, lets you get a shell inside the container, and lets you easily manage container lifecycle (stop, remove, etc.). -To access the dashboard, follow the instructions for either -[Mac](../../docker-for-mac/dashboard/) or -[Windows](../../docker-for-windows/dashboard/). If you open the dashboard +To access the dashboard, follow the instructions in the +[Docker Desktop product manual](../desktop/dashboard.md). If you open the dashboard now, you will see this tutorial running! The container name (`jolly_bouman` below) is a randomly created name. So, you'll most likely have a different name. diff --git a/go/apple-silicon.md b/go/apple-silicon.md index 3dd9b2d9d9..d5ab03284a 100644 --- a/go/apple-silicon.md +++ b/go/apple-silicon.md @@ -2,5 +2,5 @@ title: How to run Docker Desktop on new Mac with Apple Silicon processors description: Instructions on enabling BuildKit keywords: mac, troubleshooting, apple, silicon, issues -redirect_to: /docker-for-mac/apple-silicon/ +redirect_to: /desktop/mac/apple-silicon/ --- diff --git a/machine/get-started.md b/machine/get-started.md index 85964c5cc5..cedffb335a 100644 --- a/machine/get-started.md +++ b/machine/get-started.md @@ -14,7 +14,7 @@ page on GitHub. ## Prerequisite information -With the advent of [Docker Desktop for Mac](../docker-for-mac/index.md) and +With the advent of [Docker Desktop for Mac](../desktop/mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md), we recommend that you use these for your primary Docker workflows. You can use these applications to run Docker natively on your local system without using Docker Machine at all. diff --git a/machine/index.md b/machine/index.md index 362ed28992..7ef73a224a 100644 --- a/machine/index.md +++ b/machine/index.md @@ -30,7 +30,7 @@ point to a host called `default`, follow on-screen instructions to complete Machine _was_ the _only_ way to run Docker on Mac or Windows previous to Docker v1.12. Starting with the beta program and Docker v1.12, -[Docker Desktop for Mac](../docker-for-mac/index.md) and +[Docker Desktop for Mac](../desktop/mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) are available as native apps and the better choice for this use case on newer desktops and laptops. We encourage you to try out these new apps. @@ -52,7 +52,7 @@ Docker Machine has these two broad use cases. ![Docker Machine on Mac and Windows](img/machine-mac-win.png){: .white-bg} - If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../docker-for-mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally. + If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../desktop/mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally. * **I want to provision Docker hosts on remote systems** diff --git a/machine/install-machine.md b/machine/install-machine.md index 520a681216..4584b114c9 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -106,7 +106,7 @@ To uninstall Docker Machine: Removing machines is an optional step because there are cases where you might want to save and migrate existing machines to a - [Docker for Mac](../docker-for-mac/index.md) or + [Docker for Mac](../desktop/mac/index.md) or [Docker Desktop for Windows](../docker-for-windows/index.md) environment, for example. diff --git a/registry/insecure.md b/registry/insecure.md index 767278f6ae..baf2a0af89 100644 --- a/registry/insecure.md +++ b/registry/insecure.md @@ -97,7 +97,7 @@ This is more secure than the insecure registry solution. 3. Click **Finish**. Restart Docker. - **Docker Desktop for Mac**: Follow the instructions in - [Adding custom CA certificates](../docker-for-mac/index.md#add-tls-certificates){: target="_blank" rel="noopener" class="_"}. + [Adding custom CA certificates](../desktop/mac/index.md#add-tls-certificates){: target="_blank" rel="noopener" class="_"}. Restart Docker. - **Docker Desktop for Windows**: Follow the instructions in diff --git a/release-notes/index.md b/release-notes/index.md index ab030f0706..9f15ccfcb1 100644 --- a/release-notes/index.md +++ b/release-notes/index.md @@ -9,8 +9,8 @@ features, improvements, known issues, and bug fixes in each release. You can find release notes for each component in the product manuals section. We suggest that you regularly visit the release notes to learn about updates. -- [Docker Engine](/engine/release-notes/) -- [Docker Desktop for Mac](/docker-for-mac/release-notes/) -- [Docker Desktop for Windows](/docker-for-windows/release-notes/) -- [Docker Hub](/docker-hub/release-notes/) -- [Docker Compose](/compose/release-notes/) +- [Docker Engine](../engine/release-notes/index.md) +- [Docker Desktop for Mac](../desktop/mac/release-notes.md) +- [Docker Desktop for Windows](../docker-for-windows/release-notes.md) +- [Docker Hub](../docker-hub/release-notes.md) +- [Docker Compose](../compose/release-notes.md) diff --git a/samples/aspnet-mssql-compose.md b/samples/aspnet-mssql-compose.md index bde6c47888..f4e553fdf8 100644 --- a/samples/aspnet-mssql-compose.md +++ b/samples/aspnet-mssql-compose.md @@ -28,7 +28,7 @@ configure this app to use our SQL Server database, and then create a This directory is the context of your docker-compose project. For [Docker Desktop for Windows](../docker-for-windows/index.md#file-sharing) and - [Docker Desktop for Mac](../docker-for-mac/index.md#file-sharing), you + [Docker Desktop for Mac](../desktop/mac/index.md#file-sharing), you need to set up file sharing for the volume that you need to map. 1. Within your directory, use the `dotnet:2.1-sdk` Docker image to generate a @@ -176,7 +176,7 @@ configure this app to use our SQL Server database, and then create a 1. Make sure you allocate at least 2GB of memory to Docker Engine. Here is how to do it on - [Docker Desktop for Mac](../docker-for-mac/index.md#advanced) and + [Docker Desktop for Mac](../desktop/mac/index.md#advanced) and [Docker Desktop for Windows](../docker-for-windows/index.md#advanced). This is necessary to run the SQL Server on Linux container. diff --git a/toolbox/index.md b/toolbox/index.md index 48ae760186..78ae062b55 100644 --- a/toolbox/index.md +++ b/toolbox/index.md @@ -19,7 +19,7 @@ toc_max: 2 >**Deprecated** > > Docker Toolbox has been deprecated and is no longer in active development. Please -> use Docker Desktop instead. See [Docker Desktop for Mac](../docker-for-mac/index.md) +> use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/mac/index.md) > and [Docker Desktop for Windows](../docker-for-windows/index.md). {: .warning } @@ -68,7 +68,7 @@ To uninstall Docker Toolbox on Mac: This step is optional because if you plan to re-install Docker Machine as a part - of [Docker Desktop for Mac](../docker-for-mac/index.md), you can import and + of [Docker Desktop for Mac](../desktop/mac/index.md), you can import and continue to manage those machines through Docker. 3. In your "Applications" folder, remove the "Docker" directory, From 346a066b6886f3deab23383f14822c0a32ec38d8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 14 Aug 2021 13:28:15 +0200 Subject: [PATCH 3/7] Desktop: move "docker-for-windows" to "desktop/windows" Unifying all content related to Docker Desktop to be withing the desktop directory. Signed-off-by: Sebastiaan van Stijn --- _data/glossary.yaml | 2 +- _data/redirects.csv | 2 +- _data/toc.yaml | 14 ++++++------ _layouts/landing.html | 8 +++---- cloud/aci-integration.md | 2 +- cloud/ecs-integration.md | 2 +- compose/cli-command.md | 2 +- compose/gettingstarted.md | 4 ++-- compose/install.md | 2 +- desktop/backup-and-restore.md | 4 ++-- desktop/dev-environments.md | 2 +- desktop/faqs.md | 20 ++++++++--------- desktop/index.md | 6 ++--- desktop/mac/release-notes.md | 2 +- desktop/mac/troubleshoot.md | 2 +- .../windows}/Makefile | 0 .../windows}/edge-release-notes.md | 8 +++---- .../windows}/images/desktop-win-2fa.png | Bin .../windows}/images/diagnose-support.png | Bin .../windows}/images/docker-app-search.png | Bin .../windows}/images/docker-app-welcome.png | Bin .../images/docker-menu-context-switch.png | Bin .../windows}/images/docker-menu-settings.png | Bin .../windows}/images/docker-menu-switch.png | Bin .../windows}/images/docker-tutorial-win.png | Bin .../windows}/images/hyperv-enabled.png | Bin .../windows}/images/hyperv-manager.png | Bin .../windows}/images/issue-template.png | Bin .../windows}/images/nginx-homepage.png | Bin .../windows}/images/redis-container.png | Bin .../windows}/images/settings-general.png | Bin .../windows}/images/settings-resources.png | Bin .../images/shared-folder-on-demand.png | Bin .../windows}/images/troubleshoot.png | Bin .../images/virtualization-enabled.png | Bin .../images/whale-icon-systray-hidden.png | Bin .../windows}/images/whale-icon-systray.png | Bin .../windows}/images/whale-x.png | Bin .../windows}/images/wsl2-choose-distro.png | Bin .../windows}/images/wsl2-context.png | Bin .../windows}/images/wsl2-enable.png | Bin .../windows}/images/wsl2-enabled.png | Bin .../windows}/images/wsl2-ui.png | Bin .../windows}/index.md | 21 +++++++++--------- .../windows}/install.md | 17 +++++++------- .../windows}/networking.md | 3 ++- .../windows}/previous-versions.md | 8 ++++--- .../windows}/release-notes.md | 21 +++++++++--------- .../windows}/troubleshoot.md | 11 ++++----- .../windows}/wsl.md | 1 + engine/breaking_changes.md | 2 +- engine/install/index.md | 4 ++-- engine/swarm/swarm-tutorial/index.md | 2 +- get-docker.md | 4 ++-- get-started/index.md | 2 +- machine/get-started.md | 4 ++-- machine/index.md | 4 ++-- machine/install-machine.md | 2 +- registry/insecure.md | 2 +- release-notes/index.md | 2 +- samples/aspnet-mssql-compose.md | 4 ++-- samples/dotnetcore.md | 10 ++++----- toolbox/index.md | 4 ++-- 63 files changed, 109 insertions(+), 101 deletions(-) rename {docker-for-windows => desktop/windows}/Makefile (100%) rename {docker-for-windows => desktop/windows}/edge-release-notes.md (99%) rename {docker-for-windows => desktop/windows}/images/desktop-win-2fa.png (100%) rename {docker-for-windows => desktop/windows}/images/diagnose-support.png (100%) rename {docker-for-windows => desktop/windows}/images/docker-app-search.png (100%) rename {docker-for-windows => desktop/windows}/images/docker-app-welcome.png (100%) rename {docker-for-windows => desktop/windows}/images/docker-menu-context-switch.png (100%) rename {docker-for-windows => desktop/windows}/images/docker-menu-settings.png (100%) rename {docker-for-windows => desktop/windows}/images/docker-menu-switch.png (100%) rename {docker-for-windows => desktop/windows}/images/docker-tutorial-win.png (100%) rename {docker-for-windows => desktop/windows}/images/hyperv-enabled.png (100%) rename {docker-for-windows => desktop/windows}/images/hyperv-manager.png (100%) rename {docker-for-windows => desktop/windows}/images/issue-template.png (100%) rename {docker-for-windows => desktop/windows}/images/nginx-homepage.png (100%) rename {docker-for-windows => desktop/windows}/images/redis-container.png (100%) rename {docker-for-windows => desktop/windows}/images/settings-general.png (100%) rename {docker-for-windows => desktop/windows}/images/settings-resources.png (100%) rename {docker-for-windows => desktop/windows}/images/shared-folder-on-demand.png (100%) rename {docker-for-windows => desktop/windows}/images/troubleshoot.png (100%) rename {docker-for-windows => desktop/windows}/images/virtualization-enabled.png (100%) rename {docker-for-windows => desktop/windows}/images/whale-icon-systray-hidden.png (100%) rename {docker-for-windows => desktop/windows}/images/whale-icon-systray.png (100%) rename {docker-for-windows => desktop/windows}/images/whale-x.png (100%) rename {docker-for-windows => desktop/windows}/images/wsl2-choose-distro.png (100%) rename {docker-for-windows => desktop/windows}/images/wsl2-context.png (100%) rename {docker-for-windows => desktop/windows}/images/wsl2-enable.png (100%) rename {docker-for-windows => desktop/windows}/images/wsl2-enabled.png (100%) rename {docker-for-windows => desktop/windows}/images/wsl2-ui.png (100%) rename {docker-for-windows => desktop/windows}/index.md (95%) rename {docker-for-windows => desktop/windows}/install.md (93%) rename {docker-for-windows => desktop/windows}/networking.md (97%) rename {docker-for-windows => desktop/windows}/previous-versions.md (99%) rename {docker-for-windows => desktop/windows}/release-notes.md (87%) rename {docker-for-windows => desktop/windows}/troubleshoot.md (97%) rename {docker-for-windows => desktop/windows}/wsl.md (99%) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 32f7f8e955..98c9555360 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -78,7 +78,7 @@ Docker Desktop for Mac: | to build, debug, test, package, and ship Dockerized applications on a Mac. Docker Desktop for Windows: | - [Docker Desktop for Windows](/docker-for-windows/) is an + [Docker Desktop for Windows](/desktop/windows/) is an easy-to-install, lightweight Docker development environment designed specifically for Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise and Education). Docker Desktop for Windows uses Hyper-V for diff --git a/_data/redirects.csv b/_data/redirects.csv index 938be461b4..6ef7559272 100644 --- a/_data/redirects.csv +++ b/_data/redirects.csv @@ -1,7 +1,7 @@ source,destination /engine/quickstart/,/get-started/ /engine/containers/,/engine/tutorials/ -/win/,/docker-for-windows/ +/win/,/desktop/windows/ /mac/,/desktop/mac/ /linux/,/engine/ /article-img/,/engine/article-img/ diff --git a/_data/toc.yaml b/_data/toc.yaml index 77d67fda0b..7d5c44e383 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1204,19 +1204,19 @@ manuals: title: Previous versions - sectiontitle: Windows section: - - path: /docker-for-windows/install/ + - path: /desktop/windows/install/ title: Install Docker Desktop for Windows - - path: /docker-for-windows/ + - path: /desktop/windows/ title: User manual - - path: /docker-for-windows/networking/ + - path: /desktop/windows/networking/ title: Networking - - path: /docker-for-windows/troubleshoot/ + - path: /desktop/windows/troubleshoot/ title: Logs and troubleshooting - - path: /docker-for-windows/wsl/ + - path: /desktop/windows/wsl/ title: Docker Desktop WSL 2 backend - - path: /docker-for-windows/release-notes/ + - path: /desktop/windows/release-notes/ title: Release notes - - path: /docker-for-windows/previous-versions/ + - path: /desktop/windows/previous-versions/ title: Previous versions - path: /desktop/dashboard/ title: Dashboard diff --git a/_layouts/landing.html b/_layouts/landing.html index 3f76cdc93f..3cc57465ad 100644 --- a/_layouts/landing.html +++ b/_layouts/landing.html @@ -204,7 +204,7 @@

- + What are the system requirements for Docker Desktop?

@@ -231,12 +231,12 @@
Popular articles
-

Docker Desktop WSL 2 backend

+

Docker Desktop WSL 2 backend

Install Docker Desktop on Mac

Docker Desktop Dashboard

Deploy on Kubernetes

-

Release notes

-

Logs and troubleshooting

+

Release notes

+

Logs and troubleshooting

Networking features in Docker Desktop

diff --git a/cloud/aci-integration.md b/cloud/aci-integration.md index 531bd4fa04..7de4dbf394 100644 --- a/cloud/aci-integration.md +++ b/cloud/aci-integration.md @@ -27,7 +27,7 @@ To deploy Docker containers on Azure, you must meet the following requirements: 1. Download and install the latest version of Docker Desktop. - [Download for Mac](../desktop/mac/install.md) - - [Download for Windows](../docker-for-windows/install.md) + - [Download for Windows](../desktop/windows/install.md) Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux). diff --git a/cloud/ecs-integration.md b/cloud/ecs-integration.md index 2cbcfc122b..ca0f574605 100644 --- a/cloud/ecs-integration.md +++ b/cloud/ecs-integration.md @@ -26,7 +26,7 @@ To deploy Docker containers on ECS, you must meet the following requirements: 1. Download and install the latest version of Docker Desktop. - [Download for Mac](../desktop/mac/install.md) - - [Download for Windows](../docker-for-windows/install.md) + - [Download for Windows](../desktop/windows/install.md) Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux). diff --git a/compose/cli-command.md b/compose/cli-command.md index 3caa12a192..0270be076b 100644 --- a/compose/cli-command.md +++ b/compose/cli-command.md @@ -47,7 +47,7 @@ We will progressively turn Docker Compose V2 on automatically for Docker Desktop For Docker Desktop installation instructions, see: - [Install Docker Desktop on Mac](../desktop/mac/install.md) -- [Install Docker Desktop on Windows](../docker-for-windows/install.md) +- [Install Docker Desktop on Windows](../desktop/windows/install.md) To disable Docker Compose V2 using Docker Desktop: diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md index 6edc43c9a9..4e9295cdeb 100644 --- a/compose/gettingstarted.md +++ b/compose/gettingstarted.md @@ -276,14 +276,14 @@ If you get runtime errors indicating an application file is not found, a volume mount is denied, or a service cannot start, try enabling file or drive sharing. Volume mounting requires shared drives for projects that live outside of `C:\Users` (Windows) or `/Users` (Mac), and is required for _any_ project on -Docker Desktop for Windows that uses [Linux containers](../docker-for-windows/index.md#switch-between-windows-and-linux-containers). +Docker Desktop for Windows that uses [Linux containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers). For more information, see [File sharing](../desktop/mac/index.md#file-sharing) on Docker for Mac, and the general examples on how to > [Manage data in containers](../storage/volumes.md). > > * If you are using Oracle VirtualBox on an older Windows OS, you might encounter an issue with shared folders as described in this [VB trouble ticket](https://www.virtualbox.org/ticket/14920). Newer Windows systems meet the -requirements for [Docker Desktop for Windows](../docker-for-windows/install.md) and do not +requirements for [Docker Desktop for Windows](../desktop/windows/install.md) and do not need VirtualBox. {: .important} diff --git a/compose/install.md b/compose/install.md index f4090f1a8e..fc639015e8 100644 --- a/compose/install.md +++ b/compose/install.md @@ -63,7 +63,7 @@ For installation instructions, see [Install Docker Desktop on Mac](../desktop/ma **Docker Desktop for Windows** includes Compose along with other Docker apps, so most Windows users do not need to -install Compose separately. For install instructions, see [Install Docker Desktop on Windows](../docker-for-windows/install.md). +install Compose separately. For install instructions, see [Install Docker Desktop on Windows](../desktop/windows/install.md). If you are running the Docker daemon and client directly on Microsoft Windows Server, follow the instructions in the Windows Server tab. diff --git a/desktop/backup-and-restore.md b/desktop/backup-and-restore.md index a29dd74fec..9ddc1429c6 100644 --- a/desktop/backup-and-restore.md +++ b/desktop/backup-and-restore.md @@ -52,12 +52,12 @@ computer. page in the storage section. After backing up your data, you can uninstall the current version of Docker Desktop -and install a different version ([Windows](../docker-for-windows/install.md) +and install a different version ([Windows](windows/install.md) [macOS](mac/install.md), or reset Docker Desktop to factory defaults. ## Restore your data -1. Use [`docker pull`]((../engine/reference/commandline/load.md)) to restore images +1. Use [`docker pull`](../engine/reference/commandline/load.md) to restore images you pushed to Docker Hub in "step 2." in the [save your data section](#save-your-data) If you backed up your images to a local tar file, use [`docker image load -i images.tar`](../engine/reference/commandline/load.md) diff --git a/desktop/dev-environments.md b/desktop/dev-environments.md index ea27497a10..a39731f9e1 100644 --- a/desktop/dev-environments.md +++ b/desktop/dev-environments.md @@ -23,7 +23,7 @@ To access Dev Environments, from the Docker menu, select **Dashboard** > **Dev E Dev Environments are available as part of Docker Desktop 3.5.0 release. Download and install **Docker Desktop 3.5.0** or higher: - [Mac](mac/release-notes.md) -- [Windows](../docker-for-windows/release-notes.md) +- [Windows](windows/release-notes.md) To get started with Dev Environments, you must have the following tools and extension installed on your machine: diff --git a/desktop/faqs.md b/desktop/faqs.md index 19128189da..82f04a17e3 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -13,7 +13,7 @@ toc_max: 2 ### What are the system requirements for Docker Desktop? -For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](../docker-for-windows/install.md#system-requirements). +For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](windows/install.md#system-requirements). ### What is an experimental feature? @@ -21,7 +21,7 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo ### Where can I find information about diagnosing and troubleshooting Docker Desktop issues? -You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](../docker-for-windows/troubleshoot.md). +You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](windows/troubleshoot.md). If you do not find a solution in Troubleshooting, browse issues on [docker/for-mac](https://github.com/docker/for-mac/issues){: target="_blank" rel="noopener" class="_"} or [docker/for-win](https://github.com/docker/for-win/issues){: target="_blank" rel="noopener" class="_"} GitHub repository, or create a new one. @@ -52,19 +52,19 @@ For details, see [Docker Engine API](../engine/api/index.md). Both Mac and Windows have a changing IP address (or none if you have no network access). On both Mac and Windows, we recommend that you connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. This is for development purposes and does not work in a production environment outside of Docker Desktop. For more information and examples, see how to connect from a container to a service on the host -[on Mac](mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](../docker-for-windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). +[on Mac](mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host). ### How do I connect to a container from Mac or Windows? We recommend that you publish a port, or connect from another container. Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work. For more information and examples, see -[I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](../docker-for-windows/networking.md#i-want-to-connect-to-a-container-from-the-mac). +[I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](windows/networking.md#i-want-to-connect-to-a-container-from-the-mac). ### How do I add custom CA certificates? Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client side certs, see -[Add TLS certificates on Mac](mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](../docker-for-windows/index.md#adding-tls-certificates). +[Add TLS certificates on Mac](mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](windows/index.md#adding-tls-certificates). ### Can I pass through a USB device to a container? @@ -79,7 +79,7 @@ problems and intermittent failures may still occur due to the way these apps virtualize the hardware. For these reasons, **Docker Desktop is not supported in nested virtualization scenarios**. It might work in some cases, and not in others. -For more information, see [Running Docker Desktop in nested virtualization scenarios](../docker-for-windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios). +For more information, see [Running Docker Desktop in nested virtualization scenarios](windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios). ### Docker Desktop's UI appears green, distorted, or has visual artifacts. How do I fix this? @@ -182,7 +182,7 @@ Docker Desktop uses the Windows Hyper-V features. While older Windows versions h ### Can I install Docker Desktop on Windows 10 Home? -If you are running Windows 10 Home (starting with version 1903), you can install [Docker Desktop for Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows/){: target="_blank" rel="noopener" class="_"} with the [WSL 2 backend](../docker-for-windows/wsl.md). +If you are running Windows 10 Home (starting with version 1903), you can install [Docker Desktop for Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows/){: target="_blank" rel="noopener" class="_"} with the [WSL 2 backend](windows/wsl.md). ### Can I run Docker Desktop on Windows Server? @@ -205,19 +205,19 @@ Right-click to add the user to the group. Log out and log back in for the change ### Why does Docker Desktop fail to start when anti-virus software is installed? Some anti-virus software may be incompatible with Hyper-V and Windows 10 builds which impact Docker -Desktop. For more information, see [Docker Desktop fails to start when anti-virus software is installed](../docker-for-windows/troubleshoot.md#docker-desktop-fails-to-start-when-anti-virus-software-is-installed). +Desktop. For more information, see [Docker Desktop fails to start when anti-virus software is installed](windows/troubleshoot.md#docker-desktop-fails-to-start-when-anti-virus-software-is-installed). ### Can I change permissions on shared volumes for container-specific deployment requirements? Docker Desktop does not enable you to control (`chmod`) -the Unix-style permissions on [shared volumes](../docker-for-windows/index.md#file-sharing) for +the Unix-style permissions on [shared volumes](windows/index.md#file-sharing) for deployed containers, but rather sets permissions to a default value of [0777](http://permissions-calculator.org/decode/0777/){: target="_blank" rel="noopener" class="_"} (`read`, `write`, `execute` permissions for `user` and for `group`) which is not configurable. For workarounds and to learn more, see -[Permissions errors on data directories for shared volumes](../docker-for-windows/troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes). +[Permissions errors on data directories for shared volumes](windows/troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes). ### How do symlinks work on Windows? diff --git a/desktop/index.md b/desktop/index.md index 44c4d96555..affbdf8c14 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -27,18 +27,18 @@ Some of the key features of Docker Desktop include: Docker Desktop is available for Mac and Windows. For download information, system requirements, and installation instructions, see: * [Install Docker Desktop on Mac](mac/install.md) -* [Install Docker Desktop on Windows](../docker-for-windows/install.md) +* [Install Docker Desktop on Windows](windows/install.md) ## Configure Docker Desktop To learn about the various UI options and their usage, see: * [Docker Desktop for Mac user manual](mac/index.md) -* [Docker Desktop for Windows user manual](../docker-for-windows/index.md) +* [Docker Desktop for Windows user manual](windows/index.md) ## Release notes For information about new features, improvements, and bug fixes in Docker Desktop releases, see: * [Docker Desktop for Mac Release notes](mac/release-notes.md) -* [Docker Desktop for Windows Release notes](../docker-for-windows/release-notes.md) +* [Docker Desktop for Windows Release notes](windows/release-notes.md) diff --git a/desktop/mac/release-notes.md b/desktop/mac/release-notes.md index cb959cbbf3..8a9eeb6fc6 100644 --- a/desktop/mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -138,7 +138,7 @@ This page contains information about the new features, improvements, known issue **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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. -**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../../docker-for-windows/install.md#updates). +**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../windows/install.md#updates). ### Deprecation diff --git a/desktop/mac/troubleshoot.md b/desktop/mac/troubleshoot.md index 0494a9ff1a..17f3817894 100644 --- a/desktop/mac/troubleshoot.md +++ b/desktop/mac/troubleshoot.md @@ -420,7 +420,7 @@ As a Team, you can get support for Docker Desktop for the number of machines equ Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages: * [Mac system requirements](install.md#system-requirements) -* [Windows system requirements](../../docker-for-windows/install.md#system-requirements) +* [Windows system requirements](../windows/install.md#system-requirements) ### Can I run Docker Desktop on Virtualized hardware? diff --git a/docker-for-windows/Makefile b/desktop/windows/Makefile similarity index 100% rename from docker-for-windows/Makefile rename to desktop/windows/Makefile diff --git a/docker-for-windows/edge-release-notes.md b/desktop/windows/edge-release-notes.md similarity index 99% rename from docker-for-windows/edge-release-notes.md rename to desktop/windows/edge-release-notes.md index 0b03ec1ea7..4b59daee07 100644 --- a/docker-for-windows/edge-release-notes.md +++ b/desktop/windows/edge-release-notes.md @@ -636,7 +636,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](https://docs.docker.com/docker-for-windows/wsl/). +- **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.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: @@ -711,7 +711,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus #### New -- [Docker Desktop WSL 2 Tech Preview](https://docs.docker.com/docker-for-windows/wsl/) +- [Docker Desktop WSL 2 Tech Preview](wsl.md) #### Bug fixes and minor changes @@ -1140,7 +1140,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 https://docs.docker.com/docker-for-windows/kubernetes/ + - 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). - 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 @@ -2114,7 +2114,7 @@ Unreleased. See Beta 23 for changes. **New** -* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [Getting Started](index.md#download-docker-for-windows). +* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](install.md). * Removed the docker host name. Containers with exported ports are reachable via localhost. diff --git a/docker-for-windows/images/desktop-win-2fa.png b/desktop/windows/images/desktop-win-2fa.png similarity index 100% rename from docker-for-windows/images/desktop-win-2fa.png rename to desktop/windows/images/desktop-win-2fa.png diff --git a/docker-for-windows/images/diagnose-support.png b/desktop/windows/images/diagnose-support.png similarity index 100% rename from docker-for-windows/images/diagnose-support.png rename to desktop/windows/images/diagnose-support.png diff --git a/docker-for-windows/images/docker-app-search.png b/desktop/windows/images/docker-app-search.png similarity index 100% rename from docker-for-windows/images/docker-app-search.png rename to desktop/windows/images/docker-app-search.png diff --git a/docker-for-windows/images/docker-app-welcome.png b/desktop/windows/images/docker-app-welcome.png similarity index 100% rename from docker-for-windows/images/docker-app-welcome.png rename to desktop/windows/images/docker-app-welcome.png diff --git a/docker-for-windows/images/docker-menu-context-switch.png b/desktop/windows/images/docker-menu-context-switch.png similarity index 100% rename from docker-for-windows/images/docker-menu-context-switch.png rename to desktop/windows/images/docker-menu-context-switch.png diff --git a/docker-for-windows/images/docker-menu-settings.png b/desktop/windows/images/docker-menu-settings.png similarity index 100% rename from docker-for-windows/images/docker-menu-settings.png rename to desktop/windows/images/docker-menu-settings.png diff --git a/docker-for-windows/images/docker-menu-switch.png b/desktop/windows/images/docker-menu-switch.png similarity index 100% rename from docker-for-windows/images/docker-menu-switch.png rename to desktop/windows/images/docker-menu-switch.png diff --git a/docker-for-windows/images/docker-tutorial-win.png b/desktop/windows/images/docker-tutorial-win.png similarity index 100% rename from docker-for-windows/images/docker-tutorial-win.png rename to desktop/windows/images/docker-tutorial-win.png diff --git a/docker-for-windows/images/hyperv-enabled.png b/desktop/windows/images/hyperv-enabled.png similarity index 100% rename from docker-for-windows/images/hyperv-enabled.png rename to desktop/windows/images/hyperv-enabled.png diff --git a/docker-for-windows/images/hyperv-manager.png b/desktop/windows/images/hyperv-manager.png similarity index 100% rename from docker-for-windows/images/hyperv-manager.png rename to desktop/windows/images/hyperv-manager.png diff --git a/docker-for-windows/images/issue-template.png b/desktop/windows/images/issue-template.png similarity index 100% rename from docker-for-windows/images/issue-template.png rename to desktop/windows/images/issue-template.png diff --git a/docker-for-windows/images/nginx-homepage.png b/desktop/windows/images/nginx-homepage.png similarity index 100% rename from docker-for-windows/images/nginx-homepage.png rename to desktop/windows/images/nginx-homepage.png diff --git a/docker-for-windows/images/redis-container.png b/desktop/windows/images/redis-container.png similarity index 100% rename from docker-for-windows/images/redis-container.png rename to desktop/windows/images/redis-container.png diff --git a/docker-for-windows/images/settings-general.png b/desktop/windows/images/settings-general.png similarity index 100% rename from docker-for-windows/images/settings-general.png rename to desktop/windows/images/settings-general.png diff --git a/docker-for-windows/images/settings-resources.png b/desktop/windows/images/settings-resources.png similarity index 100% rename from docker-for-windows/images/settings-resources.png rename to desktop/windows/images/settings-resources.png diff --git a/docker-for-windows/images/shared-folder-on-demand.png b/desktop/windows/images/shared-folder-on-demand.png similarity index 100% rename from docker-for-windows/images/shared-folder-on-demand.png rename to desktop/windows/images/shared-folder-on-demand.png diff --git a/docker-for-windows/images/troubleshoot.png b/desktop/windows/images/troubleshoot.png similarity index 100% rename from docker-for-windows/images/troubleshoot.png rename to desktop/windows/images/troubleshoot.png diff --git a/docker-for-windows/images/virtualization-enabled.png b/desktop/windows/images/virtualization-enabled.png similarity index 100% rename from docker-for-windows/images/virtualization-enabled.png rename to desktop/windows/images/virtualization-enabled.png diff --git a/docker-for-windows/images/whale-icon-systray-hidden.png b/desktop/windows/images/whale-icon-systray-hidden.png similarity index 100% rename from docker-for-windows/images/whale-icon-systray-hidden.png rename to desktop/windows/images/whale-icon-systray-hidden.png diff --git a/docker-for-windows/images/whale-icon-systray.png b/desktop/windows/images/whale-icon-systray.png similarity index 100% rename from docker-for-windows/images/whale-icon-systray.png rename to desktop/windows/images/whale-icon-systray.png diff --git a/docker-for-windows/images/whale-x.png b/desktop/windows/images/whale-x.png similarity index 100% rename from docker-for-windows/images/whale-x.png rename to desktop/windows/images/whale-x.png diff --git a/docker-for-windows/images/wsl2-choose-distro.png b/desktop/windows/images/wsl2-choose-distro.png similarity index 100% rename from docker-for-windows/images/wsl2-choose-distro.png rename to desktop/windows/images/wsl2-choose-distro.png diff --git a/docker-for-windows/images/wsl2-context.png b/desktop/windows/images/wsl2-context.png similarity index 100% rename from docker-for-windows/images/wsl2-context.png rename to desktop/windows/images/wsl2-context.png diff --git a/docker-for-windows/images/wsl2-enable.png b/desktop/windows/images/wsl2-enable.png similarity index 100% rename from docker-for-windows/images/wsl2-enable.png rename to desktop/windows/images/wsl2-enable.png diff --git a/docker-for-windows/images/wsl2-enabled.png b/desktop/windows/images/wsl2-enabled.png similarity index 100% rename from docker-for-windows/images/wsl2-enabled.png rename to desktop/windows/images/wsl2-enabled.png diff --git a/docker-for-windows/images/wsl2-ui.png b/desktop/windows/images/wsl2-ui.png similarity index 100% rename from docker-for-windows/images/wsl2-ui.png rename to desktop/windows/images/wsl2-ui.png diff --git a/docker-for-windows/index.md b/desktop/windows/index.md similarity index 95% rename from docker-for-windows/index.md rename to desktop/windows/index.md index 417f6384a6..d02885f909 100644 --- a/docker-for-windows/index.md +++ b/desktop/windows/index.md @@ -2,6 +2,7 @@ description: Getting Started keywords: windows, edge, tutorial, run, docker, local, machine redirect_from: +- /docker-for-windows/ - /docker-for-windows/index/ - /docker-for-windows/started/ - /engine/installation/windows/ @@ -121,8 +122,8 @@ File share settings are: > * Shared folders are designed to allow application code to be edited on the host while being executed in containers. For non-code items such as cache directories or databases, the performance will be much better if they are stored in - the Linux VM, using a [data volume](../storage/volumes.md) - (named volume) or [data container](../storage/volumes.md). + the Linux VM, using a [data volume](../../storage/volumes.md) + (named volume) or [data container](../../storage/volumes.md). > * Docker Desktop sets permissions to read/write/execute for users, groups and others [0777 or a+rwx](http://permissions-calculator.org/decode/0777/). This is not configurable. See [Permissions errors on data directories for shared volumes](troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes). @@ -267,7 +268,7 @@ Server: Docker Engine - Community Docker Desktop includes a standalone Kubernetes server that runs on your Windows machine, so that you can test deploying your Docker workloads on Kubernetes. To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**. -For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../desktop/kubernetes.md){:target="_blank" rel="noopener" class="_"}. +For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../kubernetes.md){:target="_blank" rel="noopener" class="_"}. ### Reset @@ -323,16 +324,16 @@ again when you switch back. ## Dashboard -The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and Docker Compose applications. For more information, see [Docker Desktop Dashboard](../desktop/dashboard.md). +The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md). ## Docker Hub Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories directly from the Docker Desktop menu. -For more information, refer to the following [Docker Hub topics](../docker-hub/index.md){: target="_blank" rel="noopener" class="_" }: +For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){: target="_blank" rel="noopener" class="_" }: -* [Organizations and Teams in Docker Hub](../docker-hub/orgs.md){: target="_blank" rel="noopener" class="_" } -* [Builds and Images](../docker-hub/builds/index.md){: target="_blank" rel="noopener" class="_" } +* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){: target="_blank" rel="noopener" class="_" } +* [Builds and Images](../../docker-hub/builds/index.md){: target="_blank" rel="noopener" class="_" } ### Two-factor authentication @@ -366,7 +367,7 @@ Docker Desktop creates a certificate bundle of all user-trusted CAs based on the Windows certificate store, and appends it to Moby trusted certificates. Therefore, if an enterprise SSL certificate is trusted by the user on the host, it is trusted by Docker Desktop. To learn more about how to install a CA root certificate for the registry, see -[Verify repository client with certificates](../engine/security/certificates.md) +[Verify repository client with certificates](../../engine/security/certificates.md) in the Docker Engine topics. ### How do I add client certificates? @@ -389,12 +390,12 @@ certificates. Commands like `docker run` that attempt to pull from the registry produce error messages on the command line, as well as on the registry. To learn more about how to set the client TLS certificate for verification, see -[Verify repository client with certificates](../engine/security/certificates.md) +[Verify repository client with certificates](../../engine/security/certificates.md) in the Docker Engine topics. ## Where to go next -* Try out the walkthrough at [Get Started](../get-started/index.md){: target="_blank" rel="noopener" class="_"}. +* Try out the walkthrough at [Get Started](../../get-started/index.md){: target="_blank" rel="noopener" class="_"}. * Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code. diff --git a/docker-for-windows/install.md b/desktop/windows/install.md similarity index 93% rename from docker-for-windows/install.md rename to desktop/windows/install.md index 16127e20b1..dc557972e2 100644 --- a/docker-for-windows/install.md +++ b/desktop/windows/install.md @@ -3,6 +3,7 @@ description: How to install Docker Desktop for Windows keywords: windows, install, download, run, docker, local title: Install Docker Desktop on Windows redirect_from: +- /docker-for-windows/install/ - /docker-ee-for-windows/install/ - /docker-for-windows/install-windows-home/ - /ee/docker-ee/windows/docker-ee/ @@ -71,9 +72,9 @@ Hyper-V on Windows 10: ### What's included in the installer -The Docker Desktop installation includes [Docker Engine](../engine/index.md), -Docker CLI client, [Docker Compose](../compose/index.md), -[Docker Content Trust](../engine/security/trust/index.md), +The Docker Desktop installation includes [Docker Engine](../../engine/index.md), +Docker CLI client, [Docker Compose](../../compose/index.md), +[Docker Content Trust](../../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). @@ -83,7 +84,7 @@ accounts use the same VM to build and run containers. Note that it is not possib Nested virtualization scenarios, such as running Docker Desktop on a VMWare or Parallels instance might work, but there are no guarantees. For -more information, see [Running Docker Desktop in nested virtualization scenarios](troubleshoot.md#running-docker-desktop-for-windows-in-nested-virtualization-scenarios). +more information, see [Running Docker Desktop in nested virtualization scenarios](troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios). ### About Windows containers @@ -126,7 +127,7 @@ When the whale icon in the status bar stays steady, Docker Desktop is up-and-run ![whale on taskbar](images/whale-icon-systray.png) If the whale icon is hidden in the Notifications area, click the up arrow on the -taskbar to show it. To learn more, see [Docker Settings](index.md#docker-settings-dialog). +taskbar to show it. To learn more, see [Docker Settings](index.md#settings). ## Quick Start Guide @@ -154,7 +155,7 @@ To uninstall Docker Desktop from your Windows machine: > > Uninstalling Docker Desktop destroys Docker containers, images, volumes, and > other Docker related data local to the machine, and removes the files generated -> by the application. Refer to the [back up and restore data](../desktop/backup-and-restore.md) +> by the application. Refer to the [back up and restore data](../backup-and-restore.md) > section to learn how to preserve important data before uninstalling. ## Where to go next @@ -164,6 +165,6 @@ To uninstall Docker Desktop from your Windows machine: deploy a multi-service stack. * [Troubleshooting](troubleshoot.md) describes common problems, workarounds, and how to get support. -* [FAQs](../desktop/faqs.md) provide answers to frequently asked questions. +* [FAQs](../faqs.md) provide answers to frequently asked questions. * [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. -* [Back up and restore data](../desktop/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. +* [Back up and restore data](../backup-and-restore.md) provides instructions on backing up and restoring data related to Docker. diff --git a/docker-for-windows/networking.md b/desktop/windows/networking.md similarity index 97% rename from docker-for-windows/networking.md rename to desktop/windows/networking.md index c53eb09924..6d764d47d3 100644 --- a/docker-for-windows/networking.md +++ b/desktop/windows/networking.md @@ -4,6 +4,7 @@ keywords: windows, networking title: Networking features in Docker Desktop for Windows redirect_from: - /docker-for-win/networking/ +- /docker-for-windows/networking/ --- {% assign Arch = 'Windows' %} @@ -125,5 +126,5 @@ container to random ports on the host. $ docker run -d -P --name webserver nginx ``` -See the [run command](../engine/reference/commandline/run.md) for more details on +See the [run command](../../engine/reference/commandline/run.md) for more details on publish options used with `docker run`. diff --git a/docker-for-windows/previous-versions.md b/desktop/windows/previous-versions.md similarity index 99% rename from docker-for-windows/previous-versions.md rename to desktop/windows/previous-versions.md index 0202d91694..00b0567001 100644 --- a/docker-for-windows/previous-versions.md +++ b/desktop/windows/previous-versions.md @@ -4,6 +4,8 @@ keywords: Docker Desktop for Windows, release notes title: Release notes for previous versions toc_min: 1 toc_max: 2 +redirect_from: +- /docker-for-windows/previous-versions/ --- This page contains release notes for older versions of Docker Desktop for Windows. @@ -366,9 +368,9 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New - **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](../desktop/dashboard.md). +For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../dashboard.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](https://docs.docker.com/docker-for-windows/wsl/). +- **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.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: @@ -640,7 +642,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: - 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 https://docs.docker.com/docker-for-windows/kubernetes/ + - 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) * 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](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes) diff --git a/docker-for-windows/release-notes.md b/desktop/windows/release-notes.md similarity index 87% rename from docker-for-windows/release-notes.md rename to desktop/windows/release-notes.md index de28287662..25ad881619 100644 --- a/docker-for-windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -4,6 +4,7 @@ keywords: Docker Desktop for Windows, release notes redirect_from: - /winkit/release-notes/ - /docker-for-windows/edge-release-notes/ +- /docker-for-windows/release-notes/ title: Docker for Windows release notes toc_min: 1 toc_max: 2 @@ -20,8 +21,8 @@ This page contains information about the new features, improvements, known issue ### New -- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../desktop/dev-environments.md#start-a-dev-environment-from-a-local-folder). -- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes). +- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../dev-environments.md#start-a-dev-environment-from-a-local-folder). +- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../dashboard.md#explore-volumes). ### Upgrades @@ -55,7 +56,7 @@ This page contains information about the new features, improvements, known issue ### 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](../desktop/dev-environments.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](../dev-environments.md). ### Upgrades @@ -86,9 +87,9 @@ This page contains information about the new features, improvements, known issue ### 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](../desktop/dev-environments.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](../dev-environments.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. For more information, see [Compose V2 beta](../compose/cli-command.md). 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](../compose/cli-command-compatibility.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. +**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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. ### Bug fixes and minor changes @@ -102,9 +103,9 @@ This page contains information about the new features, improvements, known issue ### 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](../desktop/dev-environments.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](../dev-environments.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. For more information, see [Compose V2 beta](../compose/cli-command.md). 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](../compose/cli-command-compatibility.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. +**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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. ### Upgrades @@ -136,11 +137,11 @@ This page contains information about the new features, improvements, known issue ### New -**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes). +**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../dashboard.md#explore-volumes). -**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. For more information, see [Compose V2 beta](../compose/cli-command.md). 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](../compose/cli-command-compatibility.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. +**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. For more information, see [Compose V2 beta](../../compose/cli-command.md). 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](../../compose/cli-command-compatibility.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. -**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../docker-for-windows/install.md#updates). +**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](install.md#updates). ### Deprecation diff --git a/docker-for-windows/troubleshoot.md b/desktop/windows/troubleshoot.md similarity index 97% rename from docker-for-windows/troubleshoot.md rename to desktop/windows/troubleshoot.md index afd4754d4d..7d6b78f064 100644 --- a/docker-for-windows/troubleshoot.md +++ b/desktop/windows/troubleshoot.md @@ -4,6 +4,7 @@ keywords: windows, troubleshooting, logs, issues redirect_from: - /windows/troubleshoot/ - /docker-for-win/troubleshoot/ +- /docker-for-windows/troubleshoot/ title: Logs and troubleshooting toc_max: 2 --- @@ -142,14 +143,14 @@ volumes or find a way to make the applications work with the default file permissions. See also, -[Can I change permissions on shared volumes for container-specific deployment requirements?](../desktop/faqs.md#can-i-change-permissions-on-shared-volumes-for-container-specific-deployment-requirements) +[Can I change permissions on shared volumes for container-specific deployment requirements?](../faqs.md#can-i-change-permissions-on-shared-volumes-for-container-specific-deployment-requirements) in the FAQs. #### Volume mounting requires shared folders for Linux containers If you are using mounted volumes and get runtime errors indicating an application file is not found, access is denied to a volume mount, or a service -cannot start, such as when using [Docker Compose](../compose/gettingstarted.md), +cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md), you might need to enable [shared folders](index.md#file-sharing). With the Hyper-V backend, mounting files from Windows requires shared folders for Linux containers. Click ![whale menu](images/whale-x.png){: .inline} @@ -158,7 +159,7 @@ Dockerfile and volume. #### Support for symlinks -Symlinks work within and across containers. To learn more, see [How do symlinks work on Windows?](../desktop/faqs.md#how-do-symlinks-work-on-windows) in the FAQs. +Symlinks work within and across containers. To learn more, see [How do symlinks work on Windows?](../faqs.md#how-do-symlinks-work-on-windows) in the FAQs. #### Avoid unexpected syntax errors, use Unix style line endings for files in containers @@ -413,8 +414,8 @@ As a Team, you can get support for Docker Desktop for the number of machines equ Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages: -* [Windows system requirements](../docker-for-windows/install.md#system-requirements) -* [Mac system requirements](../desktop/mac/install.md#system-requirements) +* [Windows system requirements](install.md#system-requirements) +* [Mac system requirements](../mac/install.md#system-requirements) ### Can I run Docker Desktop on Virtualized hardware? diff --git a/docker-for-windows/wsl.md b/desktop/windows/wsl.md similarity index 99% rename from docker-for-windows/wsl.md rename to desktop/windows/wsl.md index 99aadc430b..0637202448 100644 --- a/docker-for-windows/wsl.md +++ b/desktop/windows/wsl.md @@ -2,6 +2,7 @@ description: Docker Desktop WSL 2 backend keywords: WSL, WSL 2 Tech Preview, Windows Subsystem for Linux, WSL 2 backend Docker redirect_from: +- /docker-for-windows/wsl/ - /docker-for-windows/wsl-tech-preview/ title: Docker Desktop WSL 2 backend toc_min: 2 diff --git a/engine/breaking_changes.md b/engine/breaking_changes.md index 20a910eafb..eb57e37613 100644 --- a/engine/breaking_changes.md +++ b/engine/breaking_changes.md @@ -18,7 +18,7 @@ backwards-incompatibility for old versions of Docker tools. > **Note**: In the case of your local environment, you should be updating your Docker Engine using [Docker Desktop for Mac](../desktop/mac/index.md), - [Docker Desktop for Windows](../docker-for-windows/index.md). That way all your tools stay + [Docker Desktop for Windows](../desktop/windows/index.md). That way all your tools stay in sync with Docker Engine. ## Engine 1.10 diff --git a/engine/install/index.md b/engine/install/index.md index 4e6ae12fc5..339e20aa27 100644 --- a/engine/install/index.md +++ b/engine/install/index.md @@ -32,7 +32,7 @@ redirect_from: ## Supported platforms Docker Engine is available on a variety of [Linux platforms](#server), -[macOS](../../desktop/mac/install.md) and [Windows 10](../../docker-for-windows/install.md) +[macOS](../../desktop/mac/install.md) and [Windows 10](../../desktop/windows/install.md) through Docker Desktop, and as a [static binary installation](binaries.md). Find your preferred operating system below. @@ -43,7 +43,7 @@ your preferred operating system below. | Platform | x86_64 / amd64 | arm64 (Apple Silicon) | |:------------------------------------------------------------------|:------------------------------------------------:|:------------------------------------------------:| | [Docker Desktop for Mac (macOS)](../../desktop/mac/install.md) | [{{ yes }}](../../desktop/mac/install.md) | [{{ yes }}](../../desktop/mac/install.md) | -| [Docker Desktop for Windows](../../docker-for-windows/install.md) | [{{ yes }}](../../docker-for-windows/install.md) | | +| [Docker Desktop for Windows](../../desktop/windows/install.md) | [{{ yes }}](../../desktop/windows/install.md) | | ### Server diff --git a/engine/swarm/swarm-tutorial/index.md b/engine/swarm/swarm-tutorial/index.md index fa6bf1771e..1a269f5ee7 100644 --- a/engine/swarm/swarm-tutorial/index.md +++ b/engine/swarm/swarm-tutorial/index.md @@ -57,7 +57,7 @@ single-node and multi-node swarm scenarios on Linux machines. #### Use Docker Desktop for Mac or Docker Desktop for Windows Alternatively, install the latest [Docker Desktop for Mac](../../../desktop/mac/index.md) or -[Docker Desktop for Windows](../../../docker-for-windows/index.md) application on one +[Docker Desktop for Windows](../../../desktop/windows/index.md) application on one computer. You can test both single-node and multi-node swarm from this computer, but you need to use Docker Machine to test the multi-node scenarios. diff --git a/get-docker.md b/get-docker.md index af8b804c6f..417d29cb9a 100644 --- a/get-docker.md +++ b/get-docker.md @@ -34,9 +34,9 @@ section and choose the best installation path for you.
- Docker Desktop for Windows + Docker Desktop for Windows
-

Docker Desktop for Windows

+

Docker Desktop for Windows

A native Windows application which delivers all Docker tools to your Windows computer.

diff --git a/get-started/index.md b/get-started/index.md index f36e545b69..f60620149a 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -85,7 +85,7 @@ machine. If you do not have Docker installed, choose your preferred operating sy [Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn} [Linux](../engine/install/index.md){: .button .primary-btn} -For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../docker-for-windows/install.md). +For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../desktop/windows/install.md). {% include eula.md %} diff --git a/machine/get-started.md b/machine/get-started.md index cedffb335a..09fff99f50 100644 --- a/machine/get-started.md +++ b/machine/get-started.md @@ -15,7 +15,7 @@ page on GitHub. ## Prerequisite information With the advent of [Docker Desktop for Mac](../desktop/mac/index.md) and -[Docker Desktop for Windows](../docker-for-windows/index.md), we recommend that you use these for your +[Docker Desktop for Windows](../desktop/windows/index.md), we recommend that you use these for your primary Docker workflows. You can use these applications to run Docker natively on your local system without using Docker Machine at all. @@ -42,7 +42,7 @@ driver. The prerequisites are: -* Have Docker Desktop for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker Desktop for Windows](../docker-for-windows/install.md#what-to-know-before-you-install)). +* Have Docker Desktop for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker Desktop for Windows](../desktop/windows/install.md#what-to-know-before-you-install)). * Set up the Hyper-V driver to use an external virtual network switch See the [Docker Machine driver for Microsoft Hyper-V](drivers/hyper-v.md) topic, diff --git a/machine/index.md b/machine/index.md index 7ef73a224a..cc8e229e1b 100644 --- a/machine/index.md +++ b/machine/index.md @@ -31,7 +31,7 @@ point to a host called `default`, follow on-screen instructions to complete Machine _was_ the _only_ way to run Docker on Mac or Windows previous to Docker v1.12. Starting with the beta program and Docker v1.12, [Docker Desktop for Mac](../desktop/mac/index.md) and -[Docker Desktop for Windows](../docker-for-windows/index.md) are available as native apps and the +[Docker Desktop for Windows](../desktop/windows/index.md) are available as native apps and the better choice for this use case on newer desktops and laptops. We encourage you to try out these new apps. @@ -52,7 +52,7 @@ Docker Machine has these two broad use cases. ![Docker Machine on Mac and Windows](img/machine-mac-win.png){: .white-bg} - If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../desktop/mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally. + If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../desktop/mac/index.md) and [Docker Desktop for Windows](../desktop/windows/index.md) apps, then you need Docker Machine to run Docker Engine locally. * **I want to provision Docker hosts on remote systems** diff --git a/machine/install-machine.md b/machine/install-machine.md index 4584b114c9..dd17e4ca91 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -107,7 +107,7 @@ To uninstall Docker Machine: Removing machines is an optional step because there are cases where you might want to save and migrate existing machines to a [Docker for Mac](../desktop/mac/index.md) or - [Docker Desktop for Windows](../docker-for-windows/index.md) environment, + [Docker Desktop for Windows](../desktop/windows/index.md) environment, for example. * Remove the executable: `rm $(which docker-machine)` diff --git a/registry/insecure.md b/registry/insecure.md index baf2a0af89..2de2d30c8e 100644 --- a/registry/insecure.md +++ b/registry/insecure.md @@ -101,7 +101,7 @@ This is more secure than the insecure registry solution. Restart Docker. - **Docker Desktop for Windows**: Follow the instructions in - [Adding custom CA certificates](../docker-for-windows/index.md#adding-tls-certificates){: target="_blank" rel="noopener" class="_"}. + [Adding custom CA certificates](../desktop/windows/index.md#adding-tls-certificates){: target="_blank" rel="noopener" class="_"}. Restart Docker. diff --git a/release-notes/index.md b/release-notes/index.md index 9f15ccfcb1..89156ecc06 100644 --- a/release-notes/index.md +++ b/release-notes/index.md @@ -11,6 +11,6 @@ that you regularly visit the release notes to learn about updates. - [Docker Engine](../engine/release-notes/index.md) - [Docker Desktop for Mac](../desktop/mac/release-notes.md) -- [Docker Desktop for Windows](../docker-for-windows/release-notes.md) +- [Docker Desktop for Windows](../desktop/windows/release-notes.md) - [Docker Hub](../docker-hub/release-notes.md) - [Docker Compose](../compose/release-notes.md) diff --git a/samples/aspnet-mssql-compose.md b/samples/aspnet-mssql-compose.md index f4e553fdf8..eb913841c3 100644 --- a/samples/aspnet-mssql-compose.md +++ b/samples/aspnet-mssql-compose.md @@ -27,7 +27,7 @@ configure this app to use our SQL Server database, and then create a 1. Create a new directory for your application. This directory is the context of your docker-compose project. For - [Docker Desktop for Windows](../docker-for-windows/index.md#file-sharing) and + [Docker Desktop for Windows](../desktop/windows/index.md#file-sharing) and [Docker Desktop for Mac](../desktop/mac/index.md#file-sharing), you need to set up file sharing for the volume that you need to map. @@ -177,7 +177,7 @@ configure this app to use our SQL Server database, and then create a 1. Make sure you allocate at least 2GB of memory to Docker Engine. Here is how to do it on [Docker Desktop for Mac](../desktop/mac/index.md#advanced) and - [Docker Desktop for Windows](../docker-for-windows/index.md#advanced). + [Docker Desktop for Windows](../desktop/windows/index.md#advanced). This is necessary to run the SQL Server on Linux container. 1. Run the `docker-compose up` command. After a few seconds, you should be able diff --git a/samples/dotnetcore.md b/samples/dotnetcore.md index 27e5e3de7d..77155595fa 100644 --- a/samples/dotnetcore.md +++ b/samples/dotnetcore.md @@ -40,8 +40,8 @@ clone our [ASP.NET Docker Sample](https://github.com/dotnet/dotnet-docker/tree/m [Windows Containers](https://docs.microsoft.com/virtualization/windowscontainers/about/). The tags below are multi-arch meaning they pull either Windows or Linux containers depending on what mode is set in - [Docker Desktop for Windows](../docker-for-windows/index.md). Read more on - [switching containers](../docker-for-windows/index.md#switch-between-windows-and-linux-containers). + [Docker Desktop for Windows](../desktop/windows/index.md). Read more on + [switching containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers). 3. The `Dockerfile` assumes that your application is called `aspnetapp`. Change the `Dockerfile` to use the DLL file of your project. @@ -80,8 +80,8 @@ obj/ [Windows Containers](https://docs.microsoft.com/virtualization/windowscontainers/about/). The tags below are multi-arch meaning they pull either Windows or Linux containers depending on what mode is set in - [Docker Desktop for Windows](../docker-for-windows/index.md). Read more on - [switching containers](../docker-for-windows/index.md#switch-between-windows-and-linux-containers). + [Docker Desktop for Windows](../desktop/windows/index.md). Read more on + [switching containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers). 3. The `Dockerfile` assumes that your application is called `aspnetapp`. Change the `Dockerfile` to use the DLL file of your project. This method assumes that your project is already built and it copies the build artifacts from the publish folder. Refer to the Microsoft documentation on [Containerize a .Net Core app](https://docs.microsoft.com/en-us/dotnet/core/docker/build-container?tabs=windows#create-the-dockerfile){: target="blank" rel="noopener" class=“"}. The `docker build` step here will be much faster than method 1, as all the artifacts are built outside of the `docker build` step and the size of the base image is much smaller compared to the build base image. @@ -113,7 +113,7 @@ $ docker run -d -p 8080:80 --name myapp aspnetapp ## View the web page running from a container * Go to [localhost:8080](http://localhost:8080) to access your app in a web browser. -* If you are using the Nano [Windows Container](../docker-for-windows/index.md) +* If you are using the Nano [Windows Container](../desktop/windows/index.md) and have not updated to the Windows Creator Update there is a bug affecting how [Windows 10 talks to Containers via "NAT"](https://github.com/Microsoft/Virtualization-Documentation/issues/181#issuecomment-252671828) (Network Address Translation). You must hit the IP of the container diff --git a/toolbox/index.md b/toolbox/index.md index 78ae062b55..ea4edf314c 100644 --- a/toolbox/index.md +++ b/toolbox/index.md @@ -20,7 +20,7 @@ toc_max: 2 > > Docker Toolbox has been deprecated and is no longer in active development. Please > use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/mac/index.md) -> and [Docker Desktop for Windows](../docker-for-windows/index.md). +> and [Docker Desktop for Windows](../desktop/windows/index.md). {: .warning } This page explains how to migrate your Docker Toolbox installation to Docker Desktop. @@ -121,7 +121,7 @@ To uninstall Toolbox on Windows: ``` This step is optional because if you plan to re-install Docker Machine as a - part of [Docker Desktop for Windows](../docker-for-windows/index.md), you can + part of [Docker Desktop for Windows](../desktop/windows/index.md), you can import and continue to manage those machines through Docker. 3. Uninstall Docker Toolbox using Window's standard process for uninstalling programs through the control panel (programs and features). From 6885bb0140f44850c9622e4475e7b6479c436172 Mon Sep 17 00:00:00 2001 From: jerae-duffin <83294991+jerae-duffin@users.noreply.github.com> Date: Mon, 16 Aug 2021 05:42:29 -0500 Subject: [PATCH 4/7] updated upgrade your plan (#13347) * updated upgrade your plan * Moved the purchase plan section before upgrade Added an intro to the topic, reorganized the topic to display info on how to purchase a plan before we discuss how to upgrade an existing plan Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- subscription/index.md | 88 ++----------------------------------- subscription/upgrade.md | 97 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 96 insertions(+), 89 deletions(-) diff --git a/subscription/index.md b/subscription/index.md index 466fc06e58..78253ec5e8 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -17,11 +17,11 @@ Docker offers pricing plans that are tailored for individual developers and deve **For individuals:** -The **Pro** plan includes unlimited public repositories, unlimited private repositories, unlimited [collaborators](../repos.md#collaborators-and-their-role) for public repositories, one [service account](../repos.md#service-accounts) for private repositories, autobuilds with 5 parallel builds, starting at $5 per month with the annual subscription. +The **Pro** plan includes unlimited public repositories, unlimited private repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, one [service account](../docker-hub/service-accounts.md) for private repositories, autobuilds with 5 parallel builds, starting at $5 per month with the annual subscription. > **Note** > -> Pro plans allow one service account for private repositories. For more information, see [service accounts](../repos.md#service-accounts). If you already have more than one collaborator in your private repository, you’ll not be able to add any further collaborators. Any new private repository that you create will be restricted to one service account. +> Pro plans allow one service account for private repositories. For more information, see [service accounts](../docker-hub/service-accounts.md). If you already have more than one collaborator in your private repository, you’ll not be able to add any further collaborators. Any new private repository that you create will be restricted to one service account. The **Free** plan includes unlimited public repositories and unlimited collaborators for public repositories and zero service accounts for private repositories at no cost per month. @@ -31,88 +31,6 @@ The **Team** plan includes unlimited public and unlimited private repositories s The **Free Team** plan includes unlimited public repositories at no cost per month. This plan also offers advanced collaboration and management tools, including organization and team management with role-based access controls which are limited to 1 team and 3 team members. -For detailed information about the features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +For information on how to purchase a plan, see [Upgrade your plan](../subscription/upgrade.md), or to learn more about the features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. For frequently asked questions about pricing, see [Docker pricing FAQ](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}. - -### Purchase a Pro plan - -The following section contains information on how to purchase a Pro plan for new customers. - -To purchase a Pro plan: - -1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. - -2. The Docker Hub **Pricing** page displays information about the new pricing plans. - -3. Review the plan details in the **Pro** section and click **Buy Now**. - -4. The **Payment Method** page displays the cost for the annual plan by default. If you prefer to opt for the monthly plan, choose **pay monthly**. - -5. Enter the card details and click **Purchase**. - -6. Verify your email address. - -7. Open the drop-down menu next to your username in the top-right corner and select **Billing**. - - The **Billing** page displays information about your new Pro plan and the total cost. - -### Purchase a Team plan - -The following section contains information on how to purchase a Team plan for new organizations. - -To purchase a Team plan: - -1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. - -2. The Docker Hub **Pricing** page displays information about the new pricing plans. - -3. Review the plan details in the **Team** section and click **Buy Now**. - -4. Enter a name for your new organization and add a company name. - -5. The **Organization size** page displays the cost for the annual plan by default. If you prefer to change this, select **Pay Monthly**. - -6. Specify the number of users you’d like to add to your organization and click **Continue to Payment**. - -6. On the **Payment Method** page, enter the card details and click **Purchase**. - -7. Verify your email address. - -8. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Team plan and the total cost. - -## Update billing information - -> **Note** -> -> You must be on owner of the organization to make changes to the billing information. - -To update the billing information for your organization: - -1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. - -2. Select **Organizations** from the menu at the top of the page. This displays a list of organizations. - -3. Choose the organization from the list and select the **Billing** tab. - -4. Select **Payment Methods**. - -5. The **Payment Information** page displays your existing billing information and allows you to edit the details. - - > **Note** - > - > The details displayed in the **Contact Information** section is used to generate your invoice. All billing-related information is sent to the email address listed in this section. - -6. Change the details as required and then click **Update** to save your changes. - -To update the billing information for your user account: - -1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. - -2. Open the drop-down menu next to your username in the top-right corner and select **Billing**. The Billing page displays billing information about your existing user account. - -3. Select **Payment Methods**. - -4. The **Payment Information** page displays your existing billing information and allows you to edit the details. - -5. Click **Update** to save your changes. diff --git a/subscription/upgrade.md b/subscription/upgrade.md index 8f22268c40..16d3e66cc9 100644 --- a/subscription/upgrade.md +++ b/subscription/upgrade.md @@ -7,13 +7,66 @@ redirect_from: - /docker-hub/billing/upgrade/ --- -You can upgrade to a Pro or a Team plan from a Free plan, or from your current legacy plan. When you upgrade to a Pro or a Team plan, you will be able to immediately use all the features and entitlements offered in your new plan. For detailed information on features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +This page contains information on how to purchase a Pro or a Team plan. It also contains information on how to upgrade your existing plan and update your billing information. You can upgrade to a Pro or a Team plan from a Free plan, or from your current legacy plan. When you upgrade to a Pro or a Team plan, you can immediately use all the features and entitlements offered in your new plan. For detailed information on features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. ->**Note:** +> **Note:** > -If you were previously on a legacy per-repository plan, your plan has been converted to a new Pro or Team monthly plan. For details, see [Pricing FAQ](faq.md). +> If you were previously on a legacy per-repository plan, your plan has been converted to a new Pro or Team monthly plan. For details, see [Pricing FAQ](faq.md). -The following sections contain instructions on how to upgrade to Pro and Team plans. +## Purchase a Pro plan + +The following section contains information on how to purchase a Pro plan for new customers. + +To purchase a Pro plan: + +1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. + +2. Open the drop-down menu next to your username in the top-right corner and select **Billing** to go to the **Billing Details** page. This page displays billing information about your existing user account. + + The Docker Hub **Pricing** page displays information about the new pricing plans. + +3. Ensure you have selected your personal account on the left side of the **Billing Details** page. + +4. Click **Change plan**. + +5. Review the plan details in the **Pro** section and click **Upgrade Now**. + +5. The **Payment Method** page displays the cost for the annual plan by default. If you prefer to opt for the monthly plan, choose **pay monthly**. + +6. Enter the card details and click **Purchase**. + +7. Verify your email address. + +8. Open the drop-down menu next to your username in the top-right corner and select **Billing**. + + The **Billing** page displays information about your new Pro plan and the total cost. + +## Purchase a Team plan + +The following section contains information on how to purchase a Team plan for new organizations. If you do not have a team plan, click here to learn more on how to create a team. + +To purchase a Team plan: + +1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. + +2. Click **Organizations** in the toolbar and select your organization. + +3. Click the **Billing** tab and click **Change plan**. + The Docker Hub **Pricing** page displays information about the new pricing plans. + +4. Review the plan details in the **Team** section and click **Buy Now**. + +5. Enter a name for your new organization and add a company name. + +6. The **Organization size** page displays the cost for the annual plan by default. If you prefer to change this, select **Pay Monthly**. + +7. Specify the number of users you’d like to add to your organization and click **Continue to Payment**. + +8. On the **Payment Method** page, enter the card details and click **Purchase**. + +9. Verify your email address. + +10. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Team plan and the total cost. ## Upgrade to a Pro plan @@ -85,3 +138,39 @@ To upgrade from a monthly Pro plan to an annual Pro plan: 5. Review the information displayed on the **Change to an Annual Plan** page and click **Accept Terms and Purchase** to confirm. The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + +## Update billing information + +> **Note** +> +> You must be on owner of the organization to make changes to the billing information. + +To update the billing information for your organization: + +1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. + +2. Select **Organizations** from the menu at the top of the page. This displays a list of organizations. + +3. Choose the organization from the list and select the **Billing** tab. + +4. Select **Payment Methods**. + +5. The **Payment Information** page displays your existing billing information and allows you to edit the details. + + > **Note** + > + > The details displayed in the **Contact Information** section is used to generate your invoice. All billing-related information is sent to the email address listed in this section. + +6. Change the details as required and then click **Update** to save your changes. + +To update the billing information for your user account: + +1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. + +2. Open the drop-down menu next to your username in the top-right corner and select **Billing**. The Billing page displays billing information about your existing user account. + +3. Select **Payment Methods**. + +4. The **Payment Information** page displays your existing billing information and allows you to edit the details. + +5. Click **Update** to save your changes. From f4655fb89e76ac6c59be7d9f2466bc7c239966fe Mon Sep 17 00:00:00 2001 From: kurama <46106542+kurama3322@users.noreply.github.com> Date: Mon, 16 Aug 2021 13:57:31 +0300 Subject: [PATCH 5/7] fix: typo (#13348) * fix: typo * Minor style updates Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- language/nodejs/develop.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/nodejs/develop.md b/language/nodejs/develop.md index 22acf497a6..7023e03058 100644 --- a/language/nodejs/develop.md +++ b/language/nodejs/develop.md @@ -166,9 +166,9 @@ Let’s start our application and confirm that it is running properly. $ docker-compose -f docker-compose.dev.yml up --build ``` -We pass the `--build` flag so Docker will compile our image and then starts it. +We pass the `--build` flag so Docker compiles our image and then starts it. -If all goes will you should see something similar: +If all goes well, you should see something similar: ![node-compile](images/node-compile.png){:width="800px"} From 15836782038638a20f4e214af6e92bdd01624726 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 14 Aug 2021 14:45:19 +0200 Subject: [PATCH 6/7] Add missing code-hints, and minor markdown edits - Add missing code-hints (console, yaml) - Consistently add an empty line after code-blocks - Combine some examples where the output and the command were put in separate blocks. With the "console" code-hint, this is no longer nescessary. - fix indentation in cloud/ecs-integration.md, which caused the numbered-list to be interrupted. Signed-off-by: Sebastiaan van Stijn --- _includes/content/compose-var-sub.md | 2 +- _includes/enable-buildkit.md | 2 +- cloud/ecs-integration.md | 54 ++++++++++--------- components.md | 1 + compose/completion.md | 1 + compose/compose-file/compose-file-v3.md | 5 +- compose/environment-variables.md | 4 +- compose/gpu-support.md | 9 ++-- compose/install.md | 2 + compose/networking.md | 1 + compose/reference/index.md | 8 +-- config/containers/resource_constraints.md | 1 + config/daemon/index.md | 4 +- config/formatting.md | 36 ++++++------- desktop/mac/index.md | 4 +- desktop/mac/networking.md | 4 +- desktop/mac/space.md | 9 ++-- desktop/windows/networking.md | 4 +- desktop/windows/troubleshoot.md | 4 +- desktop/windows/wsl.md | 4 +- .../dockerfile_best-practices.md | 1 + docker-hub/publish/certify-images.md | 10 ++-- docker-hub/publish/certify-plugins-logging.md | 32 +++++------ docsarchive.md | 10 ++-- engine/api/sdk/examples.md | 1 + engine/context/working-with-contexts.md | 32 +++++------ engine/reference/commandline/app.md | 43 +++++++-------- engine/release-notes/18.09.md | 1 + engine/scan/index.md | 1 + engine/security/rootless.md | 1 + engine/security/seccomp.md | 2 +- engine/security/trust/index.md | 16 +++--- engine/security/trust/trust_automation.md | 6 +-- engine/security/trust/trust_delegation.md | 12 ++--- engine/security/trust/trust_key_mng.md | 2 +- engine/swarm/configs.md | 1 + engine/swarm/secrets.md | 1 + engine/swarm/services.md | 19 ++++--- engine/swarm/swarm-mode.md | 1 + get-started/08_using_compose.md | 5 +- get-started/index.md | 5 +- language/golang/build-images.md | 12 ++--- language/golang/develop.md | 6 +-- language/golang/run-containers.md | 15 ++---- language/golang/run-tests.md | 3 -- language/nodejs/build-images.md | 2 +- language/nodejs/run-containers.md | 2 +- machine/drivers/hyper-v.md | 5 +- machine/reference/mount.md | 1 + network/host.md | 2 +- registry/garbage-collection.md | 2 +- registry/notifications.md | 2 +- registry/storage-drivers/s3.md | 3 +- samples/aspnet-mssql-compose.md | 4 +- samples/dotnetcore.md | 1 + samples/rails.md | 13 ++--- storage/volumes.md | 13 ++--- 57 files changed, 226 insertions(+), 221 deletions(-) diff --git a/_includes/content/compose-var-sub.md b/_includes/content/compose-var-sub.md index 2628e7eef1..2859687fb8 100644 --- a/_includes/content/compose-var-sub.md +++ b/_includes/content/compose-var-sub.md @@ -61,6 +61,6 @@ web: If you forget and use a single dollar sign (`$`), Compose interprets the value as an environment variable and warns you: -``` +```console The VAR_NOT_INTERPOLATED_BY_COMPOSE is not set. Substituting an empty string. ``` diff --git a/_includes/enable-buildkit.md b/_includes/enable-buildkit.md index aee2624039..c69911e86c 100644 --- a/_includes/enable-buildkit.md +++ b/_includes/enable-buildkit.md @@ -14,7 +14,7 @@ variable or by making BuildKit the default setting. To set the BuildKit environment variable when running the `docker build` command, run: -``` +```console $ DOCKER_BUILDKIT=1 docker build . ``` diff --git a/cloud/ecs-integration.md b/cloud/ecs-integration.md index ca0f574605..c9c0960aa0 100644 --- a/cloud/ecs-integration.md +++ b/cloud/ecs-integration.md @@ -522,35 +522,37 @@ use an existing domain name for your application: 1. Use the AWS web console or CLI to get your VPC and Subnets IDs. You can retrieve the default VPC ID and attached subnets using this AWS CLI commands: -```console -$ aws ec2 describe-vpcs --filters Name=isDefault,Values=true --query 'Vpcs[0].VpcId' + ```console + $ aws ec2 describe-vpcs --filters Name=isDefault,Values=true --query 'Vpcs[0].VpcId' + + "vpc-123456" + $ aws ec2 describe-subnets --filters Name=vpc-id,Values=vpc-123456 --query 'Subnets[*].SubnetId' + + [ + "subnet-1234abcd", + "subnet-6789ef00", + ] + ``` + +2. Use the AWS CLI to create your load balancer. The AWS Web Console can also be used but will require adding at least one listener, which we don't need here. -"vpc-123456" -$ aws ec2 describe-subnets --filters Name=vpc-id,Values=vpc-123456 --query 'Subnets[*].SubnetId' - -[ - "subnet-1234abcd", - "subnet-6789ef00", -] -``` -1. Use the AWS CLI to create your load balancer. The AWS Web Console can also be used but will require adding at least one listener, which we don't need here. - -```console -$ aws elbv2 create-load-balancer --name myloadbalancer --type application --subnets "subnet-1234abcd" "subnet-6789ef00" - -{ - "LoadBalancers": [ + ```console + $ aws elbv2 create-load-balancer --name myloadbalancer --type application --subnets "subnet-1234abcd" "subnet-6789ef00" + { - "IpAddressType": "ipv4", - "VpcId": "vpc-123456", - "LoadBalancerArn": "arn:aws:elasticloadbalancing:us-east-1:1234567890:loadbalancer/app/myloadbalancer/123abcd456", - "DNSName": "myloadbalancer-123456.us-east-1.elb.amazonaws.com", -... -``` -1. To assign your application an existing domain name, you can configure your DNS with a -CNAME entry pointing to just-created loadbalancer's `DNSName` reported as you created the loadbalancer. + "LoadBalancers": [ + { + "IpAddressType": "ipv4", + "VpcId": "vpc-123456", + "LoadBalancerArn": "arn:aws:elasticloadbalancing:us-east-1:1234567890:loadbalancer/app/myloadbalancer/123abcd456", + "DNSName": "myloadbalancer-123456.us-east-1.elb.amazonaws.com", + <...> + ``` + +3. To assign your application an existing domain name, you can configure your DNS with a + CNAME entry pointing to just-created loadbalancer's `DNSName` reported as you created the loadbalancer. -1. Use Loadbalancer ARN to set `x-aws-loadbalancer` in your compose file, and deploy your application using `docker compose up` command. +4. Use Loadbalancer ARN to set `x-aws-loadbalancer` in your compose file, and deploy your application using `docker compose up` command. Please note Docker ECS integration won't be aware of this domain name, so `docker compose ps` command will report URLs with loadbalancer DNSName, not your own domain. diff --git a/components.md b/components.md index 36d0990983..355684ac34 100644 --- a/components.md +++ b/components.md @@ -29,6 +29,7 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com) ``` +
diff --git a/engine/context/working-with-contexts.md b/engine/context/working-with-contexts.md index 65d17f59ff..d986a1ad9f 100644 --- a/engine/context/working-with-contexts.md +++ b/engine/context/working-with-contexts.md @@ -40,7 +40,7 @@ A context is a combination of several properties. These include: The easiest way to see what a context looks like is to view the **default** context. -``` +```console $ docker context ls NAME DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default * Current... unix:///var/run/docker.sock swarm @@ -52,7 +52,7 @@ The asterisk in the `NAME` column indicates that this is the active context. Thi Dig a bit deeper with `docker context inspect`. In this example, we're inspecting the context called `default`. -``` +```console $ docker context inspect default [ { @@ -86,7 +86,7 @@ The following example creates a new context called "docker-test" and specifies t - Default orchestrator = Swarm - Issue commands to the local Unix socket `/var/run/docker.sock` -``` +```console $ docker context create docker-test \ --default-stack-orchestrator=swarm \ --docker host=unix:///var/run/docker.sock @@ -102,7 +102,7 @@ You can view the new context with `docker context ls` and `docker context inspec The following can be used to create a config with Kubernetes as the default orchestrator using the existing kubeconfig stored in `/home/ubuntu/.kube/config`. For this to work, you will need a valid kubeconfig file in `/home/ubuntu/.kube/config`. If your kubeconfig has more than one context, the current context (`kubectl config current-context`) will be used. -``` +```console $ docker context create k8s-test \ --default-stack-orchestrator=kubernetes \ --kubernetes config-file=/home/ubuntu/.kube/config \ @@ -113,7 +113,7 @@ Successfully created context "k8s-test" You can view all contexts on the system with `docker context ls`. -``` +```console $ docker context ls NAME DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default * Current unix:///var/run/docker.sock https://35.226.99.100 (default) swarm @@ -129,7 +129,7 @@ You can use `docker context use` to quickly switch between contexts. The following command will switch the `docker` CLI to use the "k8s-test" context. -``` +```console $ docker context use k8s-test k8s-test @@ -138,7 +138,7 @@ Current context is now "k8s-test" Verify the operation by listing all contexts and ensuring the asterisk ("\*") is against the "k8s-test" context. -``` +```console $ docker context ls NAME DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default Current DOCKER_HOST based configuration unix:///var/run/docker.sock https://35.226.99.100 (default) swarm @@ -154,13 +154,13 @@ Use the appropriate command below to set the context to `docker-test` using an e Windows PowerShell: -``` +```console > $Env:DOCKER_CONTEXT=docker-test ``` Linux: -``` +```console $ export DOCKER_CONTEXT=docker-test ``` @@ -168,7 +168,7 @@ Run a `docker context ls` to verify that the "docker-test" context is now the ac You can also use the global `--context` flag to override the context specified by the `DOCKER_CONTEXT` environment variable. For example, the following will send the command to a context called "production". -``` +```console $ docker --context production container ls ``` @@ -188,21 +188,21 @@ Let's look at exporting and importing a native Docker context. The following example exports an existing context called "docker-test". It will be written to a file called `docker-test.dockercontext`. -``` +```console $ docker context export docker-test Written file "docker-test.dockercontext" ``` Check the contents of the export file. -``` +```console $ cat docker-test.dockercontext meta.json0000644000000000000000000000022300000000000011023 0ustar0000000000000000{"Name":"docker-test","Metadata":{"StackOrchestrator":"swarm"},"Endpoints":{"docker":{"Host":"unix:///var/run/docker.sock","SkipTLSVerify":false}}}tls0000700000000000000000000000000000000000000007716 5ustar0000000000000000 ``` This file can be imported on another host using `docker context import`. The target host must have the Docker client installed. -``` +```console $ docker context import docker-test docker-test.dockercontext docker-test Successfully imported context "docker-test" @@ -220,14 +220,14 @@ You can export a Kubernetes context only if the context you are exporting has a These steps will use the `--kubeconfig` flag to export **only** the Kubernetes elements of the existing `k8s-test` context to a file called "k8s-test.kubeconfig". The `cat` command will then show that it's exported as a valid kubeconfig file. -``` +```console $ docker context export k8s-test --kubeconfig Written file "k8s-test.kubeconfig" ``` Verify that the exported file contains a valid kubectl config. -``` +```console $ cat k8s-test.kubeconfig apiVersion: v1 clusters: @@ -265,7 +265,7 @@ You can use `docker context update` to update fields in an existing context. The following example updates the "Description" field in the existing `k8s-test` context. -``` +```console $ docker context update k8s-test --description "Test Kubernetes cluster" k8s-test Successfully updated context "k8s-test" diff --git a/engine/reference/commandline/app.md b/engine/reference/commandline/app.md index 79d12adaf6..a39dc7a35c 100644 --- a/engine/reference/commandline/app.md +++ b/engine/reference/commandline/app.md @@ -68,7 +68,7 @@ it initializes a new project based on the Compose file. Use the following command to initialize a new empty project called "hello-world". -``` +```console $ docker app init hello-world Created "hello-world.dockerapp" ``` @@ -82,7 +82,7 @@ project with `.dockerapp` appended, and the three YAML files are: Inspect the YAML files with the following commands. -``` +```console $ cd hello-world.dockerapp/ $ cat docker-compose.yml @@ -116,19 +116,19 @@ This section describes editing the project YAML files so that it runs a simple w Use your preferred editor to edit the `docker-compose.yml` YAML file and update it with the following information: -``` +```yaml version: "3.6" services: hello: image: hashicorp/http-echo command: ["-text", "${hello.text}"] ports: - - ${hello.port}:5678 + - "${hello.port}:5678" ``` Update the `parameters.yml` file to the following: -``` +```yaml hello: port: 8080 text: Hello world! @@ -147,7 +147,7 @@ It is a quick way to check how to configure the application before deployment, w the `Compose file`. It's important to note that the application is not running at this point, and that the `inspect` operation inspects the configuration file(s). -``` +```console $ docker app inspect hello-world.dockerapp hello-world 0.1.0 @@ -171,7 +171,7 @@ The application is ready to be validated and rendered. Docker App provides the `validate` subcommand to check syntax and other aspects of the configuration. If the app passes validation, the command returns no arguments. -``` +```console $ docker app validate hello-world.dockerapp Validated "hello-world.dockerapp" ``` @@ -199,7 +199,7 @@ Use `docker app install` to deploy the application. Use the following command to deploy (install) the application. -``` +```console $ docker app install hello-world.dockerapp --name my-app Creating network my-app_default Creating service my-app_hello @@ -211,7 +211,7 @@ installation container and as a target context to deploy the application. You ca using the flag `--target-context` or by using the environment variable `DOCKER_TARGET_CONTEXT`. This flag is also available for the commands `status`, `upgrade`, and `uninstall`. -``` +```console $ docker app install hello-world.dockerapp --name my-app --target-context=my-big-production-cluster Creating network my-app_default Creating service my-app_hello @@ -223,7 +223,7 @@ valid if they are deployed on different target contexts. You can check the status of the app with the `docker app status ` command. -``` +```console $ docker app status my-app INSTALLATION ------------ @@ -254,7 +254,7 @@ miqdk1v7j3zk my-app_hello replicated 1/1 hashicorp/http-echo:la The app is deployed using the stack orchestrator. This means you can also inspect it using the regular `docker stack` commands. -``` +```console $ docker stack ls NAME SERVICES ORCHESTRATOR my-app 1 Swarm @@ -265,7 +265,8 @@ port 8080 and see the app. You must ensure traffic to port 8080 is allowed on the connection from your browser to your Docker host. Now change the port of the application using `docker app upgrade ` command. -``` + +```console $ docker app upgrade my-app --set hello.port=8181 Upgrading service my-app_hello Application "my-app" upgraded on context "default" @@ -286,13 +287,13 @@ Rendering is the process of reading the entire application configuration and out Use the following command to render the app to a Compose file called `docker-compose.yml` in the current directory. -``` +```console $ docker app render --output docker-compose.yml hello-world.dockerapp ``` Check the contents of the resulting `docker-compose.yml` file. -``` +```console $ cat docker-compose.yml version: "3.6" services: @@ -315,7 +316,7 @@ section of the project's YAML file. For example, `${hello.text}` has been expand Try to render the application with a different text: -``` +```console $ docker app render hello-world.dockerapp --set hello.text="Hello whales!" version: "3.6" services: @@ -333,7 +334,7 @@ services: Use `docker-compose up` to deploy the app. -``` +```console $ docker-compose up --detach WARNING: The Docker Engine you're using is running in swarm mode. @@ -354,7 +355,7 @@ Deploying the app as a Docker stack is a two-step process very similar to deploy Complete the steps in the previous section to render the Docker app project as a Compose file and make sure you're ready to deploy it as a Docker Stack. Your Docker host must be in Swarm mode. -``` +```console $ docker stack deploy hello-world-app -c docker-compose.yml Creating network hello-world-app_default Creating service hello-world-app_hello @@ -394,7 +395,7 @@ $ docker app push my-app --platform="linux/amd64" --tag /:0.1.0 Now that the app is pushed to the registry, try an `inspect` and `install` command against it. The location of your app is different from the one provided in the examples. -``` +```console $ docker app inspect myuser/hello-world:0.1.0 hello-world 0.1.0 @@ -412,7 +413,7 @@ This action was performed directly against the app in the registry. Now install it as a native Docker App by referencing the app in the registry, with a different port. -``` +```console $ docker app install myuser/hello-world:0.1.0 --set hello.port=8181 Creating network hello-world_default Creating service hello-world_hello @@ -424,14 +425,14 @@ Test that the app is working. The app used in these examples is a simple web server that displays the text "Hello world!" on port 8181, your app might be different. -``` +```console $ curl http://localhost:8181 Hello world! ``` Uninstall the app. -``` +```console $ docker app uninstall hello-world Removing service hello-world_hello Removing network hello-world_default diff --git a/engine/release-notes/18.09.md b/engine/release-notes/18.09.md index d26b1f849b..d66826473b 100644 --- a/engine/release-notes/18.09.md +++ b/engine/release-notes/18.09.md @@ -192,6 +192,7 @@ Run the following command to get the current value of the `MountFlags` property $ sudo systemctl show --property=MountFlags docker.service MountFlags= ``` + Update your configuration if this command prints a non-empty value for `MountFlags`, and restart the docker service. ### Security fixes diff --git a/engine/scan/index.md b/engine/scan/index.md index 4ee07235b7..e949682c2b 100644 --- a/engine/scan/index.md +++ b/engine/scan/index.md @@ -205,6 +205,7 @@ $ docker scan --json --group-issues docker-scan:e2e "path": "docker-scan:e2e" } ``` + You can find all the sources of the vulnerability in the `from` section. ### Checking the dependency tree diff --git a/engine/security/rootless.md b/engine/security/rootless.md index 0ab5148919..ff5ccb100a 100644 --- a/engine/security/rootless.md +++ b/engine/security/rootless.md @@ -176,6 +176,7 @@ If `dockerd-rootless-setuptool.sh` is not present, you may need to install the ` ```console $ sudo apt-get install -y docker-ce-rootless-extras ``` +
If you do not have permission to run package managers like `apt-get` and `dnf`, diff --git a/engine/security/seccomp.md b/engine/security/seccomp.md index 6ac67a1886..b4f51d3662 100644 --- a/engine/security/seccomp.md +++ b/engine/security/seccomp.md @@ -120,7 +120,7 @@ the reason each syscall is blocked rather than white-listed. You can pass `unconfined` to run a container without the default seccomp profile. -``` +```console $ docker run --rm -it --security-opt seccomp=unconfined debian:jessie \ unshare --map-root-user --user sh -c whoami ``` diff --git a/engine/security/trust/index.md b/engine/security/trust/index.md index 24cb2c12f0..9b5ac9e3aa 100644 --- a/engine/security/trust/index.md +++ b/engine/security/trust/index.md @@ -130,7 +130,7 @@ is automatically added to the local trust store. If you are importing a separate key, you will need to use the `$ docker trust key load` command. -``` +```console $ docker trust key generate jeff Generating key for jeff... Enter passphrase for new jeff key with ID 9deed25: @@ -140,7 +140,7 @@ Successfully generated and loaded private key. Corresponding public key availabl Or if you have an existing key: -``` +```console $ docker trust key load key.pem --name jeff Loading key from "key.pem"... Enter passphrase for new jeff key with ID 8ae710e: @@ -156,7 +156,7 @@ canonical root key. To understand more about initiating a repository, and the role of delegations, head to [delegations for content trust](trust_delegation.md). -``` +```console $ docker trust signer add --key cert.pem jeff registry.example.com/admin/demo Adding signer "jeff" to registry.example.com/admin/demo... Enter passphrase for new repository key with ID 10b5e94: @@ -165,7 +165,7 @@ Enter passphrase for new repository key with ID 10b5e94: Finally, we will use the delegation private key to sign a particular tag and push it up to the registry. -``` +```console $ docker trust sign registry.example.com/admin/demo:1 Signing and pushing trust data for local image registry.example.com/admin/demo:1, may overwrite remote trust data The push refers to repository [registry.example.com/admin/demo] @@ -179,7 +179,7 @@ Successfully signed registry.example.com/admin/demo:1 Alternatively, once the keys have been imported an image can be pushed with the `$ docker push` command, by exporting the DCT environmental variable. -``` +```console $ export DOCKER_CONTENT_TRUST=1 $ docker push registry.example.com/admin/demo:1 @@ -194,7 +194,7 @@ Successfully signed registry.example.com/admin/demo:1 Remote trust data for a tag or a repository can be viewed by the `$ docker trust inspect` command: -``` +```console $ docker trust inspect --pretty registry.example.com/admin/demo:1 Signatures for registry.example.com/admin/demo:1 @@ -215,7 +215,7 @@ Administrative keys for registry.example.com/admin/demo:1 Remote Trust data for a tag can be removed by the `$ docker trust revoke` command: -``` +```console $ docker trust revoke registry.example.com/admin/demo:1 Enter passphrase for signer key with ID 8ae710e: Successfully deleted signature for registry.example.com/admin/demo:1 @@ -241,7 +241,7 @@ For example, with DCT enabled a `docker pull someimage:latest` only succeeds if `someimage:latest` is signed. However, an operation with an explicit content hash always succeeds as long as the hash exists: -``` +```console $ docker pull registry.example.com/user/image:1 Error: remote trust data does not exist for registry.example.com/user/image: registry.example.com does not have trust data for registry.example.com/user/image diff --git a/engine/security/trust/trust_automation.md b/engine/security/trust/trust_automation.md index f1647cf4f8..3f59a96047 100644 --- a/engine/security/trust/trust_automation.md +++ b/engine/security/trust/trust_automation.md @@ -20,7 +20,7 @@ To automate importing a delegation private key to the local Docker trust store, need to pass a passphrase for the new key. This passphrase will be required everytime that delegation signs a tag. -``` +```console $ export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE="mypassphrase123" $ docker trust key load delegation.key --name jeff @@ -35,7 +35,7 @@ public key, then you will need to use the local Notary Canonical Root Key's passphrase to create the repositories trust data. If the repository has already been initiated then you only need the repositories passphrase. -``` +```console # Export the Local Root Key Passphrase if required. $ export DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE="rootpassphrase123" @@ -56,7 +56,7 @@ Finally when signing an image, we will need to export the passphrase of the signing key. This was created when the key was loaded into the local Docker trust store with `$ docker trust key load`. -``` +```console $ export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE="mypassphrase123" $ docker trust sign registry.example.com/admin/demo:1 diff --git a/engine/security/trust/trust_delegation.md b/engine/security/trust/trust_delegation.md index a5c4480573..21d5bd15df 100644 --- a/engine/security/trust/trust_delegation.md +++ b/engine/security/trust/trust_delegation.md @@ -28,28 +28,28 @@ server URL is the same as the registry URL. However, for self-hosted environments or 3rd party registries, you will need to specify an alternative URL for the notary server. This is done with: -``` -export DOCKER_CONTENT_TRUST_SERVER=https://: +```console +$ export DOCKER_CONTENT_TRUST_SERVER=https://: ``` If you do not export this variable in self-hosted environments, you may see errors such as: -``` +```console $ docker trust signer add --key cert.pem jeff registry.example.com/admin/demo Adding signer "jeff" to registry.example.com/admin/demo... -[...] +<...> Error: trust data missing for remote repository registry.example.com/admin/demo or remote repository not found: timestamp key trust data unavailable. Has a notary repository been initialized? $ docker trust inspect registry.example.com/admin/demo --pretty WARN[0000] Error while downloading remote metadata, using cached timestamp - this might not be the latest version available remotely -[...] +<...> ``` If you have enabled authentication for your notary server, or are using DTR, you will need to log in before you can push data to the notary server. -``` +```console $ docker login registry.example.com/user/repo Username: admin Password: diff --git a/engine/security/trust/trust_key_mng.md b/engine/security/trust/trust_key_mng.md index e5da1f7a6e..a8aa06b8e5 100644 --- a/engine/security/trust/trust_key_mng.md +++ b/engine/security/trust/trust_key_mng.md @@ -79,7 +79,7 @@ This loss also requires **manual intervention** from every consumer that pulled the tagged image prior to the loss. Image consumers would get an error for content that they already downloaded: -``` +```console Warning: potential malicious behavior - trust data has insufficient signatures for remote repository docker.io/my/image: valid signatures did not meet threshold ``` diff --git a/engine/swarm/configs.md b/engine/swarm/configs.md index edcdbb732f..fc2f7dbe9a 100644 --- a/engine/swarm/configs.md +++ b/engine/swarm/configs.md @@ -244,6 +244,7 @@ This example assumes that you have PowerShell installed. ``` + 2. If you have not already done so, initialize or join the swarm. ```powershell diff --git a/engine/swarm/secrets.md b/engine/swarm/secrets.md index 95098ae6a8..c7aacb8328 100644 --- a/engine/swarm/secrets.md +++ b/engine/swarm/secrets.md @@ -276,6 +276,7 @@ This example assumes that you have PowerShell installed. ``` + 2. If you have not already done so, initialize or join the swarm. ```powershell diff --git a/engine/swarm/services.md b/engine/swarm/services.md index f5a68b8a71..ee9e5a51e9 100644 --- a/engine/swarm/services.md +++ b/engine/swarm/services.md @@ -132,22 +132,25 @@ The credential spec contained in the specified `config` is used. The following simple example retrieves the gMSA name and JSON contents from your Active Directory (AD) instance: - ``` -name="mygmsa" -contents="{...}" -echo $contents > contents.json + ```console +$ name="mygmsa" +$ contents="{...}" +$ echo $contents > contents.json ``` + Make sure that the nodes to which you are deploying are correctly configured for the gMSA. To use a Config as a credential spec, create a Docker Config in a credential spec file named `credpspec.json`. You can specify any name for the name of the `config`. +```console +$ docker config create --label com.docker.gmsa.name=mygmsa credspec credspec.json ``` -docker config create --label com.docker.gmsa.name=mygmsa credspec credspec.json -``` + Now you can create a service using this credential spec. Specify the `--credential-spec` flag with the config name: -``` -docker service create --credential-spec="config://credspec" + +```console +$ docker service create --credential-spec="config://credspec" ``` Your service uses the gMSA credential spec when it starts, but unlike a typical Docker Config (used by passing the --config flag), the credential spec is not mounted into the container. diff --git a/engine/swarm/swarm-mode.md b/engine/swarm/swarm-mode.md index 956fda59e8..9636b66482 100644 --- a/engine/swarm/swarm-mode.md +++ b/engine/swarm/swarm-mode.md @@ -63,6 +63,7 @@ To add a worker to this swarm, run the following command: To add a manager to this swarm, run 'docker swarm join-token manager' and follow the instructions. ``` + ### Configuring default address pools By default Docker Swarm uses a default address pool `10.0.0.0/8` for global scope (overlay) networks. Every diff --git a/get-started/08_using_compose.md b/get-started/08_using_compose.md index 7e55a1670a..62af7e919f 100644 --- a/get-started/08_using_compose.md +++ b/get-started/08_using_compose.md @@ -117,7 +117,8 @@ docker run -dp 3000:3000 ` ports: - 3000:3000 ``` -4. Next, we'll migrate both the working directory (`-w /app`) and the volume mapping (`-v "$(pwd):/app"`) by using + +5. Next, we'll migrate both the working directory (`-w /app`) and the volume mapping (`-v "$(pwd):/app"`) by using the `working_dir` and `volumes` definitions. Volumes also has a [short](../compose/compose-file/compose-file-v3.md#short-syntax-3) and [long](../compose/compose-file/compose-file-v3.md#long-syntax-3) syntax. One advantage of Docker Compose volume definitions is we can use relative paths from the current directory. @@ -136,7 +137,7 @@ docker run -dp 3000:3000 ` - ./:/app ``` -5. Finally, we need to migrate the environment variable definitions using the `environment` key. +6. Finally, we need to migrate the environment variable definitions using the `environment` key. ```yaml version: "3.7" diff --git a/get-started/index.md b/get-started/index.md index f60620149a..d439aa095d 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -107,8 +107,9 @@ You'll notice a few flags being used. Here's some more info on them: > > You can combine single character flags to shorten the full command. > As an example, the command above could be written as: -> ``` -> docker run -dp 80:80 docker/getting-started +> +> ```console +> $ docker run -dp 80:80 docker/getting-started > ``` ## The Docker Dashboard diff --git a/language/golang/build-images.md b/language/golang/build-images.md index 39a8cdea0e..8a15eaa38f 100644 --- a/language/golang/build-images.md +++ b/language/golang/build-images.md @@ -236,9 +236,7 @@ Let's build our first Docker image! ```console $ docker build --tag docker-gs-ping . -``` -``` [+] Building 3.6s (12/12) FINISHED => [internal] load build definition from Dockerfile 0.1s => => transferring dockerfile: 38B 0.0s @@ -273,9 +271,7 @@ To list images, simply run the `images` command: ```console $ docker images -``` -``` REPOSITORY TAG IMAGE ID CREATED SIZE docker-gs-ping latest 336a3f164d0f 39 minutes ago 540MB postgres 13.2 c5ec7353d87d 7 weeks ago 314MB @@ -301,9 +297,7 @@ Now run the `docker images` command to see the updated list of local images: ```console $ docker images -``` -``` REPOSITORY TAG IMAGE ID CREATED SIZE docker-gs-ping latest 336a3f164d0f 43 minutes ago 540MB docker-gs-ping v1.0 336a3f164d0f 43 minutes ago 540MB @@ -323,9 +317,7 @@ Notice that the response from Docker tells us that the image has not been remove ```console $ docker images -``` -``` REPOSITORY TAG IMAGE ID CREATED SIZE docker-gs-ping latest 336a3f164d0f 45 minutes ago 540MB postgres 13.2 c5ec7353d87d 7 weeks ago 314MB @@ -385,7 +377,9 @@ $ docker build -t docker-gs-ping:multistage -f Dockerfile.multistage . Comparing the sizes of `docker-gs-ping:multistage` and `docker-gs-ping:latest` we see an order-of-magnitude difference! -``` +```console +$ docker images + REPOSITORY TAG IMAGE ID CREATED SIZE docker-gs-ping multistage e3fdde09f172 About a minute ago 27.1MB docker-gs-ping latest 336a3f164d0f About an hour ago 540MB diff --git a/language/golang/develop.md b/language/golang/develop.md index 75a317354b..3342892ef3 100644 --- a/language/golang/develop.md +++ b/language/golang/develop.md @@ -132,8 +132,8 @@ $ docker exec -it roach ./cockroach sql --insecure An example of interaction with the SQL shell is presented below. {% raw %} -``` -oliver@hki:~$ sudo docker exec -it roach ./cockroach sql --insecure +```console +$ sudo docker exec -it roach ./cockroach sql --insecure # # Welcome to the CockroachDB SQL shell. # All statements must be terminated by a semicolon. @@ -580,7 +580,7 @@ This Docker Compose configuration is super convenient as we do not have to type Docker Compose will automatically read environment variables from a `.env` file if it is available. Since our Compose file requires `PGPASSWORD` to be set, we add the following content to the `.env` file: -``` +```bash PGPASSWORD=whatever ``` diff --git a/language/golang/run-containers.md b/language/golang/run-containers.md index aa65e90d24..ad720d921d 100644 --- a/language/golang/run-containers.md +++ b/language/golang/run-containers.md @@ -92,9 +92,7 @@ Since we ran our container in the background, how do we know if our container is ```console $ docker ps -``` -``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES d75e61fcad1e docker-gs-ping "/docker-gs-ping" 41 seconds ago Up 40 seconds 0.0.0.0:8080->8080/tcp inspiring_ishizaka ``` @@ -112,6 +110,7 @@ Now rerun the `docker ps` command to see a list of running containers. ```console $ docker ps + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES ``` @@ -120,10 +119,8 @@ CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES Docker containers can be started, stopped and restarted. When we stop a container, it is not removed but the status is changed to stopped and the process inside of the container is stopped. When we ran the `docker ps` command, the default output is to only show running containers. If we pass the `--all` or `-a` for short, we will see all containers on our system, that is stopped containers and running containers. ```console -$ docker ps -a -``` +$ docker ps -all -``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES d75e61fcad1e docker-gs-ping "/docker-gs-ping" About a minute ago Exited (2) 23 seconds ago inspiring_ishizaka f65dbbb9a548 docker-gs-ping "/docker-gs-ping" 3 minutes ago Exited (2) 2 minutes ago wizardly_joliot @@ -142,10 +139,8 @@ $ docker restart inspiring_ishizaka Now, list all the containers again using the `ps` command: ```console -$ docker ps --all -``` +$ docker ps -a -``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES d75e61fcad1e docker-gs-ping "/docker-gs-ping" 2 minutes ago Up 5 seconds 0.0.0.0:8080->8080/tcp inspiring_ishizaka f65dbbb9a548 docker-gs-ping "/docker-gs-ping" 4 minutes ago Exited (2) 2 minutes ago wizardly_joliot @@ -172,9 +167,7 @@ Again, make sure you replace the containers names in the below command with the ```console $ docker rm inspiring_ishizaka wizardly_joliot magical_carson gifted_mestorf -``` -``` inspiring_ishizaka wizardly_joliot magical_carson @@ -194,9 +187,7 @@ $ docker run -d -p 8080:8080 --name rest-server docker-gs-ping ```console $ docker ps -``` -``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 3bbc6a3102ea docker-gs-ping "/docker-gs-ping" 25 seconds ago Up 24 seconds 0.0.0.0:8080->8080/tcp rest-server ``` diff --git a/language/golang/run-tests.md b/language/golang/run-tests.md index 244e3e6a79..6925ebc024 100644 --- a/language/golang/run-tests.md +++ b/language/golang/run-tests.md @@ -84,9 +84,6 @@ That was a bit... underwhelming? Let's ask it to print a bit more detail, just t ```console $ go test -v ./... -``` - -``` === RUN TestRespondsWithLove main_test.go:47: container not ready, waiting... --- PASS: TestRespondsWithLove (5.24s) diff --git a/language/nodejs/build-images.md b/language/nodejs/build-images.md index 3d93ba6740..8957892e68 100644 --- a/language/nodejs/build-images.md +++ b/language/nodejs/build-images.md @@ -255,7 +255,7 @@ The Docker tag command creates a new tag for an image. It does not create a new Now run the `docker images` command to see a list of our local images. -``` +```console $ docker images REPOSITORY TAG IMAGE ID CREATED SIZE node-docker latest 3809733582bc 24 minutes ago 945MB diff --git a/language/nodejs/run-containers.md b/language/nodejs/run-containers.md index 564f9057ac..64ad1fe8ca 100644 --- a/language/nodejs/run-containers.md +++ b/language/nodejs/run-containers.md @@ -93,7 +93,7 @@ $ curl --request POST \ Since we ran our container in the background, how do we know if our container is running or what other containers are running on our machine? Well, we can run the `docker ps` command. Just like on Linux, to see a list of processes on your machine we would run the ps command. In the same spirit, we can run the `docker ps` command which will show us a list of containers running on our machine. -``` +```console $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES ce02b3179f0f node-docker "docker-entrypoint.s…" 6 minutes ago Up 6 minutes 0.0.0.0:8000->8000/tcp wonderful_kalam diff --git a/machine/drivers/hyper-v.md b/machine/drivers/hyper-v.md index e38f7a8870..dfc5947cf2 100644 --- a/machine/drivers/hyper-v.md +++ b/machine/drivers/hyper-v.md @@ -93,7 +93,7 @@ Reboot your desktop system to clear out any routing table problems. Without a re which asks you to create [three networked host machines](../../engine/swarm/swarm-tutorial/index.md#three-networked-host-machines), you can create these swarm nodes: `manager1`, `worker1`, `worker2`. -* Use the Microsoft Hyper-V driver and reference the new virtual switch you created. +* Use the Microsoft Hyper-V driver and reference the new virtual switch you created. ```console $ docker-machine create -d hyperv --hyperv-virtual-switch @@ -127,7 +127,8 @@ Reboot your desktop system to clear out any routing table problems. Without a re ker\Docker\Resources\bin\docker-machine.exe env manager1 PS C:\WINDOWS\system32> ``` -* Use the same process, driver, and network switch to create the other nodes. + +* Use the same process, driver, and network switch to create the other nodes. For our example, the commands are: diff --git a/machine/reference/mount.md b/machine/reference/mount.md index b9e487179b..26c8216ae0 100644 --- a/machine/reference/mount.md +++ b/machine/reference/mount.md @@ -46,5 +46,6 @@ You can also call `fuserunmount` (or `fusermount -u`) commands directly. $ docker-machine mount -u dev:/home/docker/foo foo $ rmdir foo ``` + **Files are actually being stored on the machine, *not* on the host.** So make sure to make a copy of any files you want to keep, before removing it! diff --git a/network/host.md b/network/host.md index b02575bfbf..d7ed3706c3 100644 --- a/network/host.md +++ b/network/host.md @@ -16,7 +16,7 @@ address. > take effect, and the `-p`, `--publish`, `-P`, and `--publish-all` option are > ignored, producing a warning instead: > -> ``` +> ```console > WARNING: Published ports are discarded when using host network mode > ``` diff --git a/registry/garbage-collection.md b/registry/garbage-collection.md index 7683286501..688238be83 100644 --- a/registry/garbage-collection.md +++ b/registry/garbage-collection.md @@ -100,7 +100,7 @@ gives a clear indication of items eligible for deletion. The config.yml file should be in the following format: -``` +```yaml version: 0.1 storage: filesystem: diff --git a/registry/notifications.md b/registry/notifications.md index 7d190392cc..2bdaa97164 100644 --- a/registry/notifications.md +++ b/registry/notifications.md @@ -159,7 +159,7 @@ request coming to an endpoint. An example of a full event may look as follows: -``` +```http request GET /callback HTTP/1.1 Host: application/vnd.docker.distribution.events.v1+json Authorization: Bearer diff --git a/registry/storage-drivers/s3.md b/registry/storage-drivers/s3.md index 91a13dc632..39cafa5a88 100644 --- a/registry/storage-drivers/s3.md +++ b/registry/storage-drivers/s3.md @@ -84,6 +84,7 @@ The following AWS policy is required by the registry for push and pull. Make sur ] } ``` + See [the S3 policy documentation](http://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html) for more details. # CloudFront as Middleware with S3 backend @@ -135,7 +136,7 @@ are still directly written to S3. The following example shows a minimum configuration: -``` +```yaml ... storage: s3: diff --git a/samples/aspnet-mssql-compose.md b/samples/aspnet-mssql-compose.md index eb913841c3..3db6c8ca2b 100644 --- a/samples/aspnet-mssql-compose.md +++ b/samples/aspnet-mssql-compose.md @@ -127,7 +127,7 @@ configure this app to use our SQL Server database, and then create a > variable below to the one you defined in the `docker-compose.yml` file. ```csharp - [...] + <...> public void ConfigureServices(IServiceCollection services) { // Database connection string. @@ -149,7 +149,7 @@ configure this app to use our SQL Server database, and then create a services.AddTransient(); services.AddTransient(); } - [...] + <...> ``` 1. Go to `app.csproj`. You see a line like: diff --git a/samples/dotnetcore.md b/samples/dotnetcore.md index 77155595fa..ae398b8491 100644 --- a/samples/dotnetcore.md +++ b/samples/dotnetcore.md @@ -73,6 +73,7 @@ ENTRYPOINT ["dotnet", "aspnetapp.dll"] bin/ obj/ ``` + ### Method 2 (build app outside Docker container): 1. Create a `Dockerfile` in your project folder. diff --git a/samples/rails.md b/samples/rails.md index 4c065d9078..2ccfac77ac 100644 --- a/samples/rails.md +++ b/samples/rails.md @@ -50,6 +50,7 @@ Create an empty `Gemfile.lock` file to build our `Dockerfile`. ```console $ touch Gemfile.lock ``` + Next, provide an entrypoint script to fix a Rails-specific issue that prevents the server from restarting when a certain `server.pid` file pre-exists. This script will be executed every time the container gets started. @@ -184,14 +185,12 @@ test: database: myapp_test ``` -You can now boot the app with [docker-compose up](../compose/reference/up.md): +You can now boot the app with [docker-compose up](../compose/reference/up.md). +If all is well, you should see some PostgreSQL output: ```console $ docker-compose up -``` -If all's well, you should see some PostgreSQL output. -```bash rails_db_1 is up-to-date Creating rails_web_1 ... done Attaching to rails_db_1, rails_web_1 @@ -208,12 +207,6 @@ Finally, you need to create the database. In another terminal, run: ```console $ docker-compose run web rake db:create -``` -Here is an example of the output from that command: - -```console -$ docker-compose run web rake db:create - Starting rails_db_1 ... done Created database 'myapp_development' Created database 'myapp_test' diff --git a/storage/volumes.md b/storage/volumes.md index eb214690d0..b8c2f7763c 100644 --- a/storage/volumes.md +++ b/storage/volumes.md @@ -511,6 +511,7 @@ $ docker volume create \ --opt o=addr=uxxxxx.your-server.de,username=uxxxxxxx,password=*****,file_mode=0777,dir_mode=0777 \ --name cif-volume ``` + Notice the `addr` option is required if using a hostname instead of an IP so docker can perform the hostname lookup. ## Backup, restore, or migrate data volumes @@ -522,7 +523,7 @@ Volumes are useful for backups, restores, and migrations. Use the For example, create a new container named `dbstore`: -``` +```console $ docker run -v /dbdata --name dbstore ubuntu /bin/bash ``` @@ -532,7 +533,7 @@ Then in the next command, we: - Mount a local host directory as `/backup` - Pass a command that tars the contents of the `dbdata` volume to a `backup.tar` file inside our `/backup` directory. -``` +```console $ docker run --rm --volumes-from dbstore -v $(pwd):/backup ubuntu tar cvf /backup/backup.tar /dbdata ``` @@ -546,13 +547,13 @@ another that you made elsewhere. For example, create a new container named `dbstore2`: -``` +```console $ docker run -v /dbdata --name dbstore2 ubuntu /bin/bash ``` Then un-tar the backup file in the new container`s data volume: -``` +```console $ docker run --rm --volumes-from dbstore2 -v $(pwd):/backup ubuntu bash -c "cd /dbdata && tar xvf /backup/backup.tar --strip 1" ``` @@ -573,7 +574,7 @@ To automatically remove anonymous volumes, use the `--rm` option. For example, this command creates an anonymous `/foo` volume. When the container is removed, the Docker Engine removes the `/foo` volume but not the `awesome` volume. -``` +```console $ docker run --rm -v /foo -v awesome:/bar busybox top ``` @@ -581,7 +582,7 @@ $ docker run --rm -v /foo -v awesome:/bar busybox top To remove all unused volumes and free up space: -``` +```console $ docker volume prune ``` From 4cae2337b4bc57cae5dc3696d220e13331eed58d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 14 Aug 2021 11:54:38 +0200 Subject: [PATCH 7/7] Desktop: release notes: mention kernel update and performance fix Signed-off-by: Sebastiaan van Stijn --- desktop/mac/release-notes.md | 5 +++++ desktop/windows/release-notes.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/desktop/mac/release-notes.md b/desktop/mac/release-notes.md index 8a9eeb6fc6..7f6fd2e1b7 100644 --- a/desktop/mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -36,9 +36,14 @@ This page contains information about the new features, improvements, known issue - [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9) - [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1) - [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3) +- [Linux kernel 5.10.47](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.47-0b705d955f5e283f62583c4e227d64a7924c138f/images/sha256-a4c79bc185ec9eba48dcc802a8881b9d97e532b3f803d23e5b8d4951588f4d51?context=repo) ### Bug fixes and minor changes +- Update kernel configuration to fix a performance regression in [Docker Desktop 3.0.0](#docker-desktop-300) + that caused publishing container ports to take 10 times longer than on older + versions. For more information, see [linuxkit/linuxkit#3701](https://github.com/linuxkit/linuxkit/pull/3701) + and [docker/for-mac#5668](https://github.com/docker/for-mac/issues/5668). - Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram. - Fixed an issue related to hardware acceleration [docker/for-mac#5121](https://github.com/docker/for-mac/issues/5121) - Fixed an issue related to Skip This Update for mac [docker/for-mac#5842](https://github.com/docker/for-mac/issues/5842) diff --git a/desktop/windows/release-notes.md b/desktop/windows/release-notes.md index 25ad881619..69020ce7ca 100644 --- a/desktop/windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -35,9 +35,14 @@ This page contains information about the new features, improvements, known issue - [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9) - [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1) - [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3) +- [Linux kernel 5.10.47](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.47-0b705d955f5e283f62583c4e227d64a7924c138f/images/sha256-a4c79bc185ec9eba48dcc802a8881b9d97e532b3f803d23e5b8d4951588f4d51?context=repo) ### Bug fixes and minor changes +- Update kernel configuration to fix a performance regression in [Docker Desktop 3.0.0](#docker-desktop-300) + that caused publishing container ports to take 10 times longer than on older + versions. For more information, see [linuxkit/linuxkit#3701](https://github.com/linuxkit/linuxkit/pull/3701) + and [docker/for-mac#5668](https://github.com/docker/for-mac/issues/5668). - Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram. - Fixed spurious traces on iptables updates. - Fixed slowness when adding multiple ports forwarding option.