From 397c7da3a43dc4f11a8249bd76fc91576ab0300d Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 09:46:58 -0500 Subject: [PATCH 01/84] Update install.md --- docker-for-windows/install.md | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index cf612c569b..a2ec97114f 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -1,12 +1,12 @@ --- -description: How to install Docker for Windows +description: How to install Docker Desktop for Windows keywords: windows, beta, edge, alpha, install, download -title: Install Docker for Windows +title: Install Docker Desktop for Windows --- -Docker for Windows is the [Community Edition +Docker Desktop for Windows is the [Community Edition (CE)](https://www.docker.com/community-edition) of Docker for Microsoft Windows. -To download Docker for Windows, head to Docker Hub. +To download Docker Desktop for Windows, head to Docker Hub. [Download from Docker Hub](https://hub.docker.com/editions/community/docker-ce-desktop-windows){: @@ -14,8 +14,8 @@ Hub](https://hub.docker.com/editions/community/docker-ce-desktop-windows){: ## What to know before you install -* **README FIRST for Docker Toolbox and Docker Machine users**: Docker for - Windows requires Microsoft Hyper-V to run. The Docker for Windows installer +* **README FIRST for Docker Toolbox and Docker Machine users**: Docker Desktop for + Windows requires Microsoft Hyper-V to run. The Docker Desktop for Windows installer enables Hyper-V for you, if needed, and restarts your machine. After Hyper-V is enabled, VirtualBox no longer works, but any VirtualBox VM images remain. VirtualBox VMs created with `docker-machine` (including the `default` one @@ -33,20 +33,20 @@ Hub](https://hub.docker.com/editions/community/docker-ce-desktop-windows){: - CPU SLAT-capable feature. - At least 4GB of RAM. -> **Note**: If your system does not meet the requirements to run Docker for +> **Note**: If your system does not meet the requirements to run Docker Desktop for > Windows, you can install [Docker Toolbox](/toolbox/overview.md), which uses > Oracle Virtual Box instead of Hyper-V. -* **What the Docker for Windows install includes**: The installation provides +* **What the Docker Desktop for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/), Docker CLI client, [Docker Compose](/compose/overview.md), [Docker Machine](/machine/overview.md), and [Kitematic](/kitematic/userguide.md). -* Containers and images created with Docker for Windows are shared between all +* Containers and images created with Docker Desktop for Windows are shared between all user accounts on machines where it is installed. This is because all Windows accounts use the same VM to build and run containers. -* Nested virtualization scenarios, such as running Docker for Windows on a +* Nested virtualization scenarios, such as running Docker Desktop for Windows on a VMWare or Parallels instance might work, but there are no guarantees. For - more information, see [Running Docker for Windows in nested virtualization + more information, see [Running Docker Desktop for Windows in nested virtualization scenarios](troubleshoot.md#running-docker-for-windows-in-nested-virtualization-scenarios) ### About Windows containers @@ -55,7 +55,7 @@ Looking for information on using Windows containers? * [Switch between Windows and Linux containers](https://docs.docker.com/docker-for-windows/#switch-between-windows-and-linux-containers) - describes the Linux / Windows containers toggle in Docker for Windows and + describes the Linux / Windows containers toggle in Docker Desktop for Windows and points you to the tutorial mentioned above. * [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md) @@ -65,9 +65,9 @@ Looking for information on using Windows containers? * Docker Container Platform for Windows Server 2016 [articles and blog posts](https://www.docker.com/microsoft/) on the Docker website -## Install Docker for Windows desktop app +## Install Docker Desktop for Windows desktop app -1. Double-click **Docker for Windows Installer.exe** to run the installer. +1. Double-click **Docker Desktop for Windows Installer.exe** to run the installer. If you haven't already downloaded the installer (`Docker for Windows Installer.exe`), you can get it from @@ -84,10 +84,10 @@ Looking for information on using Windows containers? 3. Click **Finish** on the setup complete dialog to launch Docker. -## Start Docker for Windows +## Start Docker Desktop for Windows Docker does not start automatically after installation. To start it, search for -Docker, select **Docker for Windows** in the search results, and click it (or +Docker, select **Docker Desktop for Windows** in the search results, and click it (or hit Enter). ![search for Docker app](images/docker-app-search.png){:width="400px"} @@ -109,11 +109,11 @@ suggested next steps, and a link to this documentation. When initialization is complete, select **About Docker** from the Notifications area icon to verify that you have the latest version. -Congratulations! You are up and running with Docker for Windows. +Congratulations! You are up and running with Docker Desktop for Windows. ## Where to go next -* [Getting started](index.md) introduces Docker for Windows. +* [Getting started](index.md) introduces Docker Desktop for Windows. * [Get started with Docker](/get-started/) is a tutorial that teaches you how to deploy a multi-service stack. * [Troubleshooting](troubleshoot.md) describes common problems, workarounds, and From f36feeaadc1b92f0ea5cb3a7803a1fb9f9cbe35a Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 09:56:44 -0500 Subject: [PATCH 02/84] Update faqs.md --- docker-for-windows/faqs.md | 76 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docker-for-windows/faqs.md b/docker-for-windows/faqs.md index a391b5712e..997752e827 100644 --- a/docker-for-windows/faqs.md +++ b/docker-for-windows/faqs.md @@ -4,26 +4,26 @@ keywords: windows faqs title: Frequently asked questions (FAQ) --- -**Looking for popular FAQs on Docker for Windows?** Check out the +**Looking for popular FAQs on Docker Desktop for Windows?** Check out the [Docker Success Center](http://success.docker.com/){: target="_blank" class="_"} for knowledge base articles, FAQs, technical support for subscription levels, and more. ### Questions about Stable and Edge channels -#### How do I get the Stable or Edge version of Docker for Windows? +#### How do I get the Stable or Edge version of Docker Desktop for Windows? Use the download links for the channels given in the topic -[Download Docker for Windows](install#download-docker-for-windows). +[Download Docker Desktop for Windows](install#download-docker-for-windows). This topic also has more information about the two channels. -#### What is the difference between the Stable and Edge versions of Docker for Windows? +#### What is the difference between the Stable and Edge versions of Docker Desktop for Windows? -Two different download channels are available for Docker for Windows: +Two different download channels are available for Docker Desktop for Windows: * The **Stable channel** provides a general availability release-ready installer for a fully baked and tested, more reliable app. The Stable version of Docker - for Windows comes with the latest released version of Docker Engine. The + Desktop for Windows comes with the latest released version of Docker Engine. The release schedule is synced with Docker Engine releases and hotfixes. On the Stable channel, you can select whether to send usage statistics and other data. @@ -35,7 +35,7 @@ Two different download channels are available for Docker for Windows: Stable, often one or more per month. Usage statistics and crash reports are sent by default. You do not have the option to disable this on the Edge channel. -#### Can I switch back and forth between Stable and Edge versions of Docker for Windows? +#### Can I switch back and forth between Stable and Edge versions of Docker Desktop for Windows? Yes, you can switch between versions to try out the Edge release to see what's new, then go back to Stable for other work. However, **you can have only one app @@ -43,7 +43,7 @@ installed at a time**. Switching back and forth between Stable and Edge apps can destabilize your development environment, particularly in cases where you switch from a newer (Edge) channel to older (Stable). -For example, containers created with a newer Edge version of Docker for Windows +For example, containers created with a newer Edge version of Docker Desktop for Windows may not work after you switch back to Stable because they may have been created leveraging Edge features that aren't in Stable yet. Just keep this in mind as you create and work with Edge containers, perhaps in the spirit of a playground @@ -88,12 +88,12 @@ You can find the list of frequent issues in [Logs and Troubleshooting](troubleshoot). If you do not find a solution in Troubleshooting, browse issues on -[Docker for Windows issues on GitHub](https://github.com/docker/for-win/issues){: target="_blank" class="_"} +[Docker Desktop for Windows issues on GitHub](https://github.com/docker/for-win/issues){: target="_blank" class="_"} or create a new one. You can also create new issues based on diagnostics. To -learn more about running diagnostics and about Docker for Windows GitHub issues, +learn more about running diagnostics and about Docker Desktop for Windows GitHub issues, see [Diagnose and Feedback](/docker-for-windows#diagnose--feedback). -[Docker for Windows forum](https://forums.docker.com/c/docker-for-windows){: target="_blank" class="_"} +[Docker Desktop for Windows forum](https://forums.docker.com/c/docker-for-windows){: target="_blank" class="_"} provides discussion threads as well, and you can create discussion topics there, but we recommend using the GitHub issues over the forums for better tracking and response. @@ -120,13 +120,13 @@ ID is mentioned in a GitHub issue). Docker Inc. will only use the data in the diagnostics bundle to investigate specific user issues, but may derive high level (non personal) metrics such as the rate of issues from it. -### Can I use Docker for Windows with new swarm mode? +### Can I use Docker Desktop for Windows with new swarm mode? -Yes! You can use Docker for Windows to test single-node features of +Yes! You can use Docker Desktop for Windows to test single-node features of [swarm mode](/engine/swarm/) introduced with Docker Engine 1.12, including initializing a swarm with a single node, creating services, and scaling services. Docker “Moby” on Hyper-V serves as the single swarm node. You can also -use Docker Machine, which comes with Docker for Windows, to create and +use Docker Machine, which comes with Docker Desktop for Windows, to create and experiment with a multi-node swarm. Check out the tutorial at [Get started with swarm mode](/engine/swarm/swarm-tutorial/). @@ -134,21 +134,21 @@ experiment with a multi-node swarm. Check out the tutorial at You might need to provide the location of the Engine API for Docker clients and development tools. -On Docker for Windows, clients can connect to the Docker Engine through a +On Docker Desktop for Windows, clients can connect to the Docker Engine through a **named pipe**: `npipe:////./pipe/docker_engine`, or **TCP socket** at this URL: `tcp://localhost:2375`. This sets `DOCKER_HOST` and `DOCKER_CERT_PATH` environment variables to the given values (for the named pipe or TCP socket, whichever you use). -See also [Docker Engine API](/engine/api) and the Docker for Windows forums +See also [Docker Engine API](/engine/api) and the Docker Desktop for Windows forums topic [How to find the remote API](https://forums.docker.com/t/how-to-find-the-remote-api/20988){: target="_blank" class="_"}. ### Volumes #### Can I change permissions on shared volumes for container-specific deployment requirements? -No, at this point, Docker for Windows does not enable you to control (`chmod`) +No, at this point, Docker Desktop for Windows does not enable you to control (`chmod`) the Unix-style permissions on [shared volumes](/docker-for-windows#shared-drives) for deployed containers, but rather sets permissions to a default value of [0777](http://permissions-calculator.org/decode/0777/){: target="_blank" class="_"} @@ -167,7 +167,7 @@ in [Troubleshooting](troubleshoot). #### Are symlinks supported? -Docker for Windows supports symbolic links (symlinks) created within containers. +Docker Desktop for Windows supports symbolic links (symlinks) created within containers. Symlinks resolve within and across containers. Symlinks created outside of Docker do not work. @@ -176,7 +176,7 @@ To learn more about the reasons for this limitation, see the following discussio * GitHub issue: [Symlinks don't work as expected](https://github.com/docker/for-win/issues/109#issuecomment-251307391){: target="_blank" class="_"} -* Docker for Windows forums topic: +* Docker Desktop for Windows forums topic: [Symlinks on shared volumes not supported](https://forums.docker.com/t/symlinks-on-shared-volumes-not-supported/9288){: target="_blank" class="_"} @@ -184,15 +184,15 @@ To learn more about the reasons for this limitation, see the following discussio #### How do I add custom CA certificates? -Starting with Docker for Windows 1.12.1, 2016-09-16 (Stable) and Beta 26 +Starting with Docker Desktop for Windows 1.12.1, 2016-09-16 (Stable) and Beta 26 (2016-09-14 1.12.1-beta26), all trusted Certificate Authorities (CA) (root or intermediate) are supported. Docker recognizes certs stored under Trust Root Certification Authorities or Intermediate Certification Authorities. -Docker for Windows creates a certificate bundle of all user-trusted CAs based on +Docker Desktop for Windows creates a certificate bundle of all user-trusted CAs based on the Windows certificate store, and appends it to Moby trusted certificates. So if an enterprise SSL certificate is trusted by the user on the host, it is -trusted by Docker for Windows. +trusted by Docker Desktop for Windows. To learn more about how to install a CA root certificate for the registry, see [Verify repository client with certificates](/engine/security/certificates) @@ -200,20 +200,20 @@ in the Docker Engine topics. #### How do I add client certificates? -Starting with Docker for Windows 17.06.0-ce, you do not need to push your +Starting with Docker Desktop for Windows 17.06.0-ce, you do not need to push your certificates with `git` commands anymore. You can put your client certificates in `~/.docker/certs.d/:/client.cert` and `~/.docker/certs.d/:/client.key`. -When the Docker for Windows application starts up, it copies the +When the Docker Desktop for Windows application starts up, it copies the `~/.docker/certs.d` folder on your Windows system to the `/etc/docker/certs.d` -directory on Moby (the Docker for Windows virtual machine running on Hyper-V). +directory on Moby (the Docker fDesktop or Windows virtual machine running on Hyper-V). -You need to restart Docker for Windows after making any changes to the keychain +You need to restart Docker Desktop for Windows after making any changes to the keychain or to the `~/.docker/certs.d` directory in order for the changes to take effect. The registry cannot be listed as an _insecure registry_ (see -[Docker Daemon](/docker-for-windows#daemon)). Docker for Windows ignores +[Docker Daemon](/docker-for-windows#daemon)). Docker Desktop for Windows ignores certificates listed under insecure registries, and does not send client certificates. Commands like `docker run` that attempt to pull from the registry produce error messages on the command line, as well as on the registry. @@ -222,7 +222,7 @@ To learn more about how to set the client TLS certificate for verification, see [Verify repository client with certificates](/engine/security/certificates) in the Docker Engine topics. -### Why does Docker for Windows sometimes lose network connectivity, causing `push` or `pull` commands to fail? +### Why does Docker Desktop for Windows sometimes lose network connectivity, causing `push` or `pull` commands to fail? Networking is not yet fully stable across network changes and system sleep cycles. Exit and start Docker to restore connectivity. @@ -235,15 +235,15 @@ Hyper-V is enabled on Windows. ### Can I share local drives and filesystem with my Docker Machine VMs? No, you cannot share local drives with Docker Machine nodes when using Docker -for Windows with Hyper-V. Shared drives can be made available to containers, but -Docker for Windows does not support mounts for nodes you created with +Desktop for Windows with Hyper-V. Shared drives can be made available to containers, but +Docker Desktop for Windows does not support mounts for nodes you created with `docker-machine`. -For more about sharing local drives with containers using Docker for Windows, +For more about sharing local drives with containers using Docker Desktop for Windows, see [Shared drives](/docker-for-windows#shared-drives) in the Getting Started topic. -To learn more about using Docker for Windows and Docker Machine, see +To learn more about using Docker Desktop for Windows and Docker Machine, see [What to know before you install](install#what-to-know-before-you-install) in the Getting Started topic. For more about Docker Machine itself, see [What is Docker Machine?](/machine/overview#what-is-docker-machine), and the @@ -251,7 +251,7 @@ Getting Started topic. For more about Docker Machine itself, see ### Windows Requirements -#### How do I run Windows containers on Docker on Windows Server 2016? +#### How do I run Windows containers on Docker Desktop on Windows Server 2016? See [About Windows containers and Windows Server 2016](/install/windows/docker-ee/#about-docker-ee-containers-and-windows-server). @@ -260,26 +260,26 @@ A full tutorial is available in [docker/labs](https://github.com/docker/labs){: #### Why is Windows 10 Home not supported? -Docker for Windows requires the Hyper-V Windows feature which is not +Docker Desktop for Windows requires the Hyper-V Windows feature which is not available on Home-edition. #### Why is Windows 10 required? -Docker for Windows uses Windows Hyper-V. While older Windows versions have +Docker Desktop for Windows uses Windows Hyper-V. While older Windows versions have Hyper-V, their Hyper-V implementations lack features critical for Docker for Windows to work. -#### Why does Docker for Windows fail to start when firewalls or anti-virus software is installed? +#### Why does Docker Desktop for Windows fail to start when firewalls or anti-virus software is installed? Some firewalls and anti-virus software might be incompatible with Hyper-V and some Windows 10 builds (possibly, the Anniversary Update), which impacts Docker -for Windows. See details and workarounds in +Desktop for Windows. See details and workarounds in [Docker fails to start when firewall or anti-virus software is installed](troubleshoot#docker-fails-to-start-when-firewall-or-anti-virus-software-is-installed) in [Troubleshooting](troubleshoot). ### How do I uninstall Docker Toolbox? -You might decide that you do not need Toolbox now that you have Docker for +You might decide that you do not need Toolbox now that you have Docker Desktop for Windows, and want to uninstall it. For details on how to perform a clean uninstall of Toolbox on Windows, see [How to uninstall Toolbox](/toolbox/toolbox_install_windows#how-to-uninstall-toolbox) in the Toolbox Windows topics. From 219ff06eb3f22a3f8135be4fc0cc32fc1b0d54a2 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 09:59:14 -0500 Subject: [PATCH 03/84] Update docker-toolbox.md --- docker-for-windows/docker-toolbox.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-for-windows/docker-toolbox.md b/docker-for-windows/docker-toolbox.md index 989ccd9c5a..7e8db8d637 100644 --- a/docker-for-windows/docker-toolbox.md +++ b/docker-for-windows/docker-toolbox.md @@ -1,24 +1,24 @@ --- -description: Docker for Windows and Docker Toolbox +description: Docker Desktop for Windows and Docker Toolbox keywords: windows, alpha, beta, toolbox, docker-machine, tutorial title: Migrate Docker Toolbox --- This page explains how to migrate your Docker Toolbox disk image, or images if -you have them, to Docker for Windows. +you have them, to Docker Desktop for Windows. -In version 18.01.0 and higher, the Docker for Windows installer no longer +In version 18.01.0 and higher, the Docker Desktop for Windows installer no longer prompts users to migrate from Docker Toolbox--you must do so manually. -## How to migrate Docker Toolbox disk images to Docker for Windows +## How to migrate Docker Toolbox disk images to Docker Desktop for Windows > **Warning**: Migrating disk images from Docker Toolbox _clobbers_ Docker > images if they exist. The migration process replaces the entire VM with your > previous Docker Toolbox data. 1. Install [qemu](https://www.qemu.org/){: target="_blank" class="_"} (a machine emulator): [https://cloudbase.it/downloads/qemu-img-win-x64-2_3_0.zip](https://cloudbase.it/downloads/qemu-img-win-x64-2_3_0.zip). -2. Install [Docker for Windows](install/){: target="_blank" class="_"}. -3. Stop Docker for Windows, if running. +2. Install [Docker Desktop for Windows](install/){: target="_blank" class="_"}. +3. Stop Docker Desktop for Windows, if running. 4. Move your current Docker VM disk to a safe location: ```shell @@ -31,7 +31,7 @@ prompts users to migrate from Docker Toolbox--you must do so manually. qemu-img.exe convert 'C:\Users\\.docker\machine\machines\default\disk.vmdk' -O vhdx -o subformat=dynamic -p 'C:\Users\Public\Documents\Hyper-V\Virtual Hard Disks\MobyLinuxVM.vhdx' ``` -6. Restart Docker for Windows (with your converted disk). +6. Restart Docker Desktop for Windows (with your converted disk). ## How to uninstall Docker Toolbox From 9a2ae6b9c3fe916752f686d4f56d87f776a90145 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 10:05:41 -0500 Subject: [PATCH 04/84] Update index.md --- docker-for-windows/index.md | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 06341b846d..f765621b93 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -13,12 +13,12 @@ redirect_from: title: Get started with Docker for Windows --- -Welcome to Docker for Windows! +Welcome to Docker Desktop for Windows! Docker is a full development platform for creating containerized apps, and -Docker for Windows is the best way to get started with Docker _on Windows_. +Docker Desktop for Windows is the best way to get started with Docker _on Windows_. -> See [Install Docker for Windows](install.md){: target="_blank" class="_"} for information on system requirements and stable & edge channels. +> See [Install Docker Desktop for Windows](install.md){: target="_blank" class="_"} for information on system requirements and stable & edge channels. ## Test your installation @@ -178,19 +178,19 @@ running something more complex, such as an OS and a webserver. ## Docker Settings dialog -The **Docker for Windows menu** is a popup by which you can configure your +The **Docker Desktop for Windows menu** is a popup by which you can configure your Docker settings -- installation, updates, version channels, Docker Hub login, and more. This section explains the configuration options accessible from the **Settings** dialog. -1. Open the Docker for Windows menu by right-clicking the Docker icon in the Notifications area (or System tray): +1. Open the Docker Desktop for Windows menu by right-clicking the Docker icon in the Notifications area (or System tray): ![Showing hidden apps in the taskbar](images/whale-icon-systray-hidden.png){:width="250px"} 2. Select **Settings...** to open the Settings dialog: - ![Docker for Windows popup menu](images/docker-menu-settings.png){:width="400px"} + ![Docker Desktop for Windows popup menu](images/docker-menu-settings.png){:width="400px"} ### General @@ -198,23 +198,23 @@ On the **General** tab of the Settings dialog, you can configure when to start a ![Settings](images/settings-general.png){:width="600px"} -* **Start Docker when you log in** - Automatically start the Docker for Windows +* **Start Docker when you log in** - Automatically start the Docker Desktop for Windows application upon Windows system login. -* **Automatically check for updates** - By default, Docker for Windows +* **Automatically check for updates** - By default, Docker Desktop for Windows automatically checks for updates and notifies you when an update is available. Click **OK** to accept and install updates (or cancel to keep the current version). You can manually update by choosing **Check for Updates** from the main Docker menu. -* **Send usage statistics** - By default, Docker for Windows sends diagnostics, +* **Send usage statistics** - By default, Docker Desktop for Windows sends diagnostics, crash reports, and usage data. This information helps Docker improve and troubleshoot the application. Uncheck to opt out. Docker may also sometimes prompt you for more information. ### Shared drives -Share your local drives (volumes) with Docker for Windows, so that they are +Share your local drives (volumes) with Docker Desktop for Windows, so that they are available to your [Linux containers](#switch-between-windows-and-linux-containers). ![Shared drives](images/settings-shared-drives.png){:width="600px"} @@ -240,7 +240,7 @@ credentials so that you don't need to enter them every time. There are a number of issues with using host-mounted volumes and network paths for database files. See [Volume mounts from host paths use a nobrl option to override database locking](troubleshoot.md#volume-mounts-from-host-paths-use-a-nobrl-option-to-override-database-locking). > - * Docker for Windows sets permissions to read/write/execute for users, groups and others [0777 or a+rwx](http://permissions-calculator.org/decode/0777/). + * Docker Desktop for Windows 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). > * Ensure the domain user has access to shared drives, as described in [Verify domain user has permissions for shared drives](troubleshoot.md#verify-domain-user-has-permissions-for-shared-drives-volumes). @@ -292,7 +292,7 @@ The Linux VM restarts after changing the settings on the Advanced tab. This take ### Network -You can configure Docker for Windows networking to work on a virtual private network (VPN). +You can configure Docker Desktop for Windows networking to work on a virtual private network (VPN). ![Network settings](images/settings-network.png){:width="600px"} @@ -300,7 +300,7 @@ You can configure Docker for Windows networking to work on a virtual private net * **DNS Server** - You can configure the DNS server to use dynamic or static IP addressing. -> **Note**: Some users reported problems connecting to Docker Hub on Docker for +> **Note**: Some users reported problems connecting to Docker Hub on Docker Desktop for > Windows stable version. This would manifest as an error when trying to run > `docker` commands that pull images from Docker Hub that are not already > downloaded, such as a first time run of `docker run hello-world`. If you @@ -312,7 +312,7 @@ Updating these settings requires a reconfiguration and reboot of the Linux VM. ### Proxies -Docker for Windows lets you configure HTTP/HTTPS Proxy Settings and +Docker Desktop for Windows lets you configure HTTP/HTTPS Proxy Settings and automatically propagates these to Docker and to your containers. For example, if you set your proxy settings to `http://proxy.example.com`, Docker uses this proxy when pulling containers. @@ -350,7 +350,7 @@ configure the more common daemon options with interactive settings (and also JSO #### Experimental mode -Both Docker for Windows Stable and Edge releases have the experimental version +Both Docker Desktop for Windows Stable and Edge releases have the experimental version of Docker Engine enabled, described in the [Docker Experimental Features README](https://github.com/docker/cli/blob/master/experimental/README.md) on GitHub. @@ -361,7 +361,7 @@ others may be modified or pulled from subsequent Edge releases, and never released on Stable. On both Edge and Stable releases, you can toggle **experimental mode** on and -off. If you toggle it off, Docker for Windows uses the current generally +off. If you toggle it off, Docker Desktop for Windows uses the current generally available release of Docker Engine. Run `docker version` to see if you are in Experimental mode. Experimental mode @@ -424,13 +424,13 @@ For a full list of options on the Docker daemon, see [daemon](/engine/reference/ ### Kubernetes -[Kubernetes on Docker for Windows](/docker-for-windows/kubernetes/){: target="_blank" class="_"} +[Kubernetes on Docker Desktop for Windows](/docker-for-windows/kubernetes/){: target="_blank" class="_"} is available in [18.02 Edge (win50)](/docker-for-windows/edge-release-notes/#docker-community-edition-18020-ce-rc1-win50-2018-01-26){: target="_blank" class="_"} and higher, and in [18.06 Stable (win70)](/docker-for-windows/edge-release-notes/#docker-community-edition-18060-ce-win70-2018-07-25) and higher. ![Enable Kubernetes](images/settings-kubernetes.png){:width="600px"} -From Docker for Windows 18.02 CE Edge and 18.06 CE Stable a standalone Kubernetes server is included that runs on your Windows host, so that you can test deploying your +From Docker Desktop for Windows 18.02 CE Edge and 18.06 CE Stable a standalone Kubernetes server is included that runs on your Windows host, so that you can test deploying your Docker workloads on Kubernetes. The Kubernetes client command, `kubectl`, is included and configured to connect @@ -443,7 +443,7 @@ to change context so that `kubectl` is pointing to `docker-for-desktop`: > kubectl config use-context docker-for-desktop ``` -You can also change it through the Docker for Windows menu: +You can also change it through the Docker Desktop for Windows menu: ![Change Kubernetes Context](images/docker-menu-context-switch.png){:width="600px"} @@ -467,7 +467,7 @@ experience conflicts, remove it. The Kubernetes containers are stopped and removed, and the `/usr/local/bin/kubectl` command is removed. - For more about using the Kubernetes integration with Docker for Windows, + For more about using the Kubernetes integration with Docker Desktop for Windows, see [Deploy on Kubernetes](kubernetes.md). ### Reset @@ -485,15 +485,15 @@ On the Reset tab, you can restart Docker or reset its configuration. Visit our [Logs and Troubleshooting](troubleshoot.md) guide for more details. -Log on to our [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows) to get help from the community, review current user topics, or join a discussion. +Log on to our [Docker Desktop for Windows forum](https://forums.docker.com/c/docker-for-windows) to get help from the community, review current user topics, or join a discussion. -Log on to [Docker for Windows issues on GitHub](https://github.com/docker/for-win/issues) to report bugs or problems and review community reported issues. +Log on to [Docker Desktop for Windows issues on GitHub](https://github.com/docker/for-win/issues) to report bugs or problems and review community reported issues. To give feedback on the documentation or update it yourself, use the Feedback options at the bottom of each docs page. ## Switch between Windows and Linux containers -From the Docker for Windows menu, you can toggle which daemon (Linux or Windows) +From the Docker Desktop for Windows menu, you can toggle which daemon (Linux or Windows) the Docker CLI talks to. Select **Switch to Windows containers** to use Windows containers, or select **Switch to Linux containers** to use Linux containers (the default). @@ -543,7 +543,7 @@ in the FAQs. ## Docker Hub -Select **Sign in /Create Docker ID** from the Docker for Windows menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" clas="_" } account. Once logged in, you can access your Docker Hub repositories directly from the Docker for Windows menu. +Select **Sign in /Create Docker ID** from the Docker Desktop for Windows menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" clas="_" } account. Once logged in, you can access your Docker Hub repositories directly from the Docker Desktop for Windows menu. See these [Docker Hub topics](/docker-hub/index.md){: target="_blank" class="_" } to learn more: From e872839aba4ffbf67d5bdbb60541dbfca68e68f7 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 10:11:49 -0500 Subject: [PATCH 05/84] Update troubleshoot.md --- docker-for-windows/troubleshoot.md | 68 +++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 05cd015e02..b390290cf6 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -8,12 +8,12 @@ title: Logs and troubleshooting --- Here is information about how to diagnose and troubleshoot problems, send logs -and communicate with the Docker for Windows team, use our forums and Knowledge +and communicate with the Docker Desktop for Windows team, use our forums and Knowledge Hub, browse and log issues on GitHub, and find workarounds for known problems. ## Docker Knowledge Hub -**Looking for help with Docker for Windows?** Check out the [Docker Knowledge +**Looking for help with Docker Desktop for Windows?** Check out the [Docker Knowledge Hub](http://success.docker.com/q) for knowledge base articles, FAQs, and technical support for various subscription levels. @@ -22,7 +22,7 @@ technical support for various subscription levels. ### In-app diagnostics If you encounter problems for which you do not find solutions in this -documentation, on [Docker for Windows issues on +documentation, on [Docker Desktop for Windows issues on GitHub](https://github.com/docker/for-win/issues), or the [Docker for Win forum](https://forums.docker.com/c/docker-for-windows), we can help you troubleshoot the log data. @@ -41,7 +41,7 @@ Desktop](https://docs.docker.com/docker-for-mac/faqs/#how-is-personal-data-handl ![Diagnose & Feedback with ID](images/diagnostic-id.png){:width="600px"} -If you click on **Report an issue**, this opens [Docker for Windows issues on +If you click on **Report an issue**, this opens [Docker Desktop for Windows issues on GitHub](https://github.com/docker/for-win/issues/) in your web browser in a "create new issue" template, to be completed before submision. Do not forget to include your diagnostic ID. @@ -51,7 +51,7 @@ include your diagnostic ID. ### Diagnosing from the terminal On occasions it is useful to run the diagnostics yourself, for instance if -Docker for Windows cannot start. +Docker Desktop for Windows cannot start. First locate the `com.docker.diagnose`, that should be in `C:\Program Files\Docker\Docker\resources\com.docker.diagnose.exe`. @@ -74,7 +74,7 @@ Diagnostics ID: CD6CF862-9CBD-4007-9C2F-5FBE0572BBC2/20180720152545 (uploade ### Make sure certificates are set up correctly -Docker for Windows ignores certificates listed under insecure registries, and +Docker Desktop for Windows ignores certificates listed under insecure registries, and does not send client certificates to them. Commands like `docker run` that attempt to pull from the registry produces error messages on the command line, like this: @@ -99,7 +99,7 @@ Getting Started topic. #### Permissions errors on data directories for shared volumes -Docker for Windows sets permissions on [shared volumes](index.md#shared-drives) +Docker Desktop for Windows sets permissions on [shared volumes](index.md#shared-drives) to a default value of [0777](http://permissions-calculator.org/decode/0777/) (`read`, `write`, `execute` permissions for `user` and for `group`). @@ -109,7 +109,7 @@ volume defaults at container runtime, you need to either use non-host-mounted volumes or find a way to make the applications work with the default file permissions. -Docker for Windows currrently implements host-mounted volumes based on the +Docker Desktop for Windows currrently implements host-mounted volumes based on the [Microsoft SMB protocol](https://msdn.microsoft.com/en-us/library/windows/desktop/aa365233(v=vs.85).aspx), which does not support fine-grained, `chmod` control over these permissions. @@ -123,7 +123,7 @@ drives](https://github.com/docker/docker.github.io/issues/3298). #### inotify on shared drives does not work -Currently, `inotify` does not work on Docker for Windows. This becomes evident, +Currently, `inotify` does not work on Docker Desktop for Windows. This becomes evident, for example, when an application needs to read/write to a container across a mounted drive. Instead of relying on filesystem inotify, we recommend using polling features for your framework or programming language. @@ -133,7 +133,7 @@ polling features for your framework or programming language. polling mode described here: [nodemon isn't restarting node applications](https://github.com/remy/nodemon#application-isnt-restarting) -* **Docker for Windows issue on GitHub** - See the issue [Inotify on shared +* **Docker Desktop for Windows issue on GitHub** - See the issue [Inotify on shared drives does not work](https://github.com/docker/for-win/issues/56#issuecomment-242135705) @@ -214,7 +214,7 @@ container](https://github.com/docker/for-win/issues/25). #### Volume mounts from host paths use a `nobrl` option to override database locking You may encounter problems using volume mounts on the host, depending on the -database software and which options are enabled. Docker for Windows uses +database software and which options are enabled. Docker Desktop for Windows uses [SMB/CIFS protocols](https://msdn.microsoft.com/en-us/library/windows/desktop/aa365233(v=vs.85).aspx) to mount host paths, and mounts them with the `nobrl` option, which prevents @@ -239,7 +239,7 @@ Compose file documentation. #### Local security policies can block shared drives and cause login errors -You need permissions to mount shared drives to use the Docker for Windows +You need permissions to mount shared drives to use the Docker Desktop for Windows [shared drives](index.md#shared-drives) feature. If local policy prevents this, you get errors when you attempt to enable shared @@ -286,7 +286,7 @@ script](https://github.com/moby/moby/issues/24388). ### Virtualization -In order for Docker for Windows to function properly your machine needs: +In order for Docker Desktop for Windows to function properly your machine needs: 1. [Hyper-V](https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/hyper-v-technology-overview) installed and working @@ -297,14 +297,14 @@ In order for Docker for Windows to function properly your machine needs: #### Hyper-V -Docker for Windows requires a Hyper-V as well as the Hyper-V Module for Windows -Powershell to be installed and enabled. The Docker for Windows installer enables +Docker Desktop for Windows requires a Hyper-V as well as the Hyper-V Module for Windows +Powershell to be installed and enabled. The Docker Desktop for Windows installer enables it for you. See [these instructions](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install) to install Hyper-V manually. A reboot is *required*. If you install Hyper-V -without the reboot, Docker for Windows does not work correctly. On some systems, +without the reboot, Docker Desktop for Windows does not work correctly. On some systems, Virtualization needs to be enabled in the BIOS. The steps to do so are Vendor specific, but typically the BIOS option is called `Virtualization Technology (VTx)` or similar. @@ -317,11 +317,11 @@ In the subequent screen, verify Hyper-V is enabled and has a checkmark: #### Hyper-V driver for Docker Machine -Docker for Windows comes with the legacy tool Docker Machine which uses the old +Docker Desktop for Windows comes with the legacy tool Docker Machine which uses the old [`boot2docker.iso`](https://github.com/boot2docker/boot2docker){: target="_blank" class="_"}, and the [Microsoft Hyper-V driver](/machine/drivers/hyper-v.md) to create local virtual machines. _This is -tangential to using Docker for Windows_, but if you want to use Docker Machine +tangential to using Docker Desktop for Windows_, but if you want to use Docker Machine to create multiple local VMs, or to provision remote machines, see the [Docker Machine](/machine/index.md) topics. We mention this here only in case someone is looking for information about Docker Machine on Windows, which requires that @@ -337,16 +337,16 @@ Performance tab on the Task Manager: ![Task Manager](images/virtualization-enabled.png){:width="700px"} If, at some point, if you manually uninstall Hyper-V or disable virtualization, -Docker for Windows cannot start. See: [Unable to run Docker for Windows on +Docker Desktop for Windows cannot start. See: [Unable to run Docker for Windows on Windows 10 Enterprise](https://github.com/docker/for-win/issues/74). -### Networking and WiFi problems upon Docker for Windows install +### Networking and WiFi problems upon Docker Desktop for Windows install Some users have encountered networking issues during install and startup of -Docker for Windows. For example, upon install or auto-reboot, network adapters +Docker Desktop for Windows. For example, upon install or auto-reboot, network adapters and/or WiFi gets disabled. In some scenarios, problems are due to having VirtualBox or its network adapters still installed, but in other scenarios this -is not the case. (See also, Docker for Windows issue on GitHub: [Enabling +is not the case. (See also, Docker Desktop for Windows issue on GitHub: [Enabling Hyper-V feature turns my wi-fi off](https://github.com/docker/for-win/issues/139).) @@ -392,7 +392,7 @@ A full tutorial is available in [docker/labs](https://github.com/docker/labs) at Containers](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md). You can install a native Windows binary which allows you to develop and run -Windows containers without Docker for Windows. However, if you install Docker +Windows containers without Docker Desktop for Windows. However, if you install Docker this way, you cannot develop or run Linux containers. If you try to run a Linux container on the native Docker daemon, an error occurs: @@ -404,7 +404,7 @@ C:\Program Files\Docker\docker.exe: ### Limitations of Windows containers for `localhost` and published ports -Docker for Windows provides the option to switch Windows and Linux containers. +Docker Desktop for Windows provides the option to switch Windows and Linux containers. If you are using Windows containers, keep in mind that there are some limitations with regard to networking due to the current implementation of Windows NAT (WinNAT). These limitations may potentially resolve as the Windows @@ -459,7 +459,7 @@ Now you can connect to the webserver by using `http://172.17.0.2:80` (or simply For more information, see: -* Docker for Windows issue on GitHub: [Port binding does not work for +* Docker Desktop for Windows issue on GitHub: [Port binding does not work for locahost](https://github.com/docker/for-win/issues/458) * [Published Ports on Windows Containers Don't Do @@ -469,16 +469,16 @@ For more information, see: limitations](https://blogs.technet.microsoft.com/virtualization/2016/05/25/windows-nat-winnat-capabilities-and-limitations/) -### Running Docker for Windows in nested virtualization scenarios +### Running Docker Desktop for Windows in nested virtualization scenarios -Docker for Windows can run inside a Windows 10 virtual machine (VM) running on +Docker Desktop for Windows can run inside a Windows 10 virtual machine (VM) running on apps like Parallels or VMware Fusion on a Mac provided that the VM is properly configured. However, problems and intermittent failures may still occur due to the way these apps virtualize the hardware. For these reasons, _**Docker for Windows is not supported for nested virtualization scenarios**_. It might work in some cases, and not in others. -The better solution is to run Docker for Windows natively on a Windows system +The better solution is to run Docker Desktop for Windows natively on a Windows system (to work with Windows or Linux containers), or Docker for Mac on Mac to work with Linux containers. @@ -548,14 +548,14 @@ We are currently investigating this issue. ### NAT/IP configuration -By default, Docker for Windows uses an internal network prefix of +By default, Docker Desktop for Windows uses an internal network prefix of `10.0.75.0/24`. Should this clash with your normal network setup, you can change the prefix from the **Settings** menu. See the [Network](index.md#network) topic under [Settings](index.md#docker-settings). ## Workarounds -### `inotify` currently does not work on Docker for Windows +### `inotify` currently does not work on Docker Desktop for Windows If you are using `Node.js` with `nodemon`, a temporary workaround is to try the fallback polling mode described here: [nodemon isn't restarting node @@ -576,10 +576,10 @@ consult the shell's documentation. ### Make sure Docker is running for webserver examples -For the `hello-world-nginx` example and others, Docker for Windows must be +For the `hello-world-nginx` example and others, Docker Desktop for Windows must be running to get to the webserver on `http://localhost/`. Make sure that the Docker whale is showing in the menu bar, and that you run the Docker commands in -a shell that is connected to the Docker for Windows Engine (not Engine from +a shell that is connected to the Docker Desktop for Windows Engine (not Engine from Toolbox). Otherwise, you might start the webserver container but get a "web page not available" error when you go to `docker`. @@ -601,7 +601,7 @@ docker app. **Some firewalls and anti-virus software might be incompatible with Microsoft **Windows 10 builds**, such as Windows 10 Anniversary Update. The conflict typically occurs after a Windows update or new install of the firewall, and -manifests as an error response from the Docker daemon and a **Docker for Windows +manifests as an error response from the Docker daemon and a **Docker Desktop for Windows start failure**. The Comodo Firewall was one example of this problem, but users report that software has since been updated to work with these Windows 10 builds. @@ -610,7 +610,7 @@ See the Comodo forums topics [Comodo Firewall conflict with Hyper-V](https://forums.comodo.com/bug-reports-cis/comodo-firewall-began-conflict-with-hyperv-t116351.0.html) and [Windows 10 Anniversary build doesn't allow Comodo drivers to be installed](https://forums.comodo.com/install-setup-configuration-help-cis/windows-10-aniversary-build-doesnt-allow-comodo-drivers-to-be-installed-t116322.0.html). -A Docker for Windows user-created issue describes the problem specifically as it +A Docker Desktop for Windows user-created issue describes the problem specifically as it relates to Docker: [Docker fails to start on Windows 10](https://github.com/docker/for-win/issues/27). From 7bef7e51da86975158dc984277b5117e15326c20 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 10:16:55 -0500 Subject: [PATCH 06/84] Update get-started.md --- machine/get-started.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/machine/get-started.md b/machine/get-started.md index 847669b477..9177a9bf1c 100644 --- a/machine/get-started.md +++ b/machine/get-started.md @@ -9,17 +9,17 @@ Docker host inside of a local virtual machine. ## Prerequisite Information -With the advent of [Docker for Mac](/docker-for-mac/index.md) and [Docker for +With the advent of [Docker Desktop for Mac](/docker-for-mac/index.md) and [Docker Desktop for Windows](/docker-for-windows/index.md) as replacements for [Docker Toolbox](/toolbox/overview.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. (See [Docker for Mac vs. +local system without using Docker Machine at all. (See [Docker Desktop for Mac vs. Docker Toolbox](/docker-for-mac/docker-toolbox.md) for an explanation on the Mac side.) For now, however, if you want to create _multiple_ local machines, you still need Docker Machine to create and manage machines for multi-node -experimentation. Both Docker for Mac and Docker for Windows include the newest +experimentation. Both Docker Desktop for Mac and Docker Desktop for Windows include the newest version of Docker Machine, so when you install either of these, you get `docker-machine`. @@ -27,13 +27,13 @@ The new solutions come with their own native virtualization solutions rather than Oracle VirtualBox, so keep the following considerations in mind when using Machine to create local VMs. -* **Docker for Mac** - You can use `docker-machine create` with the `virtualbox` driver to create additional local machines. +* **Docker Desktop for Mac** - You can use `docker-machine create` with the `virtualbox` driver to create additional local machines. -* **Docker for Windows** - You can use `docker-machine create` with the `hyperv` driver to create additional local machines. +* **Docker Desktop for Windows** - You can use `docker-machine create` with the `hyperv` driver to create additional local machines. -#### If you are using Docker for Windows +#### If you are using Docker Desktop for Windows -Docker for Windows uses [Microsoft +Docker Desktop for Windows uses [Microsoft Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/windows_welcome) for virtualization, and Hyper-V is not compatible with Oracle VirtualBox. Therefore, you cannot run the two solutions simultaneously. But you can still @@ -42,15 +42,15 @@ driver. The prerequisites are: -* Have Docker for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker 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](/docker-for-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, which includes an [example](/machine/drivers/hyper-v.md#example) of how to do this. -#### If you are using Docker for Mac +#### If you are using Docker Desktop for Mac -Docker for Mac uses [HyperKit](https://github.com/docker/HyperKit/), a +Docker Desktop for Mac uses [HyperKit](https://github.com/docker/HyperKit/), a lightweight macOS virtualization solution built on top of the [Hypervisor.framework](https://developer.apple.com/reference/hypervisor). @@ -58,7 +58,7 @@ Currently, there is no `docker-machine create` driver for HyperKit, so use the `virtualbox` driver to create local machines. (See the [Docker Machine driver for Oracle VirtualBox](drivers/virtualbox.md).) You can run both HyperKit and Oracle VirtualBox on the same system. To learn more, see -[Docker for Mac vs. Docker Toolbox](/docker-for-mac/docker-toolbox/). +[Docker Desktop for Mac vs. Docker Toolbox](/docker-for-mac/docker-toolbox/). * Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"} correctly installed on your system (either as part of an earlier Toolbox install, @@ -66,7 +66,7 @@ both HyperKit and Oracle VirtualBox on the same system. To learn more, see #### If you are using Docker Toolbox -Docker for Mac and Docker for Windows both require newer versions of their +Docker Desktop for Mac and Docker Desktop for Windows both require newer versions of their respective operating systems, so users with older OS versions must use Docker Toolbox. @@ -75,14 +75,14 @@ machine based on Oracle [VirtualBox](https://www.virtualbox.org/){: target="_blank" class="_"}. (See the [Docker Machine driver for Oracle VirtualBox](drivers/virtualbox.md).) -* If you are using Docker Toolbox on a Windows system that has Hyper-V but cannot run Docker for Windows (for example Windows 8 Pro), you must use the +* If you are using Docker Toolbox on a Windows system that has Hyper-V but cannot run Docker Desktop for Windows (for example Windows 8 Pro), you must use the `hyperv` driver to create local machines. (See the [Docker Machine driver for Microsoft Hyper-V](drivers/hyper-v.md).) * Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"} correctly installed on your system. If you used [Toolbox](https://www.docker.com/products/docker-toolbox){: target="_blank" class="_"} - or [Docker for Windows](/docker-for-windows/index.md){: target="_blank" class="_"} + or [Docker Desktop for Windows](/docker-for-windows/index.md){: target="_blank" class="_"} to install Docker Machine, VirtualBox is automatically installed. @@ -123,9 +123,9 @@ The examples here show how to create and start a machine, run Docker commands, a it `default` as shown in the example. If you already have a "default" machine, choose another name for this new machine. - * If you are using Toolbox on Mac, Toolbox on older Windows systems without Hyper-V, or Docker for Mac, use `virtualbox` as the driver, as shown in this example. (The Docker Machine VirtualBox driver reference is [here](drivers/virtualbox.md).) (See [prerequisites](get-started.md#prerequisite-information) above to learn more.) + * If you are using Toolbox on Mac, Toolbox on older Windows systems without Hyper-V, or Docker Desktop for Mac, use `virtualbox` as the driver, as shown in this example. (The Docker Machine VirtualBox driver reference is [here](drivers/virtualbox.md).) (See [prerequisites](get-started.md#prerequisite-information) above to learn more.) - * On Docker for Windows systems that support Hyper-V, use the `hyperv` driver as shown in the [Docker Machine Microsoft Hyper-V driver reference](drivers/hyper-v.md) and follow the [example](/machine/drivers/hyper-v.md#example), which shows how to use an external network switch and provides the flags for the full command. (See [prerequisites](get-started.md#prerequisite-information) above to learn more.) + * On Docker Desktop for Windows systems that support Hyper-V, use the `hyperv` driver as shown in the [Docker Machine Microsoft Hyper-V driver reference](drivers/hyper-v.md) and follow the [example](/machine/drivers/hyper-v.md#example), which shows how to use an external network switch and provides the flags for the full command. (See [prerequisites](get-started.md#prerequisite-information) above to learn more.) $ docker-machine create --driver virtualbox default Running pre-create checks... @@ -290,7 +290,7 @@ For machines other than `default`, and commands other than those listed above, y ## Unset environment variables in the current shell You might want to use the current shell to connect to a different Docker Engine. -This would be the case if, for example, you are [running Docker for Mac +This would be the case if, for example, you are [running Docker Desktop for Mac concurrent with Docker Toolbox](/docker-for-mac/docker-toolbox.md) and want to talk to two different Docker Engines. In both scenarios, you have the option to switch the environment for the current @@ -339,12 +339,12 @@ shell to talk to different Docker engines. $ env | grep DOCKER ``` - If you are running Docker for Mac, you can run Docker commands to talk + If you are running Docker Desktop for Mac, you can run Docker commands to talk to the Docker Engine installed with that app. - Since [Docker for Windows is incompatible with + Since [Docker Desktop for Windows is incompatible with Toolbox](/docker-for-windows/install.md#what-to-know-before-you-install), - this scenario isn't applicable because Docker for Windows uses the Docker + this scenario isn't applicable because Docker Desktop for Windows uses the Docker Engine and Docker Machine that come with it. ## Start local machines on startup From bb19d49405364d4ab6e5a4161add610a3e70194d Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 10:19:57 -0500 Subject: [PATCH 07/84] Update index.md --- engine/swarm/swarm-tutorial/index.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/swarm/swarm-tutorial/index.md b/engine/swarm/swarm-tutorial/index.md index 50700d4f89..de929e7cb5 100644 --- a/engine/swarm/swarm-tutorial/index.md +++ b/engine/swarm/swarm-tutorial/index.md @@ -56,7 +56,7 @@ follows: * [install Docker Engine on Linux machines](#install-docker-engine-on-linux-machines) -* [use Docker for Mac or Docker for Windows](#use-docker-for-mac-or-docker-for-windows) +* [use Docker Desktop for Mac or Docker Desktop for Windows](#use-docker-for-mac-or-docker-for-windows) #### Install Docker Engine on Linux machines @@ -66,29 +66,29 @@ instructions](../../installation/index.md) for your platform. Spin up the three machines, and you are ready. You can test both single-node and multi-node swarm scenarios on Linux machines. -#### Use Docker for Mac or Docker for Windows +#### Use Docker Desktop for Mac or Docker Desktop for Windows -Alternatively, install the latest [Docker for Mac](/docker-for-mac/index.md) or -[Docker for Windows](/docker-for-windows/index.md) application on one +Alternatively, install the latest [Docker Desktop for Mac](/docker-for-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. -* You can use Docker for Mac or Windows to test _single-node_ features of swarm +* You can use Docker Desktop for Mac or Windows to test _single-node_ features of swarm mode, including initializing a swarm with a single node, creating services, and scaling services. Docker "Moby" on Hyperkit (Mac) or Hyper-V (Windows) serve as the single swarm node.

-* Currently, you cannot use Docker for Mac or Docker for Windows alone to test a +* Currently, you cannot use Docker Desktop for Mac or Docker Desktop for Windows alone to test a _multi-node_ swarm. However, you can use the included version of [Docker Machine](/machine/overview.md) to create the swarm nodes (see [Get started with Docker Machine and a local VM](/machine/get-started.md)), then follow the tutorial for all multi-node features. For this scenario, you run -commands from a Docker for Mac or Docker for Windows host, but that Docker host itself is +commands from a Docker for Mac or Docker Desktop for Windows host, but that Docker host itself is _not_ participating in the swarm. After you create the nodes, you can run all swarm commands as shown from the Mac terminal or Windows PowerShell with -Docker for Mac or Docker for Windows running. +Docker for Mac or Docker Desktop for Windows running. ### The IP address of the manager machine From d94d6ff294648e67d7f7f119582245dd611e0270 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 10:23:53 -0500 Subject: [PATCH 08/84] Update toolbox_install_windows.md --- toolbox/toolbox_install_windows.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/toolbox/toolbox_install_windows.md b/toolbox/toolbox_install_windows.md index cd7c8b679a..dc808e9c57 100644 --- a/toolbox/toolbox_install_windows.md +++ b/toolbox/toolbox_install_windows.md @@ -7,7 +7,7 @@ title: Install Docker Toolbox on Windows Docker Toolbox provides a way to use Docker on Windows systems that do not -meet minimal system requirements for the [Docker for +meet minimal system requirements for the [Docker Desktop for Windows](/docker-for-windows/index.md) app. If you have not done so already, download the installer here: @@ -33,7 +33,7 @@ small Linux VM on your machine. This VM hosts Docker Engine for you on your Windows system. >**Tip**: One of the advantages of the newer -[Docker for +[Docker Desktop for Windows](/docker-for-windows/index.md) solution is that it uses native virtualization and does not require VirtualBox to run Docker. @@ -50,11 +50,11 @@ To verify your machine meets these requirements, do the following: If you have a newer system, specifically 64bit Windows 10 Pro, with Enterprise and Education (1607 Anniversary update, Build 14393 or later), - consider using [Docker for Windows](/docker-for-windows) instead. It runs + consider using [Docker Desktop for Windows](/docker-for-windows) instead. It runs natively on the Windows, so there is no need for a pre-configured Docker QuickStart shell. It also uses Hyper-V for virtualization, so the instructions below for checking virtualization will be out of date for newer - Windows systems. Full install prerequisites are provided in the Docker for + Windows systems. Full install prerequisites are provided in the Docker Desktop for Windows topic in [What to know before you install](/docker-for-windows/#what-to-know-before-you-install). @@ -230,7 +230,7 @@ Removing Toolbox involves removing all the Docker components it includes. A full uninstall also includes removing the local and remote machines you created with Docker Machine. In some cases, you might want to keep machines created with Docker Machine. -For example, if you plan to re-install Docker Machine as a part of Docker for Windows you can continue to manage those machines through Docker. Or, if you have remote machines on a cloud provider and you plan to manage them using the provider, you wouldn't want to remove them. So the step to remove machines is described here as optional. +For example, if you plan to re-install Docker Machine as a part of Docker Desktop for Windows you can continue to manage those machines through Docker. Or, if you have remote machines on a cloud provider and you plan to manage them using the provider, you wouldn't want to remove them. So the step to remove machines is described here as optional. To uninstall Toolbox on Windows, do the following: @@ -253,7 +253,7 @@ To uninstall Toolbox on Windows, do the following: This step is optional because if you plan to re-install Docker Machine as a part - of [Docker for + of [Docker Desktop for Windows](/docker-for-windows/index.md), you can import and continue to manage those machines through Docker. From 8b74e73b8b4bd9e6a42156332d21476ed394278c Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 10:26:22 -0500 Subject: [PATCH 09/84] Update install.md --- docker-for-windows/install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index a2ec97114f..9b5b769e81 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -20,7 +20,7 @@ Hub](https://hub.docker.com/editions/community/docker-ce-desktop-windows){: enabled, VirtualBox no longer works, but any VirtualBox VM images remain. VirtualBox VMs created with `docker-machine` (including the `default` one typically created during Toolbox install) no longer start. These VMs cannot be - used side-by-side with Docker for Windows. However, you can still use + used side-by-side with Docker Desktop for Windows. However, you can still use `docker-machine` to manage remote VMs. * **System Requirements**: @@ -69,7 +69,7 @@ Looking for information on using Windows containers? 1. Double-click **Docker Desktop for Windows Installer.exe** to run the installer. - If you haven't already downloaded the installer (`Docker for Windows + If you haven't already downloaded the installer (`Docker Desktop Installer.exe`), you can get it from [**download.docker.com**](https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe). It typically downloads to your `Downloads` folder, or you can run it from From 4ccef1ef6c87ea9b906e5879e52567676dd54475 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 12:54:19 -0500 Subject: [PATCH 10/84] Update faqs.md --- docker-for-windows/faqs.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-for-windows/faqs.md b/docker-for-windows/faqs.md index 997752e827..183faecbfa 100644 --- a/docker-for-windows/faqs.md +++ b/docker-for-windows/faqs.md @@ -101,7 +101,7 @@ response. #### How can I opt out of sending my usage data? If you do not want auto-send of usage data, use the Stable channel. For more -information, see [Stable and Edge channels](#questions-about-stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker for Windows?"). +information, see [Stable and Edge channels](#questions-about-stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker Desktop for Windows?"). ### How is personal data handled in Docker Desktop? @@ -160,7 +160,7 @@ For workarounds and to learn more, see #### Why doesn't `nodemon` pick up file changes in a container mounted on a shared drive? -Currently, `inotify` does not work on Docker for Windows. This is a known issue. +Currently, `inotify` does not work on Docker Desktop for Windows. This is a known issue. For more information and a temporary workaround, see [inotify on shared drives does not work](troubleshoot#inotify-on-shared-drives-does-not-work){: target="_blank" class="_"} in [Troubleshooting](troubleshoot). @@ -266,7 +266,7 @@ available on Home-edition. #### Why is Windows 10 required? Docker Desktop for Windows uses Windows Hyper-V. While older Windows versions have -Hyper-V, their Hyper-V implementations lack features critical for Docker for +Hyper-V, their Hyper-V implementations lack features critical for Docker Desktop for Windows to work. #### Why does Docker Desktop for Windows fail to start when firewalls or anti-virus software is installed? From a05e627550827361bea28c678f3f2bc6b4bcd7bd Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 12:56:36 -0500 Subject: [PATCH 11/84] Update index.md --- docker-for-windows/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index f765621b93..2db9fa1c2d 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -274,7 +274,7 @@ If you run a Docker command from a shell with a volume mount (as shown in the example below) or kick off a Compose file that includes volume mounts, you get a popup asking if you want to share the specified drive. -You can select to **Share it**, in which case it is added your Docker for +You can select to **Share it**, in which case it is added your Docker Desktop for Windows [Shared Drives list](index.md#shared-drives) and available to containers. Alternatively, you can opt not to share it by hitting Cancel. @@ -288,7 +288,7 @@ The Linux VM restarts after changing the settings on the Advanced tab. This take * **CPUs** - Change the number of processors assigned to the Linux VM. -* **Memory** - Change the amount of memory the Docker for Windows Linux VM uses. +* **Memory** - Change the amount of memory the Docker Desktop for Windows Linux VM uses. ### Network From 0087ec819e9cbb0083d633684acc9788f12d1366 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 12:59:15 -0500 Subject: [PATCH 12/84] Update troubleshoot.md --- docker-for-windows/troubleshoot.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index b390290cf6..8fdac64cf7 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -23,7 +23,7 @@ technical support for various subscription levels. If you encounter problems for which you do not find solutions in this documentation, on [Docker Desktop for Windows issues on -GitHub](https://github.com/docker/for-win/issues), or the [Docker for Win +GitHub](https://github.com/docker/for-win/issues), or the [Docker Desktop for Windows forum](https://forums.docker.com/c/docker-for-windows), we can help you troubleshoot the log data. @@ -474,12 +474,12 @@ For more information, see: Docker Desktop for Windows can run inside a Windows 10 virtual machine (VM) running on apps like Parallels or VMware Fusion on a Mac provided that the VM is properly configured. However, problems and intermittent failures may still occur due to -the way these apps virtualize the hardware. For these reasons, _**Docker for +the way these apps virtualize the hardware. For these reasons, _**Docker Desktop for Windows is not supported for nested virtualization scenarios**_. It might work in some cases, and not in others. The better solution is to run Docker Desktop for Windows natively on a Windows system -(to work with Windows or Linux containers), or Docker for Mac on Mac to work +(to work with Windows or Linux containers), or Docker Desktop for Mac on Mac to work with Linux containers. #### If you still want to use nested virtualization @@ -523,7 +523,7 @@ Discussion thread on GitHub at [Docker for Windows issue ### Networking issues -Some users have reported problems connecting to Docker Hub on the Docker for +Some users have reported problems connecting to Docker Hub on the Docker Desktop for Windows stable version. (See GitHub issue [22567](https://github.com/moby/moby/issues/22567).) From 4fb1c403ea696200b98be292cf72f28cf04e08df Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:01:08 -0500 Subject: [PATCH 13/84] Update index.md --- engine/swarm/swarm-tutorial/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/swarm/swarm-tutorial/index.md b/engine/swarm/swarm-tutorial/index.md index de929e7cb5..6a8183e656 100644 --- a/engine/swarm/swarm-tutorial/index.md +++ b/engine/swarm/swarm-tutorial/index.md @@ -85,10 +85,10 @@ _multi-node_ swarm. However, you can use the included version of [Docker Machine](/machine/overview.md) to create the swarm nodes (see [Get started with Docker Machine and a local VM](/machine/get-started.md)), then follow the tutorial for all multi-node features. For this scenario, you run -commands from a Docker for Mac or Docker Desktop for Windows host, but that Docker host itself is +commands from a Docker Desktop for Mac or Docker Desktop for Windows host, but that Docker host itself is _not_ participating in the swarm. After you create the nodes, you can run all swarm commands as shown from the Mac terminal or Windows PowerShell with -Docker for Mac or Docker Desktop for Windows running. +Docker Desktop for Mac or Docker Desktop for Windows running. ### The IP address of the manager machine From c569fe224e94e4eebceaa021805b6170e5964b0f Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:05:08 -0500 Subject: [PATCH 14/84] Update index.md --- index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.md b/index.md index 9ef3dba252..7959711d85 100644 --- a/index.md +++ b/index.md @@ -73,18 +73,18 @@ the industry to modernize all applications. Docker EE Advanced comes with enterp

- Docker for Mac + Docker Desktop for Mac
-

Docker for Mac

+

Docker Desktop for Mac

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

- Docker for Windows + Docker Desktop for Windows
-

Docker for Windows

+

Docker Desktop for Windows

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

From 2d752d9d3496c4082b25752cad20bc4b94efb672 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:06:21 -0500 Subject: [PATCH 15/84] Update dotnetcore.md --- engine/examples/dotnetcore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/examples/dotnetcore.md b/engine/examples/dotnetcore.md index 14a656d4f8..38facac14b 100644 --- a/engine/examples/dotnetcore.md +++ b/engine/examples/dotnetcore.md @@ -35,7 +35,7 @@ tutorial](https://www.asp.net/get-started) to initialize a project or clone our 2. Add the text below to your `Dockerfile` for either Linux or [Windows Containers](https://docs.microsoft.com/en-us/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 for + Linux containers depending on what mode is set in [Docker Desktop for Windows](/docker-for-windows/). Read more on [switching containers](/docker-for-windows/#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. From ae7f5e3aa4f646f9683d8678025406610d220614 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:08:23 -0500 Subject: [PATCH 16/84] Update overview.md --- machine/overview.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/machine/overview.md b/machine/overview.md index 16c63c3485..6c6d0bdb47 100644 --- a/machine/overview.md +++ b/machine/overview.md @@ -27,11 +27,11 @@ point to a host called `default`, follow on-screen instructions to complete `env` setup, and run `docker ps`, `docker run hello-world`, and so forth. 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 for -Mac](/docker-for-mac/index.md) and [Docker for +v1.12. Starting with the beta program and Docker v1.12, [Docker Desktop for +Mac](/docker-for-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. The installers for Docker for Mac and Docker for +to try out these new apps. The installers for Docker Desktop for Mac and Docker Desktop for Windows include Docker Machine, along with Docker Compose. If you aren't sure where to begin, see [Get Started with Docker](/get-started/), @@ -51,7 +51,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 for Mac](/docker-for-mac/index.md) and [Docker for Windows](/docker-for-windows/index.md) apps, then you need Docker Machine run Docker Engine locally. Installing Docker Machine on a Mac or Windows box with the [Docker Toolbox](/toolbox/overview.md) installer provisions a local virtual machine with Docker Engine, gives you the ability to connect it, and run `docker` commands. + 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 run Docker Engine locally. Installing Docker Machine on a Mac or Windows box with the [Docker Toolbox](/toolbox/overview.md) installer provisions a local virtual machine with Docker Engine, gives you the ability to connect it, and run `docker` commands. * **I want to provision Docker hosts on remote systems** From 403da538a2f0c6c6986ec840fc3c48acc4a7ccbc Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:12:20 -0500 Subject: [PATCH 17/84] Update create-swarm.md --- engine/swarm/swarm-tutorial/create-swarm.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/swarm/swarm-tutorial/create-swarm.md b/engine/swarm/swarm-tutorial/create-swarm.md index 75675454e5..1fe91ab00b 100644 --- a/engine/swarm/swarm-tutorial/create-swarm.md +++ b/engine/swarm/swarm-tutorial/create-swarm.md @@ -23,10 +23,10 @@ machines. $ docker swarm init --advertise-addr ``` - >**Note**: If you are using Docker for Mac or Docker for Windows to test + >**Note**: If you are using Docker Desktop for Mac or Docker Desktop for Windows to test single-node swarm, simply run `docker swarm init` with no arguments. There is no need to specify `--advertise-addr` in this case. To learn more, see the topic -on how to [Use Docker for Mac or Docker for +on how to [Use Docker Desktop or Mac or Docker Desktop for Windows](/engine/swarm/swarm-tutorial/index.md#use-docker-for-mac-or-docker-for-windows) with Swarm. In the tutorial, the following command creates a swarm on the `manager1` From 661100cce2cded9044a76c335b4228dc5f3c4495 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:15:16 -0500 Subject: [PATCH 18/84] Update gettingstarted.md --- compose/gettingstarted.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md index 06fd9b7605..822df6a0e9 100644 --- a/compose/gettingstarted.md +++ b/compose/gettingstarted.md @@ -160,7 +160,7 @@ Hub registry. 2. Enter `http://0.0.0.0:5000/` in a browser to see the application running. - If you're using Docker natively on Linux, Docker for Mac, or Docker for + If you're using Docker natively on Linux, Docker Desktop for Mac, or Docker Desktop for Windows, then the web app should now be listening on port 5000 on your Docker daemon host. Point your web browser to `http://localhost:5000` to find the `Hello World` message. If this doesn't resolve, you can also try @@ -253,15 +253,15 @@ 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 for Windows that uses [Linux +Docker Desktop for Windows that uses [Linux containers](/docker-for-windows/#switch-between-windows-and-linux-containers-beta-feature). For more information, see [Shared Drives](../docker-for-windows/#shared-drives) -on Docker for Windows, [File sharing](../docker-for-mac/#file-sharing) on Docker +on Docker Desktop for Windows, [File sharing](../docker-for-mac/#file-sharing) on Docker for Mac, and the general examples on how to [Manage data in containers](../engine/tutorials/dockervolumes.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 for Windows](/docker-for-windows/install.md) and do not +requirements for [Docker Desktop for Windows](/docker-for-windows/install.md) and do not need VirtualBox. {: .important} From e22dff1b59e367dbbd998492e2de5d6acf56b5b1 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:17:48 -0500 Subject: [PATCH 19/84] Update aspnet-mssql-compose.md --- compose/aspnet-mssql-compose.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compose/aspnet-mssql-compose.md b/compose/aspnet-mssql-compose.md index ce60a4db28..d0ea56670d 100644 --- a/compose/aspnet-mssql-compose.md +++ b/compose/aspnet-mssql-compose.md @@ -25,8 +25,8 @@ 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 for Windows](/docker-for-windows/#/shared-drives) and - [Docker for Mac](/docker-for-mac/#/file-sharing), you + [Docker Desktop for Windows](/docker-for-windows/#/shared-drives) and + [Docker Desktop for Mac](/docker-for-mac/#/file-sharing), you need to set up file sharing for the volume that you need to map. 1. Within your directory, use the `aspnetcore-build` Docker image to generate a @@ -37,7 +37,7 @@ configure this app to use our SQL Server database, and then create a $ docker run -v ${PWD}:/app --workdir /app microsoft/aspnetcore-build:lts dotnet new mvc --auth Individual ``` - > **Note**: If running in Docker for Windows, make sure to use Powershell + > **Note**: If running in Docker Desktop for Windows, make sure to use Powershell or specify the absolute path of your app directory. 1. Create a `Dockerfile` within your app directory and add the following content: @@ -170,8 +170,8 @@ 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 for Mac](/docker-for-mac/#/advanced) and - [Docker for Windows](/docker-for-windows/#/advanced). + [Docker Desktop for Mac](/docker-for-mac/#/advanced) and + [Docker Desktop for Windows](/docker-for-windows/#/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 From 62edcf746d54917f0d77140aafaae6ea8228067b Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:20:06 -0500 Subject: [PATCH 20/84] Update live-restore.md --- config/containers/live-restore.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/containers/live-restore.md b/config/containers/live-restore.md index 41117f4b9c..eaa2c2310d 100644 --- a/config/containers/live-restore.md +++ b/config/containers/live-restore.md @@ -13,7 +13,7 @@ is called _live restore_. The live restore option helps reduce container downtime due to daemon crashes, planned outages, or upgrades. > **Note**: Live restore is not supported on Windows containers, but it does work -for Linux containers running on Docker for Windows. +for Linux containers running on Docker Desktop for Windows. ## Enable live restore @@ -21,7 +21,7 @@ There are two ways to enable the live restore setting to keep containers alive when the daemon becomes unavailable. **Only do one of the following**. * Add the configuration to the daemon configuration file. On Linux, this - defaults to `/etc/docker/daemon.json`. On Docker for Mac or Docker for Windows, + defaults to `/etc/docker/daemon.json`. On Docker Desktop for Mac or Docker Desktop for Windows, select the Docker icon from the task bar, then click **Preferences** -> **Daemon** -> **Advanced**. @@ -67,8 +67,8 @@ data. The default buffer size is 64K. If the buffers fill, you must restart the Docker daemon to flush them. On Linux, you can modify the kernel's buffer size by changing -`/proc/sys/fs/pipe-max-size`. You cannot modify the buffer size on Docker for -Mac or Docker for Windows. +`/proc/sys/fs/pipe-max-size`. You cannot modify the buffer size on Docker Desktop for +Mac or Docker Desktop for Windows. ## Live restore and swarm mode From 39b11d41850dff3a7c5b1b7890d26cc87e17177b Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:21:55 -0500 Subject: [PATCH 21/84] Update networking.md --- docker-for-windows/networking.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-for-windows/networking.md b/docker-for-windows/networking.md index a97cf53bf4..adaf056293 100644 --- a/docker-for-windows/networking.md +++ b/docker-for-windows/networking.md @@ -1,19 +1,19 @@ --- description: Networking keywords: windows, networking -title: Networking features in Docker for Windows +title: Networking features in Docker Desktop for Windows --- {% assign Arch = 'Windows' %} -Docker for {{Arch}} provides several networking features to make it easier to +Docker Desktop for {{Arch}} provides several networking features to make it easier to use. ## Features ### VPN Passthrough -Docker for {{Arch}}'s networking can work when attached to a VPN. To do this, -Docker for {{Arch}} intercepts traffic from the containers and injects it into +Docker Desktop for {{Arch}}'s networking can work when attached to a VPN. To do this, +Docker Desktop for {{Arch}} intercepts traffic from the containers and injects it into {{Arch}} as if it originated from the Docker application. ### Port Mapping @@ -24,7 +24,7 @@ When you run a container with the `-p` argument, for example: $ docker run -p 80:80 -d nginx ``` -Docker for {{Arch}} makes whatever is running on port 80 in the container (in +Docker Desktop for {{Arch}} makes whatever is running on port 80 in the container (in this case, `nginx`) available on port 80 of `localhost`. In this example, the host and container ports are the same. What if you need to specify a different host port? If, for example, you already have something running on port 80 of @@ -43,18 +43,18 @@ See [Proxies](index#Proxies). ## Known limitations, use cases, and workarounds -Following is a summary of current limitations on the Docker for {{Arch}} +Following is a summary of current limitations on the Docker Desktop for {{Arch}} networking stack, along with some ideas for workarounds. ### There is no docker0 bridge on {{Arch}} -Because of the way networking is implemented in Docker for {{Arch}}, you cannot +Because of the way networking is implemented in Docker Desktop for {{Arch}}, you cannot see a `docker0` interface on the host. This interface is actually within the virtual machine. ### I cannot ping my containers -Docker for Windows can't route traffic to Linux containers. However, you can +Docker Desktop for Windows can't route traffic to Linux containers. However, you can ping the Windows containers. ### Per-container IP addressing is not possible @@ -72,7 +72,7 @@ The host has a changing IP address (or none if you have no network access). From 18.03 onwards our recommendation is to connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. -This is for development purpose and will not work in a production environment outside of Docker for Windows. +This is for development purpose and will not work in a production environment outside of Docker Desktop for Windows. The gateway is also reachable as `gateway.docker.internal`. From 49e5c67881201b58ba571d832badea0890c80b32 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:23:58 -0500 Subject: [PATCH 22/84] Update insecure.md --- registry/insecure.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/registry/insecure.md b/registry/insecure.md index 54f981c33f..1af15dfde0 100644 --- a/registry/insecure.md +++ b/registry/insecure.md @@ -23,7 +23,7 @@ isolated testing or in a tightly controlled, air-gapped environment. 1. Edit the `daemon.json` file, whose default location is `/etc/docker/daemon.json` on Linux or `C:\ProgramData\docker\config\daemon.json` on Windows Server. If you use - Docker for Mac or Docker for Windows, click the Docker icon, choose + Docker Desktop for Mac or Docker Desktop for Windows, click the Docker icon, choose **Preferences**, and choose +**Daemon**. If the `daemon.json` file does not exist, create it. Assuming there are no @@ -94,11 +94,11 @@ This is more secure than the insecure registry solution. 3. Click **Finish**. Restart Docker. - - **Docker for Mac**: Follow the instructions on + - **Docker Desktop for Mac**: Follow the instructions on [Adding custom CA certificates](/docker-for-mac/faqs.md#how-do-i-add-custom-ca-certificates){: target="_blank" class="_"}. Restart Docker. - - **Docker for Windows**: Follow the instructions on + - **Docker Desktop for Windows**: Follow the instructions on [Adding custom CA certificates](/docker-for-windows/faqs.md#how-do-i-add-custom-ca-certificates){: target="_blank" class="_"}. Restart Docker. @@ -162,4 +162,4 @@ Then, select the following options: [Learn more about managing TLS certificates](https://technet.microsoft.com/en-us/library/cc754841(v=ws.11).aspx#BKMK_addlocal). -After adding the CA certificate to Windows, restart Docker for Windows. +After adding the CA certificate to Windows, restart Docker Desktop for Windows. From 9cb9b5b100255258900cd77d5684ff169a4667a7 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:32:17 -0500 Subject: [PATCH 23/84] Update install-machine.md --- machine/install-machine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine/install-machine.md b/machine/install-machine.md index 6d9a9e5740..90109fe1dd 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -109,7 +109,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 + for Mac](/docker-for-mac/index.md) or [Docker Desktop for Windows](/docker-for-windows/index.md) environment, for example. * Remove the executable: `rm $(which docker-machine)` From eb6f2d9e56172317879305e65050433d44d75c7d Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:34:18 -0500 Subject: [PATCH 24/84] Update prometheus.md --- config/thirdparty/prometheus.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/thirdparty/prometheus.md b/config/thirdparty/prometheus.md index 5eb6fd560d..4a2946e0c2 100644 --- a/config/thirdparty/prometheus.md +++ b/config/thirdparty/prometheus.md @@ -27,7 +27,7 @@ exist, create it. - **Linux**: `/etc/docker/daemon.json` - **Windows Server**: `C:\ProgramData\docker\config\daemon.json` -- **Docker for Mac / Docker for Windows**: Click the Docker icon in the toolbar, +- **Docker Desktop for Mac / Docker Desktop for Windows**: Click the Docker icon in the toolbar, select **Preferences**, then select **Daemon**. Click **Advanced**. If the file is currently empty, paste the following: @@ -43,7 +43,7 @@ If the file is not empty, add those two keys, making sure that the resulting file is valid JSON. Be careful that every line ends with a comma (`,`) except for the last line. -Save the file, or in the case of Docker for Mac or Docker for Windows, save the +Save the file, or in the case of Docker Desktop for Mac or Docker Desktop for Windows, save the configuration. Restart Docker. Docker now exposes Prometheus-compatible metrics on port 9323. @@ -63,13 +63,13 @@ Prometheus runs as a Docker service on a Docker swarm. Copy one of the following configuration files and save it to `/tmp/prometheus.yml` (Linux or Mac) or `C:\tmp\prometheus.yml` (Windows). This is a stock Prometheus configuration file, except for the addition of the Docker -job definition at the bottom of the file. Docker for Mac and Docker for Windows +job definition at the bottom of the file. Docker Desktop for Mac and Docker Desktop for Windows need a slightly different configuration.
@@ -200,8 +200,8 @@ Next, start a single-replica Prometheus service using this configuration.
@@ -242,8 +242,8 @@ Verify that the Docker target is listed at http://localhost:9090/targets/. ![Prometheus targets page](images/prometheus-targets.png) -You can't access the endpoint URLs directly if you use Docker -for Mac or Docker for Windows. +You can't access the endpoint URLs directly if you use Docker Desktop +for Mac or Docker Desktop for Windows. ## Use Prometheus From a93d6f148b52cb72b8aebd5a67057e2f02478858 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:35:23 -0500 Subject: [PATCH 25/84] Update breaking_changes.md --- engine/breaking_changes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/breaking_changes.md b/engine/breaking_changes.md index 832340623b..570ac6d994 100644 --- a/engine/breaking_changes.md +++ b/engine/breaking_changes.md @@ -17,8 +17,8 @@ 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 for Mac](/docker-for-mac), - [Docker for Windows](/docker-for-windows). That way all your tools stay + Docker Engine using [Docker Desktop for Mac](/docker-for-mac), + [Docker Desktop for Windows](/docker-for-windows). That way all your tools stay in sync with Docker Engine. ## Engine 1.10 From 1846c5e2582c83f04d80a6ed4742fe5402d35dc5 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:36:38 -0500 Subject: [PATCH 26/84] Update overview.md --- toolbox/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolbox/overview.md b/toolbox/overview.md index 4400f512d5..011594904d 100644 --- a/toolbox/overview.md +++ b/toolbox/overview.md @@ -5,7 +5,7 @@ keywords: docker, documentation, about, technology, kitematic, gui, toolbox title: Docker Toolbox overview --- -Docker Toolbox is an installer for quick setup and launch of a Docker environment on older Mac and Windows systems that do not meet the requirements of the new [Docker for Mac](/docker-for-mac/index.md) and [Docker for Windows](/docker-for-windows/index.md) apps. +Docker Toolbox is an installer for quick setup and launch of a Docker environment on older Mac and Windows systems that do not meet the requirements of the new [Docker Desktop for Mac](/docker-for-mac/index.md) and [Docker Desktop for Windows](/docker-for-windows/index.md) apps. ![Toolbox installer](images/toolbox-installer.png) From 80aa68894ab7a3065075c2975f4f48455df64cc9 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:38:08 -0500 Subject: [PATCH 27/84] Update docker-ee.md --- install/windows/docker-ee.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md index a024625eb7..05cc3c55e2 100644 --- a/install/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -268,8 +268,8 @@ posts](https://www.docker.com/microsoft/) on the Docker website. ## Where to go next * [Getting started](/docker-for-windows/index.md) provides an overview of -Docker for Windows, basic Docker command examples, how to get help or give -feedback, and links to all topics in the Docker for Windows guide. +Docker Desktop for Windows, basic Docker command examples, how to get help or give +feedback, and links to all topics in the Docker Desktop for Windows guide. * [FAQs](/docker-for-windows/faqs.md) provides answers to frequently asked questions. From 72d557b41e0871732e404e54d0300a71009466c5 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:41:01 -0500 Subject: [PATCH 28/84] Update glossary.yaml --- _data/glossary.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index f7cdbb2ba0..d42732b086 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -81,24 +81,24 @@ Docker Enterprise Edition: | containerized applications, that you can deploy in the cloud or on-premise. It includes a tested and certified version of Docker, web UIs for managing your app resources, and support. -Docker for Mac: | - [Docker for Mac](/docker-for-mac/) is an easy-to-install, lightweight +Docker Desktop for Mac: | + [Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight Docker development environment designed specifically for the Mac. A native - Mac application, Docker for Mac uses the macOS Hypervisor + Mac application, Docker Desktop for Mac uses the macOS Hypervisor framework, networking, and filesystem. It's the best solution if you want to build, debug, test, package, and ship Dockerized applications on a - Mac. Docker for Mac supersedes [Docker Toolbox](#toolbox) as + Mac. Docker Desktop for Mac supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker on macOS. -Docker for Windows: | - [Docker for Windows](/docker-for-windows/) is an +Docker Desktop for Windows: | + [Docker Desktop for Windows](/docker-for-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 for Windows uses Hyper-V for + (Professional, Enterprise and Education). Docker Desktop for Windows uses Hyper-V for virtualization, and runs as a native Windows app. It works with Windows Server 2016, and gives you the ability to set up and run Windows containers as well as the standard Linux containers, with an option to switch between the two. Docker for Windows is the best solution if you want to build, debug, test, package, and - ship Dockerized applications from Windows machines. Docker for Windows + ship Dockerized applications from Windows machines. Docker Desktop for Windows supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker on Windows. Docker Hub: | The [Docker Hub](https://hub.docker.com/) is a centralized resource for working with @@ -163,8 +163,8 @@ image: | does not have state and it never changes. Kitematic: | A legacy GUI, bundled with [Docker Toolbox](#toolbox), for managing Docker - containers. We recommend upgrading to [Docker for Mac](#docker for Mac) or - [Docker for Windows](#docker for Windows), which have superseded Kitematic. + containers. We recommend upgrading to [Docker Desktop for Mac](#docker for Mac) or + [Docker Desktop for Windows](#docker for Windows), which have superseded Kitematic. layer: | In an image, a layer is modification to the image, represented by an instruction in the Dockerfile. Layers are applied in sequence to the base image to create the final image. @@ -309,11 +309,11 @@ Toolbox: | installer for Mac and Windows users. It uses Oracle VirtualBox for virtualization. - For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for + For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker Desktop for Mac](/docker-for-mac/) is the better solution. For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise - and Education), [Docker for + and Education), [Docker Desktop for Windows](/docker-for-windows/) is the better solution. Union file system: | Union file systems implement a [union From 1a9813a62d6fba092b0a13962888b57a3935e19c Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:42:17 -0500 Subject: [PATCH 29/84] Update kubernetes.md --- docker-for-windows/kubernetes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-windows/kubernetes.md b/docker-for-windows/kubernetes.md index 31779bccae..9c44b03e13 100644 --- a/docker-for-windows/kubernetes.md +++ b/docker-for-windows/kubernetes.md @@ -1,5 +1,5 @@ --- -description: Deploying to Kubernetes on Docker for Windows +description: Deploying to Kubernetes on Docker Desktop for Windows keywords: windows, edge, kubernetes, kubectl, orchestration title: Deploy on Kubernetes --- From a702ed28a6b1ce719ec6e4a04f9475eef32966df Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:44:01 -0500 Subject: [PATCH 30/84] Update kubectl.md --- ee/ucp/user-access/kubectl.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/ucp/user-access/kubectl.md b/ee/ucp/user-access/kubectl.md index eeb4171706..26ee21d941 100644 --- a/ee/ucp/user-access/kubectl.md +++ b/ee/ucp/user-access/kubectl.md @@ -11,12 +11,12 @@ command-line tool named kubectl. To access the UCP cluster with kubectl, install the [UCP client bundle](cli.md). -> Kubernetes on Docker for Mac and Docker for Windows +> Kubernetes on Docker Desktop for Mac and Docker Desktop for Windows > -> Docker for Mac and Docker for Windows provide a standalone Kubernetes server that +> Docker Desktop for Mac and Docker Desktop for Windows provide a standalone Kubernetes server that > runs on your development machine, with kubectl installed by default. This installation is > separate from the Kubernetes deployment on a UCP cluster. -> Learn how to [deploy to Kubernetes on Docker for Mac](/docker-for-mac/kubernetes.md). +> Learn how to [deploy to Kubernetes on Docker Desktop for Mac](/docker-for-mac/kubernetes.md). {: .important} ## Install the kubectl binary @@ -100,5 +100,5 @@ Docker Enterprise Edition provides users unique certificates and keys to authent ## Where to go next - [Deploy a workload to a Kubernetes cluster](../kubernetes.md) -- [Deploy to Kubernetes on Docker for Mac](/docker-for-mac/kubernetes.md) +- [Deploy to Kubernetes on Docker Desktop for Mac](/docker-for-mac/kubernetes.md) From 0e14f90a99fee99abfbed10d124c394451ad109e Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:45:13 -0500 Subject: [PATCH 31/84] Update index.md --- get-started/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/get-started/index.md b/get-started/index.md index 36328a270f..6b3e1ba886 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -115,10 +115,10 @@ of Docker Community Edition (CE) or Enterprise Edition (EE) on a > For full Kubernetes Integration > -> - [Kubernetes on Docker for Mac](/docker-for-mac/kubernetes/){: target="_blank" class="_"} +> - [Kubernetes on Docker Desktop for Mac](/docker-for-mac/kubernetes/){: target="_blank" class="_"} is available in [17.12 Edge (mac45)](/docker-for-mac/edge-release-notes/#docker-community-edition-17120-ce-mac45-2018-01-05){: target="_blank" class="_"} or [17.12 Stable (mac46)](/docker-for-mac/release-notes/#docker-community-edition-17120-ce-mac46-2018-01-09){: target="_blank" class="_"} and higher. -> - [Kubernetes on Docker for Windows](/docker-for-windows/kubernetes/){: target="_blank" class="_"} +> - [Kubernetes on Docker Desktop for Windows](/docker-for-windows/kubernetes/){: target="_blank" class="_"} is available in [18.02 Edge (win50)](/docker-for-windows/edge-release-notes/#docker-community-edition-18020-ce-rc1-win50-2018-01-26){: target="_blank" class="_"} and higher edge channels only. From f67b015c3af9b9bc791bf25c7ea592b3acacaddc Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:46:36 -0500 Subject: [PATCH 32/84] Update hyper-v.md --- machine/drivers/hyper-v.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/machine/drivers/hyper-v.md b/machine/drivers/hyper-v.md index 939b3d337b..fe5e629986 100644 --- a/machine/drivers/hyper-v.md +++ b/machine/drivers/hyper-v.md @@ -8,7 +8,7 @@ toc_max: 4 Creates a Boot2Docker virtual machine locally on your Windows machine using Hyper-V. -Hyper-V must be enabled on your desktop system. Docker for Windows automatically +Hyper-V must be enabled on your desktop system. Docker Desktop for Windows automatically enables it upon install. See this article on the Microsoft developer network for instructions on [how to manually enable Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install). @@ -57,7 +57,7 @@ Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick #### 1. Make sure Hyper-V is enabled. -Hyper-V is automatically enabled on a Docker for Windows installation. To enable it manually, see [instructions on how to manually enable Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install) on the Microsoft developer network. +Hyper-V is automatically enabled on a Docker Desktop for Windows installation. To enable it manually, see [instructions on how to manually enable Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install) on the Microsoft developer network. #### 2. Set up a new external network switch (Optional) @@ -71,7 +71,7 @@ Select the **Virtual Switch Manager** on the right-hand **Actions** panel. ![Hyper-V manager](../img/hyperv-manager.png) -Set up a new **external network switch** to use instead of DockerNAT network switch (for Moby), which is set up by default when you install Docker for Windows. If you already have another network switch set up, use that one instead but make sure it is an **external** switch.) +Set up a new **external network switch** to use instead of DockerNAT network switch (for Moby), which is set up by default when you install Docker Desktop for Windows. If you already have another network switch set up, use that one instead but make sure it is an **external** switch.) For this example, we created a virtual switch called `Primary Virtual Switch`. From 34a1aea420cca0bdecd08f9cd22e59156da78979 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:54:42 -0500 Subject: [PATCH 33/84] Update host.md --- network/host.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/host.md b/network/host.md index b2a4f5089f..e6d82575be 100644 --- a/network/host.md +++ b/network/host.md @@ -10,7 +10,7 @@ which binds to port 80 and you use `host` networking, the container's application will be available on port 80 on the host's IP address. The host networking driver only works on Linux hosts, and is not supported on -Docker for Mac, Docker for Windows, or Docker EE for Windows Server. +Docker Desktop for Mac, Docker Desktop for Windows, or Docker EE for Windows Server. In Docker 17.06 and higher, you can also use a `host` network for a swarm service, by passing `--network host` to the `docker container create` command. From e619f14c6ed22e5666ebc59e3eeb1f90fa79bf72 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:55:47 -0500 Subject: [PATCH 34/84] Update bundles.md --- compose/bundles.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/bundles.md b/compose/bundles.md index d28910ae88..a4157c38ae 100644 --- a/compose/bundles.md +++ b/compose/bundles.md @@ -56,8 +56,8 @@ Wrote bundle to vossibility-stack.dab > you need to install an experimental build of Docker Engine to use it. > > If you're on Mac or Windows, download the “Beta channel” version of -> [Docker for Mac](/docker-for-mac/) or -> [Docker for Windows](/docker-for-windows/) to install +> [Docker Desktop for Mac](/docker-for-mac/) or +> [Docker Desktop for Windows](/docker-for-windows/) to install > it. If you're on Linux, follow the instructions in the > [experimental build README](https://github.com/docker/cli/blob/master/experimental/README.md). From d87c0416153021e631f425a9c66d2bfb1562cc11 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:57:49 -0500 Subject: [PATCH 35/84] Update userguide.md --- kitematic/userguide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kitematic/userguide.md b/kitematic/userguide.md index a8257f9a9d..ca0f347043 100644 --- a/kitematic/userguide.md +++ b/kitematic/userguide.md @@ -26,9 +26,9 @@ GUI. First, if you haven't yet done so, download and install Kitematic in one of the following ways: -* Choose **Kitematic** from the Docker for Mac or Docker for Windows menu to get started with the Kitematic install. +* Choose **Kitematic** from the Docker Desktop for Mac or Docker Desktop for Windows menu to get started with the Kitematic install. -* Install [Docker Toolbox](/toolbox/overview.md#ready-to-get-started) (on older systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/install.md#what-to-know-before-you-install) or [Docker for Windows](/docker-for-windows/install.md#what-to-know-before-you-install)). +* Install [Docker Toolbox](/toolbox/overview.md#ready-to-get-started) (on older systems that do not meet the requirements of [Docker Desktop for Mac](/docker-for-mac/install.md#what-to-know-before-you-install) or [Docker Desktop for Windows](/docker-for-windows/install.md#what-to-know-before-you-install)). * Download Kitematic directly from the [Kitematic releases page](https://github.com/docker/kitematic/releases/). From d04138d726c2016e46ccb05f8d2542e33cf34f49 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 13:59:12 -0500 Subject: [PATCH 36/84] Update install.md --- compose/install.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compose/install.md b/compose/install.md index 2ab151c251..88e4996001 100644 --- a/compose/install.md +++ b/compose/install.md @@ -12,7 +12,7 @@ You can run Compose on macOS, Windows, and 64-bit Linux. Docker Compose relies on Docker Engine for any meaningful work, so make sure you have Docker Engine installed either locally or remote, depending on your setup. -- On desktop systems like Docker for Mac and Windows, Docker Compose is +- On desktop systems like Docker Desktop for Mac and Windows, Docker Compose is included as part of those desktop installs. - On Linux systems, first install the @@ -39,22 +39,22 @@ Python package manager or installing Compose as a container.
### Install Compose on macOS -**Docker for Mac** and **Docker Toolbox** already include Compose along +**Docker Desktop for Mac** and **Docker Toolbox** already include Compose along with other Docker apps, so Mac users do not need to install Compose separately. Docker install instructions for these are here: - * [Get Docker for Mac](/docker-for-mac/install.md) + * [Get Docker Desktop for Mac](/docker-for-mac/install.md) * [Get Docker Toolbox](/toolbox/overview.md) (for older systems)
### Install Compose on Windows systems -**Docker for Windows** and **Docker Toolbox** already include Compose +**Docker Desktop for Windows** and **Docker Toolbox** already include Compose along with other Docker apps, so most Windows users do not need to install Compose separately. Docker install instructions for these are here: -* [Get Docker for Windows](/docker-for-windows/install.md) +* [Get Docker Desktop for Windows](/docker-for-windows/install.md) * [Get Docker Toolbox](/toolbox/overview.md) (for older systems) **If you are running the Docker daemon and client directly on Microsoft From 1e1762d3449b0915968618866f13fcc76ddc524b Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:01:00 -0500 Subject: [PATCH 37/84] Update index.md --- install/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/index.md b/install/index.md index 72cea8fa51..231e2d8803 100644 --- a/install/index.md +++ b/install/index.md @@ -152,8 +152,8 @@ to choose the best installation path for you. | Platform | x86_64 | |:----------------------------------------------------------------------------|:-----------------:| -| [Docker for Mac (macOS)](/docker-for-mac/install/) | {{ green-check }} | -| [Docker for Windows (Microsoft Windows 10)](/docker-for-windows/install/) | {{ green-check }} | +| [Docker Desktop for Mac (macOS)](/docker-for-mac/install/) | {{ green-check }} | +| [Docker Desktop for Windows (Microsoft Windows 10)](/docker-for-windows/install/) | {{ green-check }} | #### Server From 623872673887de3dbad2617cc325b85e22a7924a Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:03:25 -0500 Subject: [PATCH 38/84] Update network-tutorial-host.md --- network/network-tutorial-host.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/network-tutorial-host.md b/network/network-tutorial-host.md index 54aa3a6b30..7b5441aeea 100644 --- a/network/network-tutorial-host.md +++ b/network/network-tutorial-host.md @@ -24,7 +24,7 @@ host. [documentation for the `nginx` image](https://hub.docker.com/_/nginx/) - The `host` networking driver only works on Linux hosts, and is not supported - on Docker for Mac, Docker for Windows, or Docker EE for Windows Server. + on Docker Desktop for Mac, Docker Desktop for Windows, or Docker EE for Windows Server. ## Procedure From d552074f7a6190f9ea5613f12f8025aba8386788 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:05:53 -0500 Subject: [PATCH 39/84] Update index.md --- datacenter/dtr/2.2/guides/user/access-dtr/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenter/dtr/2.2/guides/user/access-dtr/index.md b/datacenter/dtr/2.2/guides/user/access-dtr/index.md index 9cea619e9a..26b043105f 100644 --- a/datacenter/dtr/2.2/guides/user/access-dtr/index.md +++ b/datacenter/dtr/2.2/guides/user/access-dtr/index.md @@ -29,7 +29,7 @@ In your browser navigate to `https:///ca` to download the TLS certificate used by DTR. Then [add that certificate to macOS Keychain](https://support.apple.com/kb/PH20129). -After adding the CA certificate to Keychain, restart Docker for Mac. +After adding the CA certificate to Keychain, restart Docker Desktop for Mac. ### Windows @@ -46,7 +46,7 @@ Then, select the following options: [Learn more about managing TLS certificates](https://technet.microsoft.com/en-us/library/cc754841(v=ws.11).aspx#BKMK_addlocal). -After adding the CA certificate to Windows, restart Docker for Windows. +After adding the CA certificate to Windows, restart Docker Desktop for Windows. ### Ubuntu/ Debian From 6115286f1a7f7c8855a927628b2df4d7a275030b Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:06:56 -0500 Subject: [PATCH 40/84] Update index.md --- ee/dtr/user/access-dtr/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/dtr/user/access-dtr/index.md b/ee/dtr/user/access-dtr/index.md index 62d887f7ba..d8a969cd4a 100644 --- a/ee/dtr/user/access-dtr/index.md +++ b/ee/dtr/user/access-dtr/index.md @@ -29,7 +29,7 @@ In your browser navigate to `https:///ca` to download the TLS certificate used by DTR. Then [add that certificate to macOS Keychain](https://support.apple.com/kb/PH20129). -After adding the CA certificate to Keychain, restart Docker for Mac. +After adding the CA certificate to Keychain, restart Docker Desktop for Mac. ### Windows @@ -46,7 +46,7 @@ Then, select the following options: [Learn more about managing TLS certificates](https://technet.microsoft.com/en-us/library/cc754841(v=ws.11).aspx#BKMK_addlocal). -After adding the CA certificate to Windows, restart Docker for Windows. +After adding the CA certificate to Windows, restart Docker Desktop for Windows. ### Ubuntu/ Debian From 66a760993de7b9129864d9b7303fc01b4671706c Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:08:14 -0500 Subject: [PATCH 41/84] Update index.md --- datacenter/dtr/2.3/guides/user/access-dtr/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenter/dtr/2.3/guides/user/access-dtr/index.md b/datacenter/dtr/2.3/guides/user/access-dtr/index.md index d22a84c15c..58f76276c8 100644 --- a/datacenter/dtr/2.3/guides/user/access-dtr/index.md +++ b/datacenter/dtr/2.3/guides/user/access-dtr/index.md @@ -29,7 +29,7 @@ In your browser navigate to `https:///ca` to download the TLS certificate used by DTR. Then [add that certificate to macOS Keychain](https://support.apple.com/kb/PH20129). -After adding the CA certificate to Keychain, restart Docker for Mac. +After adding the CA certificate to Keychain, restart Docker Desktop for Mac. ### Windows @@ -46,7 +46,7 @@ Then, select the following options: [Learn more about managing TLS certificates](https://technet.microsoft.com/en-us/library/cc754841(v=ws.11).aspx#BKMK_addlocal). -After adding the CA certificate to Windows, restart Docker for Windows. +After adding the CA certificate to Windows, restart Docker Desktop for Windows. ### Ubuntu/ Debian From c958675fe89d94752de6d387f7062959a118ee48 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:09:17 -0500 Subject: [PATCH 42/84] Update index.md --- datacenter/dtr/2.4/guides/user/access-dtr/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenter/dtr/2.4/guides/user/access-dtr/index.md b/datacenter/dtr/2.4/guides/user/access-dtr/index.md index d22a84c15c..58f76276c8 100644 --- a/datacenter/dtr/2.4/guides/user/access-dtr/index.md +++ b/datacenter/dtr/2.4/guides/user/access-dtr/index.md @@ -29,7 +29,7 @@ In your browser navigate to `https:///ca` to download the TLS certificate used by DTR. Then [add that certificate to macOS Keychain](https://support.apple.com/kb/PH20129). -After adding the CA certificate to Keychain, restart Docker for Mac. +After adding the CA certificate to Keychain, restart Docker Desktop for Mac. ### Windows @@ -46,7 +46,7 @@ Then, select the following options: [Learn more about managing TLS certificates](https://technet.microsoft.com/en-us/library/cc754841(v=ws.11).aspx#BKMK_addlocal). -After adding the CA certificate to Windows, restart Docker for Windows. +After adding the CA certificate to Windows, restart Docker Desktop for Windows. ### Ubuntu/ Debian From e1712a39a6ac0be735d9df16a75017c72280b504 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:11:06 -0500 Subject: [PATCH 43/84] Update configure-your-notary-client.md --- .../2.5/guides/user/access-dtr/configure-your-notary-client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenter/dtr/2.5/guides/user/access-dtr/configure-your-notary-client.md b/datacenter/dtr/2.5/guides/user/access-dtr/configure-your-notary-client.md index aee56a291b..7edd727e2f 100644 --- a/datacenter/dtr/2.5/guides/user/access-dtr/configure-your-notary-client.md +++ b/datacenter/dtr/2.5/guides/user/access-dtr/configure-your-notary-client.md @@ -28,7 +28,7 @@ you're using: ## Download the Notary CLI client -If you're using Docker for Mac or Docker for Windows, you already have the +If you're using Docker Desktop for Mac or Docker Desktop for Windows, you already have the `notary` command installed. If you're running Docker on a Linux distribution, you can [download Notary From cce9e2c714f603f7d837ab985ae5ed2f301dd455 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:12:29 -0500 Subject: [PATCH 44/84] Update index.md --- datacenter/dtr/2.5/guides/user/access-dtr/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenter/dtr/2.5/guides/user/access-dtr/index.md b/datacenter/dtr/2.5/guides/user/access-dtr/index.md index d22a84c15c..58f76276c8 100644 --- a/datacenter/dtr/2.5/guides/user/access-dtr/index.md +++ b/datacenter/dtr/2.5/guides/user/access-dtr/index.md @@ -29,7 +29,7 @@ In your browser navigate to `https:///ca` to download the TLS certificate used by DTR. Then [add that certificate to macOS Keychain](https://support.apple.com/kb/PH20129). -After adding the CA certificate to Keychain, restart Docker for Mac. +After adding the CA certificate to Keychain, restart Docker Desktop for Mac. ### Windows @@ -46,7 +46,7 @@ Then, select the following options: [Learn more about managing TLS certificates](https://technet.microsoft.com/en-us/library/cc754841(v=ws.11).aspx#BKMK_addlocal). -After adding the CA certificate to Windows, restart Docker for Windows. +After adding the CA certificate to Windows, restart Docker Desktop for Windows. ### Ubuntu/ Debian From be8ceaa893f2f05fbb34126aab181778905071c8 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:13:42 -0500 Subject: [PATCH 45/84] Update configure-your-notary-client.md --- .../2.2/guides/user/access-dtr/configure-your-notary-client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenter/dtr/2.2/guides/user/access-dtr/configure-your-notary-client.md b/datacenter/dtr/2.2/guides/user/access-dtr/configure-your-notary-client.md index 59bcb2e0e3..81ec1893b2 100644 --- a/datacenter/dtr/2.2/guides/user/access-dtr/configure-your-notary-client.md +++ b/datacenter/dtr/2.2/guides/user/access-dtr/configure-your-notary-client.md @@ -20,7 +20,7 @@ client bundle, that UCP can trace back to your user account. ## Download the Notary CLI client -If you're using Docker for Mac or Docker for Windows, you already have the +If you're using Docker Desktop for Mac or Docker Desktop for Windows, you already have the `notary` command installed. If you're running Docker on a Linux distribution, you can [download the From 0cc6aeb654f6a4531169fec1f648d3df6ccc46e8 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:15:37 -0500 Subject: [PATCH 46/84] Update configure-your-notary-client.md --- .../2.3/guides/user/access-dtr/configure-your-notary-client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenter/dtr/2.3/guides/user/access-dtr/configure-your-notary-client.md b/datacenter/dtr/2.3/guides/user/access-dtr/configure-your-notary-client.md index 2142a73f7e..dda26ddabe 100644 --- a/datacenter/dtr/2.3/guides/user/access-dtr/configure-your-notary-client.md +++ b/datacenter/dtr/2.3/guides/user/access-dtr/configure-your-notary-client.md @@ -20,7 +20,7 @@ client bundle, that UCP can trace back to your user account. ## Download the Notary CLI client -If you're using Docker for Mac or Docker for Windows, you already have the +If you're using Docker Desktop for Mac or Docker Desktop for Windows, you already have the `notary` command installed. If you're running Docker on a Linux distribution, you can [download the From 3a97eec35ae3b244ecdc9c0b157257b356450db4 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:17:16 -0500 Subject: [PATCH 47/84] Update select-storage-driver.md --- storage/storagedriver/select-storage-driver.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/storagedriver/select-storage-driver.md b/storage/storagedriver/select-storage-driver.md index 4df14fcc71..f488b2a736 100644 --- a/storage/storagedriver/select-storage-driver.md +++ b/storage/storagedriver/select-storage-driver.md @@ -140,9 +140,9 @@ storage driver, be sure to read about > have a lower priority than issues encountered when using a recommended > configuration. -### Docker for Mac and Docker for Windows +### Docker Desktop for Mac and Docker Desktop for Windows -Docker for Mac and Docker for Windows are intended for development, rather +Docker Desktop for Mac and Docker Desktop for Windows are intended for development, rather than production. Modifying the storage driver on these platforms is not possible. From f052758c434a81438832d1c3b770ab285657af62 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:18:46 -0500 Subject: [PATCH 48/84] Update part3.md --- get-started/part3.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/get-started/part3.md b/get-started/part3.md index 4d1c85ec40..c9baf3cc60 100644 --- a/get-started/part3.md +++ b/get-started/part3.md @@ -9,8 +9,8 @@ description: Learn how to define load-balanced and scalable service that runs co - [Install Docker version 1.13 or higher](/engine/installation/index.md). -- Get [Docker Compose](/compose/overview.md). On [Docker for -Mac](/docker-for-mac/index.md) and [Docker for +- Get [Docker Compose](/compose/overview.md). On [Docker Desktop for +Mac](/docker-for-mac/index.md) and [Docker Desktop for Windows](/docker-for-windows/index.md) it's pre-installed, so you're good-to-go. On Linux systems you need to [install it directly](https://github.com/docker/compose/releases). On pre Windows 10 systems From f301faa09c7b472145647de23a7fbb5407d55238 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:42:19 -0500 Subject: [PATCH 49/84] Update network-tutorial-macvlan.md --- network/network-tutorial-macvlan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/network-tutorial-macvlan.md b/network/network-tutorial-macvlan.md index 31000e99b7..4852f6f3ed 100644 --- a/network/network-tutorial-macvlan.md +++ b/network/network-tutorial-macvlan.md @@ -22,7 +22,7 @@ container to it. to your networking equipment. - The `macvlan` networking driver only works on Linux hosts, and is not supported - on Docker for Mac, Docker for Windows, or Docker EE for Windows Server. + on Docker Desktop for Mac, Docker Desktop for Windows, or Docker EE for Windows Server. - You need at least version 3.9 of the Linux kernel, and version 4.0 or higher is recommended. From dba8ed51977d58e63a3fb329727d0ea46f08d1d3 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:43:33 -0500 Subject: [PATCH 50/84] Update baseimages.md --- develop/develop-images/baseimages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/develop/develop-images/baseimages.md b/develop/develop-images/baseimages.md index 1a1d6d41ae..1b22a86e65 100644 --- a/develop/develop-images/baseimages.md +++ b/develop/develop-images/baseimages.md @@ -89,7 +89,7 @@ docker build --tag hello . Don't forget the `.` character at the end, which sets the build context to the current directory. -> **Note**: Because Docker for Mac and Docker for Windows use a Linux VM, +> **Note**: Because Docker Desktop for Mac and Docker Desktop for Windows use a Linux VM, > you need a Linux binary, rather than a Mac or Windows binary. > You can use a Docker container to build it: > From 1dd2f32e20520f7149376bf803aa4cfeb7259e1f Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:44:33 -0500 Subject: [PATCH 51/84] Update my_first_tour.js --- js/my_first_tour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/my_first_tour.js b/js/my_first_tour.js index ad9f292a10..f3b9e6c081 100644 --- a/js/my_first_tour.js +++ b/js/my_first_tour.js @@ -63,7 +63,7 @@ var tour = { }, { title: "Product Manuals", - content: "Learn about Docker products and tools, such as Docker Hub, UCP, Docker for Mac, or Docker for Windows.", + content: "Learn about Docker products and tools, such as Docker Hub, UCP, Docker Desktop for Mac, or Docker Desktop for Windows.", target: "top-nav", placement: "bottom", width: "570px", From 07da89eccefce50374ec59725f848c00d56051db Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:45:34 -0500 Subject: [PATCH 52/84] Update configure-your-notary-client.md --- .../2.4/guides/user/access-dtr/configure-your-notary-client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenter/dtr/2.4/guides/user/access-dtr/configure-your-notary-client.md b/datacenter/dtr/2.4/guides/user/access-dtr/configure-your-notary-client.md index aee56a291b..7edd727e2f 100644 --- a/datacenter/dtr/2.4/guides/user/access-dtr/configure-your-notary-client.md +++ b/datacenter/dtr/2.4/guides/user/access-dtr/configure-your-notary-client.md @@ -28,7 +28,7 @@ you're using: ## Download the Notary CLI client -If you're using Docker for Mac or Docker for Windows, you already have the +If you're using Docker Desktop for Mac or Docker Desktop for Windows, you already have the `notary` command installed. If you're running Docker on a Linux distribution, you can [download Notary From e277c7641f64d977df07fd45728acee9a30b608e Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:47:11 -0500 Subject: [PATCH 53/84] Update configure-your-notary-client.md --- ee/dtr/user/access-dtr/configure-your-notary-client.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/dtr/user/access-dtr/configure-your-notary-client.md b/ee/dtr/user/access-dtr/configure-your-notary-client.md index 780221be88..c8bb256a43 100644 --- a/ee/dtr/user/access-dtr/configure-your-notary-client.md +++ b/ee/dtr/user/access-dtr/configure-your-notary-client.md @@ -28,7 +28,7 @@ you're using: ## Download the Notary CLI client -If you're using Docker for Mac or Docker for Windows, you already have the +If you're using Docker Desktop for Mac or Docker Desktop for Windows, you already have the `notary` command installed. If you're running Docker on a Linux distribution, you can [download From b53e24442c79f8ef692068b0fa6dbda78002b6b4 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:48:41 -0500 Subject: [PATCH 54/84] Update kubernetes-mac-win.md --- _includes/kubernetes-mac-win.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/kubernetes-mac-win.md b/_includes/kubernetes-mac-win.md index e4b895d95e..acd4c55dc4 100644 --- a/_includes/kubernetes-mac-win.md +++ b/_includes/kubernetes-mac-win.md @@ -10,7 +10,7 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %} {% endcomment %} {% if platform == "mac" %} - {% assign product = "Docker for Mac" %} + {% assign product = "Docker Desktop for Mac" %} {% capture min-version %}{{ product }} **17.12 CE Edge**{% endcapture %} @@ -29,7 +29,7 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %} {% assign kubectl-path = "/usr/local/bin/kubectl" %} {% elsif platform == "windows" %} - {% assign product = "Docker for Windows" %} + {% assign product = "Docker Desktop for Windows" %} {% capture min-version %}{{ product }} **18.02 CE Edge**{% endcapture %} From 695bc2a1b2251d87cbe026f72ebf14fc983bcef2 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:50:25 -0500 Subject: [PATCH 55/84] Update wordpress.md --- compose/wordpress.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/wordpress.md b/compose/wordpress.md index 77868adbb1..eab73ab851 100644 --- a/compose/wordpress.md +++ b/compose/wordpress.md @@ -120,7 +120,7 @@ If you are using [Docker Machine](/machine/index.md), you can run the command `docker-machine ip MACHINE_VM` to get the machine address, and then open `http://MACHINE_VM_IP:8000` in a web browser. -If you are using Docker for Mac or Docker for Windows, you can use +If you are using Docker Desktop for Mac or Docker Desktop for Windows, you can use `http://localhost` as the IP address, and open `http://localhost:8000` in a web browser. From 3a6868732bbc57feef9f68b6077e13d5a2b34ed1 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 14:59:38 -0500 Subject: [PATCH 56/84] Update toc.yaml --- _data/toc.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index d152fa9140..27154602b2 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -3475,16 +3475,16 @@ manuals: title: Sample apps with Compose - path: /release-notes/docker-compose/ title: Docker Compose release notes -- sectiontitle: Docker for Mac +- sectiontitle: Docker Desktop for Mac section: - path: /docker-for-mac/ title: Getting started - path: /docker-for-mac/install/ - title: Install Docker for Mac + title: Install Docker Desktop for Mac - path: /docker-for-mac/kubernetes/ title: Deploy on Kubernetes - path: /docker-for-mac/docker-toolbox/ - title: Docker for Mac vs. Docker Toolbox + title: Docker Desktop for Mac vs. Docker Toolbox - path: /docker-for-mac/multi-arch/ title: Leveraging Multi-CPU architecture support - path: /docker-for-mac/networking/ @@ -3503,12 +3503,12 @@ manuals: title: Stable release notes - path: /docker-for-mac/edge-release-notes/ title: Edge release notes -- sectiontitle: Docker for Windows +- sectiontitle: Docker Desktop for Windows section: - path: /docker-for-windows/ title: Getting started - path: /docker-for-windows/install/ - title: Install Docker for Windows + title: Install Docker Desktop for Windows - path: /docker-for-windows/kubernetes/ title: Deploy on Kubernetes - path: /docker-for-windows/networking/ @@ -3786,10 +3786,10 @@ manuals: - path: /release-notes/docker-engine/ title: Docker (1.13 and earlier) - path: /docker-for-mac/release-notes/ - title: Docker for Mac + title: Docker Desktop for Mac nosync: true - path: /docker-for-windows/release-notes/ - title: Docker for Windows + title: Docker Desktop for Windows nosync: true - path: /release-notes/docker-compose/ title: Docker Compose From 670a052b5246d9c855cd34f011002ce229fc43df Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:03:24 -0500 Subject: [PATCH 57/84] Update part4.md --- get-started/part4.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/get-started/part4.md b/get-started/part4.md index 58caacc205..fbbea8ac25 100644 --- a/get-started/part4.md +++ b/get-started/part4.md @@ -12,7 +12,7 @@ description: Learn how to create clusters of Dockerized machines. - Get [Docker Compose](/compose/overview.md) as described in [Part 3 prerequisites](/get-started/part3.md#prerequisites). - Get [Docker Machine](/machine/overview.md), which is pre-installed with -[Docker for Mac](/docker-for-mac/index.md) and [Docker for +[Docker Desktop for Mac](/docker-for-mac/index.md) and [Docker Desktop for Windows](/docker-for-windows/index.md), but on Linux systems you need to [install it directly](/machine/install-machine/#installing-machine-directly). On pre Windows 10 systems _without Hyper-V_, as well as Windows 10 Home, use [Docker Toolbox](/toolbox/overview.md). @@ -491,7 +491,7 @@ with the given command. This disconnects the shell from `docker-machine` created virtual machines, and allows you to continue working in the same shell, now using native `docker` -commands (for example, on Docker for Mac or Docker for Windows). To learn more, +commands (for example, on Docker Desktop for Mac or Docker Desktop for Windows). To learn more, see the [Machine topic on unsetting environment variables](/machine/get-started/#unset-environment-variables-in-the-current-shell). ### Restarting Docker machines From a887def492917436bc8223209dcf387f15f89d96 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:04:49 -0500 Subject: [PATCH 58/84] Update index.md --- config/daemon/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/daemon/index.md b/config/daemon/index.md index a306442449..4ea6b8f65b 100644 --- a/config/daemon/index.md +++ b/config/daemon/index.md @@ -186,8 +186,8 @@ Run `sudo systemctl daemon-reload` before attempting to start Docker. If Docker successfully, it is now listening on the IP address specified in the `hosts` key of the `daemon.json` instead of a socket. -> **Important**: Setting `hosts` in the `daemon.json` is not supported on Docker for Windows -> or Docker for Mac. +> **Important**: Setting `hosts` in the `daemon.json` is not supported on Docker Desktop for Windows +> or Docker Desktop for Mac. {:.important} @@ -291,8 +291,8 @@ The Docker daemon log can be viewed by using one of the following methods: Linux systems - By running `Get-EventLog -LogName Application -Source Docker -After (Get-Date).AddMinutes(-5) | Sort-Object Time | Export-CSV ~/last5minutes.CSV` on Docker EE for Windows Server -> **Note**: It is not possible to manually generate a stack trace on Docker for -> Mac or Docker for Windows. However, you can click the Docker taskbar icon and +> **Note**: It is not possible to manually generate a stack trace on Docker Desktop for +> Mac or Docker Desktop for Windows. However, you can click the Docker taskbar icon and > choose **Diagnose and feedback** to send information to Docker if you run into > issues. From 92e6fb20391580686b89f25a0ca2eb06bd054068 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:05:51 -0500 Subject: [PATCH 59/84] Update django.md --- compose/django.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/django.md b/compose/django.md index 794abb1079..334cce96f9 100644 --- a/compose/django.md +++ b/compose/django.md @@ -181,7 +181,7 @@ In this section, you set up the database connection for Django. ``` At this point, your Django app should be running at port `8000` on - your Docker host. On Docker for Mac and Docker for Windows, go + your Docker host. On Docker Desktop for Mac and Docker Desktop for Windows, go to `http://localhost:8000` on a web browser to see the Django welcome page. If you are using [Docker Machine](/machine/overview.md), then `docker-machine ip MACHINE_VM` returns the Docker host IP From 5eb125fcfdec50a3337c1417d3a106bece455644 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:06:56 -0500 Subject: [PATCH 60/84] Update dev-best-practices.md --- develop/dev-best-practices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/develop/dev-best-practices.md b/develop/dev-best-practices.md index c7101b1bcc..0835eb6d71 100644 --- a/develop/dev-best-practices.md +++ b/develop/dev-best-practices.md @@ -125,5 +125,5 @@ updates. | Development | Production | |:--------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Use bind mounts to give your container access to your source code. | Use volumes to store container data. | -| Use Docker for Mac or Docker for Windows. | Use Docker EE if possible, with [userns mapping](/engine/security/userns-remap.md) for greater isolation of Docker processes from host processes. | +| Use Docker Desktop for Mac or Docker Desktop for Windows. | Use Docker EE if possible, with [userns mapping](/engine/security/userns-remap.md) for greater isolation of Docker processes from host processes. | | Don't worry about time drift. | Always run an NTP client on the Docker host and within each container process and sync them all to the same NTP server. If you use swarm services, also ensure that each Docker node syncs its clocks to the same time source as the containers. | From cfe37959566ff86b9adbf42ad34b11cb74114097 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:07:55 -0500 Subject: [PATCH 61/84] Update index.md --- develop/sdk/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/develop/sdk/index.md b/develop/sdk/index.md index 2280ecca8a..ac2d5ddb5f 100644 --- a/develop/sdk/index.md +++ b/develop/sdk/index.md @@ -131,7 +131,7 @@ You can specify the API version to use, in one of the following ways: ### Docker EE and CE API mismatch If you use Docker EE in production, we recommend using Docker EE in development -too. If you can't, such as when your developers use Docker for Mac or Docker for +too. If you can't, such as when your developers use Docker Desktop for Mac or Docker Desktop for Windows and manually build and push images, then your developers need to configure their Docker clients to use the same version of the API reported by their Docker daemon. This prevents the developer from using a feature that is not yet supported From 2788fa1bf0a02bc2c108b2ea89ddb4c5726235b0 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:09:13 -0500 Subject: [PATCH 62/84] Update rails.md --- compose/rails.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/rails.md b/compose/rails.md index d3f071f78a..11c4894dd8 100644 --- a/compose/rails.md +++ b/compose/rails.md @@ -190,7 +190,7 @@ Created database 'myapp_test' That's it. Your app should now be running on port 3000 on your Docker daemon. -On Docker for Mac and Docker for Windows, go to `http://localhost:3000` on a web +On Docker Desktop for Mac and Docker Desktop for Windows, go to `http://localhost:3000` on a web browser to see the Rails Welcome. If you are using [Docker Machine](/machine/overview.md), then `docker-machine ip From 77077e06a394356d24203fec32c11aba30e8ac39 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:10:34 -0500 Subject: [PATCH 63/84] Update index.md --- storage/storagedriver/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/storagedriver/index.md b/storage/storagedriver/index.md index ec7ea38565..9b3cbd51ea 100644 --- a/storage/storagedriver/index.md +++ b/storage/storagedriver/index.md @@ -329,7 +329,7 @@ To verify the way that copy-on-write works, the following procedures spins up 5 containers based on the `acme/my-final-image:1.0` image we built earlier and examines how much room they take up. -> **Note**: This procedure doesn't work on Docker for Mac or Docker for Windows. +> **Note**: This procedure doesn't work on Docker Desktop for Mac or Docker Desktop for Windows. 1. From a terminal on your Docker host, run the following `docker run` commands. The strings at the end are the IDs of each container. From 9410403796adf92ee64a3bd1b497309dfcac5610 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:15:44 -0500 Subject: [PATCH 64/84] Update release-notes.md --- docker-for-mac/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-mac/release-notes.md b/docker-for-mac/release-notes.md index 633b024085..45e7261055 100644 --- a/docker-for-mac/release-notes.md +++ b/docker-for-mac/release-notes.md @@ -1,6 +1,6 @@ --- description: Change log / release notes per Stable release -keywords: Docker for Mac, stable, release notes +keywords: Docker Desktop for Mac, stable, release notes redirect_from: - /mackit/release-notes/ title: Docker for Mac Stable release notes @@ -16,7 +16,7 @@ Release notes for _stable_ releases are listed below, [_edge_ release notes](edge-release-notes) are also available. (Following the CE release model, 'beta' releases are called 'edge' releases.) You can learn about both kinds of releases, and download stable and edge product installers at [Download Docker -for Mac](install.md#download-docker-for-mac). +Desktop for Mac](install.md#download-docker-for-mac). ## Stable Releases of 2018 From af3a5a96d50e5a588576dc25703c0ece60d5d6f0 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:19:34 -0500 Subject: [PATCH 65/84] Update docker-toolbox.md --- docker-for-mac/docker-toolbox.md | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docker-for-mac/docker-toolbox.md b/docker-for-mac/docker-toolbox.md index 7d900c8611..126dee365e 100644 --- a/docker-for-mac/docker-toolbox.md +++ b/docker-for-mac/docker-toolbox.md @@ -1,13 +1,13 @@ --- -description: Docker for Mac and Docker Toolbox +description: Docker Desktop for Mac and Docker Toolbox keywords: mac, windows, alpha, beta, toolbox, docker-machine, tutorial redirect_from: - /mackit/docker-toolbox/ -title: Docker for Mac vs. Docker Toolbox +title: Docker Desktop for Mac vs. Docker Toolbox --- If you already have an installation of Docker Toolbox, read these topics -first to learn how Docker for Mac and Docker Toolbox differ, and how they can +first to learn how Docker Desktop for Mac and Docker Toolbox differ, and how they can coexist. ## The Docker Toolbox environment @@ -29,24 +29,24 @@ This setup is shown in the following diagram. ![Docker Toolbox Install](images/toolbox-install.png) -## The Docker for Mac environment +## The Docker Desktop for Mac environment -Docker for Mac is a Mac native application, that you install in `/Applications`. +Docker Desktop for Mac is a Mac native application, that you install in `/Applications`. At installation time, it creates symlinks in `/usr/local/bin` for `docker` and `docker-compose` and others, to the commands in the application bundle, in `/Applications/Docker.app/Contents/Resources/bin`. -Here are some key points to know about Docker for Mac before you get started: +Here are some key points to know about Docker Desktop for Mac before you get started: -* Docker for Mac uses +* Docker Desktop for Mac uses [HyperKit](https://github.com/docker/HyperKit/) instead of Virtual Box. Hyperkit is a lightweight macOS virtualization solution built on top of Hypervisor.framework in macOS 10.10 Yosemite and higher. -* When you install Docker for Mac, machines created with Docker Machine are +* When you install Docker Desktop for Mac, machines created with Docker Machine are not affected. -* Docker for Mac does not use `docker-machine` to provision its VM. +* Docker Desktop for Mac does not use `docker-machine` to provision its VM. The Docker Engine API is exposed on a socket available to the Mac host at `/var/run/docker.sock`. This is the default location Docker and Docker Compose clients use to connect to @@ -56,22 +56,22 @@ Here are some key points to know about Docker for Mac before you get started: This setup is shown in the following diagram. -![Docker for Mac Install](images/docker-for-mac-install.png) +![Docker Desktop for Mac Install](images/docker-for-mac-install.png) -With Docker for Mac, you only get (and only usually need) one VM, managed by Docker -for Mac. Docker for Mac automatically upgrades the Docker client and +With Docker Desktop for Mac, you only get (and only usually need) one VM, managed by Docker +for Mac. Docker Desktop for Mac automatically upgrades the Docker client and daemon when updates are available. -Also note that Docker for Mac can’t route traffic to containers, so you can't +Also note that Docker Desktop for Mac can’t route traffic to containers, so you can't directly access an exposed port on a running container from the hosting machine. If you do need multiple VMs, such as when testing multi-node swarms, you can -continue to use Docker Machine, which operates outside the scope of Docker for -Mac. See [Docker Toolbox and Docker for Mac +continue to use Docker Machine, which operates outside the scope of Docker Desktop for +Mac. See [Docker Toolbox and Docker Desktop for Mac coexistence](docker-toolbox.md#docker-toolbox-and-docker-for-mac-coexistence). -## Setting up to run Docker for Mac +## Setting up to run Docker Desktop for Mac 1. Check whether Toolbox DOCKER environment variables are set: @@ -81,11 +81,11 @@ coexistence](docker-toolbox.md#docker-toolbox-and-docker-for-mac-coexistence). DOCKER_TLS_VERIFY=1 DOCKER_CERT_PATH=/Users//.docker/machine/machines/default - If this command returns no output, you are ready to use Docker for Mac. + If this command returns no output, you are ready to use Docker Desktop for Mac. If it returns output (as shown in the example), unset the `DOCKER` environment variables to make the client talk to the - Docker for Mac Engine (next step). + Docker Desktop for Mac Engine (next step). 2. Run the `unset` command on the following `DOCKER` environment variables to unset them in the current shell. @@ -105,11 +105,11 @@ coexistence](docker-toolbox.md#docker-toolbox-and-docker-for-mac-coexistence). > **Note**: If you have a shell script as part of your profile that sets these > `DOCKER` environment variables automatically each time you open a command -> window, then you need to unset these each time you want to use Docker for Mac. +> window, then you need to unset these each time you want to use Docker Desktop for Mac. -> If you install Docker for Mac on a machine where Docker Toolbox is installed.. +> If you install Docker Desktop for Mac on a machine where Docker Toolbox is installed.. > -> Docker for Mac replaces the `docker` and `docker-compose` command lines in +> Docker Desktop for Mac replaces the `docker` and `docker-compose` command lines in > `/usr/local/bin` with symlinks to its own versions. {:.warning} @@ -117,10 +117,10 @@ See also [Unset environment variables in the current shell](/machine/get-started.md#unset-environment-variables-in-the-current-shell) in the Docker Machine topics. -## Docker Toolbox and Docker for Mac coexistence +## Docker Toolbox and Docker Desktop for Mac coexistence -You can use Docker for Mac and Docker Toolbox together on the same machine. When -you want to use Docker for Mac, make sure all DOCKER environment variables are +You can use Docker Desktop for Mac and Docker Toolbox together on the same machine. When +you want to use Docker Desktop for Mac, make sure all DOCKER environment variables are unset. You can do this in bash with `unset ${!DOCKER_*}`. When you want to use one of the VirtualBox VMs you have set with `docker-machine`, just run a `eval $(docker-machine env default)` (or the name of the machine you want to target). @@ -129,13 +129,13 @@ machine. This setup is represented in the following diagram. -![Docker Toolbox and Docker for Mac coexistence](images/docker-for-mac-and-toolbox.png) +![Docker Toolbox and Docker Desktop for Mac coexistence](images/docker-for-mac-and-toolbox.png) ## Using different versions of Docker tools The coexistence setup works as is as long as your VirtualBox VMs provisioned -with `docker-machine` run the same version of Docker Engine as Docker for Mac. +with `docker-machine` run the same version of Docker Engine as Docker Desktop for Mac. If you need to use VMs running older versions of Docker Engine, you can use a tool like [Docker Version Manager](https://github.com/getcarina/dvm) to manage several versions of docker client. @@ -149,9 +149,9 @@ created with Docker Machine can cause problems (client can't talk to the server or host machines). If you already have [Docker Toolbox](/toolbox/overview/) installed, and then -install Docker for Mac, you might get a newer version of the Docker client. Run +install Docker Desktop for Mac, you might get a newer version of the Docker client. Run `docker version` in a command shell to see client and server versions. In this -example, the client installed with Docker for Mac is `Version: 1.11.1` and the +example, the client installed with Docker Desktop for Mac is `Version: 1.11.1` and the server (which was installed earlier with Toolbox) is Version: 1.11.0. $ docker version @@ -164,7 +164,7 @@ server (which was installed earlier with Toolbox) is Version: 1.11.0. ... Also, if you created machines with Docker Machine (installed with Toolbox) then -upgraded or installed Docker for Mac, you might have machines running different +upgraded or installed Docker Desktop for Mac, you might have machines running different versions of Engine. Run `docker-machine ls` to view version information for the machines you created. In this example, the DOCKER column shows that each machine is running a different version of server. @@ -181,9 +181,9 @@ There are a few ways to address this problem and keep using your older machines. One solution is to use a version manager like [DVM](https://github.com/getcarina/dvm). -## Migrating from Docker Toolbox to Docker for Mac +## Migrating from Docker Toolbox to Docker Desktop for Mac -Docker for Mac does not propose Toolbox image migration as part of its +Docker Desktop for Mac does not propose Toolbox image migration as part of its installer since version 18.01.0. You can migrate existing Docker Toolbox images with the scripts described below. (This migration cannot merge images from both Docker and Toolbox: any existing Docker image is @@ -235,7 +235,7 @@ it](https://docs.docker.com/toolbox/toolbox_install_mac/#how-to-uninstall-toolbo ## How do I uninstall Docker Toolbox? -You might decide that you do not need Toolbox now that you have Docker for Mac, +You might decide that you do not need Toolbox now that you have Docker Desktop for Mac, and want to uninstall it. For details on how to perform a clean uninstall of Toolbox on the Mac, see [How to uninstall Toolbox](/toolbox/toolbox_install_mac.md#how-to-uninstall-toolbox) in the From d361e4407b1ca6af46a2fd0b727c0f9b2746ca59 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:20:47 -0500 Subject: [PATCH 66/84] Update faqs.md --- docker-for-mac/faqs.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-for-mac/faqs.md b/docker-for-mac/faqs.md index 0ffb5a9a5d..0a93ba013f 100644 --- a/docker-for-mac/faqs.md +++ b/docker-for-mac/faqs.md @@ -6,23 +6,23 @@ redirect_from: title: Frequently asked questions (FAQ) --- -**Looking for popular FAQs on Docker for Mac?** Check out the +**Looking for popular FAQs on Docker Desktop for Mac?** Check out the [Docker Success Center](http://success.docker.com/){: target="_blank" class="_"} for knowledge base articles, FAQs, technical support for subscription levels, and more. ## Questions about Docker.app ### Stable and Edge channels -**Q: How do I get the Stable or Edge version of Docker for Mac?** +**Q: How do I get the Stable or Edge version of Docker Desktop for Mac?** A: Use the download links for the channels given in the topic -[Download Docker for Mac](install.md#download-docker-for-mac){: target="_blank" class="_"}. +[Download Docker Desktop for Mac](install.md#download-docker-for-mac){: target="_blank" class="_"}. This topic also has more information about the two channels. -**Q: What is the difference between the Stable and Edge versions of Docker for Mac?** +**Q: What is the difference between the Stable and Edge versions of Docker Desktop for Mac?** -A: Two different download channels are available for Docker for Mac: +A: Two different download channels are available for Docker Desktop for Mac: * The **Stable channel** provides a general availability release-ready installer for a fully baked and tested, more reliable app. The Stable version of Docker From 014f7899f3028f81906584afcf0c56690b8eeae2 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:22:13 -0500 Subject: [PATCH 67/84] Update edge-release-notes.md --- docker-for-mac/edge-release-notes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index 38c298a28a..3c4298b7b6 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/docker-for-mac/edge-release-notes.md @@ -1,7 +1,7 @@ --- description: Change log / release notes per Edge release -keywords: Docker for Mac, edge, release notes -title: Docker for Mac Edge release notes +keywords: Docker Desktop for Mac, edge, release notes +title: Docker Desktop for Mac Edge release notes --- Here are the main improvements and issues per edge release, starting with the @@ -107,7 +107,7 @@ for Mac](install.md#download-docker-for-mac). * Upgrades - [LinuxKit v0.4](https://github.com/linuxkit/linuxkit/releases/tag/v0.4) - Linux Kernel 4.9.93 with CEPH, DRBD, RBD, MPLS_ROUTING and MPLS_IPTUNNEL enabled - - [Kubernetes 1.10.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#v1103). If Kubernetes is enabled, the upgrade will be performed automatically when starting Docker for Mac. + - [Kubernetes 1.10.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#v1103). If Kubernetes is enabled, the upgrade will be performed automatically when starting Docker Desktop for Mac. * Bug fixes and minor changes - Fix VPNKit memory leak. Fixes [moby/vpnkit#371](https://github.com/moby/vpnkit/issues/371) From 0abd45205f01f72cce6559e78774f423535ce136 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:24:42 -0500 Subject: [PATCH 68/84] Update troubleshoot.md --- docker-for-mac/troubleshoot.md | 54 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index 1b02df8f75..4e412092c4 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -7,12 +7,12 @@ title: Logs and troubleshooting --- Here is information about how to diagnose and troubleshoot problems, send logs -and communicate with the Docker for Mac team, use our forums and Knowledge Hub, +and communicate with the Docker Desktop for Mac team, use our forums and Knowledge Hub, browse and log issues on GitHub, and find workarounds for known problems. ## Docker Knowledge Hub -**Looking for help with Docker for Mac?** Check out the [Docker Knowledge +**Looking for help with Docker Desktop for Mac?** Check out the [Docker Knowledge Hub](http://success.docker.com/) for knowledge base articles, FAQs, and technical support for various subscription levels. @@ -20,8 +20,8 @@ technical support for various subscription levels. ### In-app diagnostics If you encounter problems for which you do not find solutions in this -documentation, on [Docker for Mac issues on -GitHub](https://github.com/docker/for-mac/issues), or the [Docker for Mac +documentation, on [Docker Desktop for Mac issues on +GitHub](https://github.com/docker/for-mac/issues), or the [Docker Desktop for Mac forum](https://forums.docker.com/c/docker-for-mac), we can help you troubleshoot the log data. @@ -39,7 +39,7 @@ Desktop](https://docs.docker.com/docker-for-mac/faqs/#how-is-personal-data-handl ![Diagnostics & Feedback with ID](images/diagnose-feedback-id.png){:width="600px"} -If you click **Report an issue**, this opens [Docker for Mac issues on +If you click **Report an issue**, this opens [Docker Desktop for Mac issues on GitHub](https://github.com/docker/for-mac/issues/) in your web browser in a "create new issue" template, to be completed before submission. Do not forget to copy/paste your diagnostic ID. @@ -49,9 +49,9 @@ copy/paste your diagnostic ID. ### Diagnosing from the terminal On occasions it is useful to run the diagnostics yourself, for instance if -Docker for Mac cannot start. +Docker Desktop for Mac cannot start. -First locate the `com.docker.diagnose` tool. If you installed Docker for Mac in +First locate the `com.docker.diagnose` tool. If you installed Docker Desktop for Mac in the Applications directory, then it is `/Applications/Docker.app/Contents/MacOS/com.docker.diagnose`. @@ -89,7 +89,7 @@ documentation](v17.12/docker-for-mac/troubleshoot/#logs). #### In a terminal -To watch the live flow of Docker for Mac logs at the command line, run this from +To watch the live flow of Docker Desktop for Mac logs at the command line, run this from your favorite shell. ```bash @@ -127,7 +127,7 @@ ways, and create reports. ### Make sure certificates are set up correctly -Docker for Mac ignores certificates listed under insecure registries, and does +Docker Desktop for Mac ignores certificates listed under insecure registries, and does not send client certificates to them. Commands like `docker run` that attempt to pull from the registry produces error messages on the command line, like this: @@ -145,9 +145,9 @@ As well as on the registry. For example: For more about using client and server side certificates, see [Adding TLS certificates](index.md#adding-tls-certificates) in the Getting Started topic. -### Docker for Mac does not start if Mac user account and home folder are renamed after installing the app +### Docker Desktop for Mac does not start if Mac user account and home folder are renamed after installing the app -See [Do I need to reinstall Docker for Mac if I change the name of my macOS +See [Do I need to reinstall Docker Desktop for Mac if I change the name of my macOS account?](faqs.md#do-i-need-to-reinstall-docker-for-mac-if-i-change-the-name-of-my-macos-account) in the FAQs. @@ -165,10 +165,10 @@ Dockerfile and volume. ### Incompatible CPU detected -Docker for Mac requires a processor (CPU) that supports virtualization and, more +Docker Desktop for Mac requires a processor (CPU) that supports virtualization and, more specifically, the [Apple Hypervisor framework](https://developer.apple.com/library/mac/documentation/DriversKernelHardware/Reference/Hypervisor/). -Docker for Mac is only compatible with Macs that have a CPU that supports the +Docker Desktop for Mac is only compatible with Macs that have a CPU that supports the Hypervisor framework. Most Macs built in 2010 and later support it, as described in the Apple Hypervisor Framework documentation about supported hardware: @@ -189,15 +189,15 @@ If not, the command prints `kern.hv_support: 0`. See also, [Hypervisor Framework Reference](https://developer.apple.com/library/mac/documentation/DriversKernelHardware/Reference/Hypervisor/) -in the Apple documentation, and Docker for Mac system requirements in [What to +in the Apple documentation, and Docker Desktop for Mac system requirements in [What to know before you install](install.md#what-to-know-before-you-install). ### Workarounds for common problems -* If Docker for Mac fails to install or start properly: +* If Docker Desktop for Mac fails to install or start properly: - * Make sure you quit Docker for Mac before installing a new version of the + * Make sure you quit Docker Desktop for Mac before installing a new version of the application (![whale menu](images/whale-x.png){: .inline} → **Quit Docker**). Otherwise, you get an "application in use" error when you try to copy the new app from the `.dmg` to `/Applications`. @@ -216,8 +216,8 @@ know before you install](install.md#what-to-know-before-you-install). * If you use bash, use the following command: `unset ${!DOCKER_*}` * For other shells, unset each environment variable individually as described - in [Setting up to run Docker for - Mac](docker-toolbox.md#setting-up-to-run-docker-for-mac) in [Docker for Mac + in [Setting up to run Docker Desktop for + Mac](docker-toolbox.md#setting-up-to-run-docker-for-mac) in [Docker Desktop for Mac vs. Docker Toolbox](docker-toolbox.md). @@ -226,13 +226,13 @@ know before you install](install.md#what-to-know-before-you-install). incoming connections so that the VM can get an IP address. -* For the `hello-world-nginx` example, Docker for Mac must be running to get to +* For the `hello-world-nginx` example, Docker Desktop for Mac must be running to get to the webserver on `http://localhost/`. Make sure that the Docker whale is showing in the menu bar, and that you run the Docker commands in a shell that - is connected to the Docker for Mac Engine (not Engine from Toolbox). + is connected to the Docker Desktop for Mac Engine (not Engine from Toolbox). Otherwise, you might start the webserver container but get a "web page not available" error when you go to `localhost`. For more on distinguishing - between the two environments, see [Docker for Mac vs. Docker + between the two environments, see [Docker Desktop for Mac vs. Docker Toolbox](docker-toolbox.md).

@@ -249,12 +249,12 @@ know before you install](install.md#what-to-know-before-you-install). ## Known issues -* IPv6 is not (yet) supported on Docker for Mac. +* IPv6 is not (yet) supported on Docker Desktop for Mac. A workaround is provided that auto-filters out the IPv6 addresses in DNS server lists and enables successful network access. For example, `2001:4860:4860::8888` would become `8.8.8.8`. To learn more, see these - issues on GitHub and Docker for Mac forums: + issues on GitHub and Docker Desktop for Mac forums: * [Network timeout when top two DNS servers in /etc/resolv.conf are IPv6 addresses](https://github.com/docker/for-mac/issues/9) @@ -264,7 +264,7 @@ know before you install](install.md#what-to-know-before-you-install).

-* You might encounter errors when using `docker-compose up` with Docker for Mac +* You might encounter errors when using `docker-compose up` with Docker Desktop for Mac (`ValueError: Extra Data`). We've identified this is likely related to data and/or events being passed all at once rather than one by one, so sometimes the data comes back as 2+ objects concatenated and causes an error. @@ -280,13 +280,13 @@ know before you install](install.md#what-to-know-before-you-install).

-* Docker for Mac uses the `HyperKit` hypervisor +* Docker Desktop for Mac uses the `HyperKit` hypervisor (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If you are developing with tools that have conflicts with `HyperKit`, such as [Intel Hardware Accelerated Execution Manager (HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/), the current workaround is not to run them at the same time. You can pause - `HyperKit` by quitting Docker for Mac temporarily while you work with HAXM. + `HyperKit` by quitting Docker Desktop for Mac temporarily while you work with HAXM. This allows you to continue work with the other tools and prevent `HyperKit` from interfering. @@ -340,7 +340,7 @@ know before you install](install.md#what-to-know-before-you-install). and roadmap](osxfs.md#performance-issues-solutions-and-roadmap). * If your system does not have access to an NTP server, then after a hibernate - the time seen by Docker for Mac may be considerably out of sync with the host. + the time seen by Docker Desktop for Mac may be considerably out of sync with the host. Furthermore, the time may slowly drift out of sync during use. To manually reset the time after hibernation, run: From 0035e29e893aff94e1b3c31bf3e16a9319bdd997 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:26:05 -0500 Subject: [PATCH 69/84] Update install.md --- docker-for-mac/install.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md index 984d434f27..120ca6cfdb 100644 --- a/docker-for-mac/install.md +++ b/docker-for-mac/install.md @@ -1,10 +1,10 @@ --- -description: How to install Docker for Mac +description: How to install Docker Desktop for Mac keywords: mac, beta, alpha, install, download -title: Install Docker for Mac +title: Install Docker Desktop for Mac --- -To download Docker for Mac, head to Docker Hub. +To download Docker Desktop for Mac, head to Docker Hub. [Download from Docker Hub](https://hub.docker.com/editions/community/docker-ce-desktop-mac){: .button .outline-btn} @@ -13,21 +13,21 @@ To download Docker for Mac, head to Docker Hub. > README FIRST for Docker Toolbox and Docker Machine users > >If you are already running Docker on your machine, first read -[Docker for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the +[Docker Desktop for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the impact of this installation on your existing setup, how to set your environment -for Docker for Mac, and how the two products can coexist. +for Docker Desktop for Mac, and how the two products can coexist. -* **Relationship to Docker Machine**: Installing Docker for Mac does not affect +* **Relationship to Docker Machine**: Installing Docker Desktop for Mac does not affect machines you created with Docker Machine. You have the option to copy containers and images from your local `default` machine (if one exists) to the - new Docker for Mac [HyperKit](https://github.com/docker/HyperKit/) VM. When - you are running Docker for Mac, you do not need Docker Machine nodes running - at all locally (or anywhere else). With Docker for Mac, you have a new, native + new Docker Desktop for Mac [HyperKit](https://github.com/docker/HyperKit/) VM. When + you are running Docker Desktop for Mac, you do not need Docker Machine nodes running + at all locally (or anywhere else). With Docker Desktop for Mac, you have a new, native virtualization system running (HyperKit) which takes the place of the VirtualBox system. To learn more, see - [Docker for Mac vs. Docker Toolbox](docker-toolbox.md). + [Docker Desktop for Mac vs. Docker Toolbox](docker-toolbox.md). -* **System Requirements**: Docker for Mac launches only if all of these +* **System Requirements**: Docker Desktop for Mac launches only if all of these requirements are met. - Mac hardware must be a 2010 or newer model, with Intel's hardware support for memory @@ -41,7 +41,7 @@ for Docker for Mac, and how the two products can coexist. - At least 4GB of RAM - VirtualBox prior to version 4.3.30 must NOT be installed (it is incompatible - with Docker for Mac). If you have a newer version of VirtualBox installed, it's fine. + with Docker Desktop for Mac). If you have a newer version of VirtualBox installed, it's fine. > **Note**: If your system does not satisfy these requirements, you can > install [Docker Toolbox](/toolbox/overview.md), which uses Oracle VirtualBox @@ -51,7 +51,7 @@ for Docker for Mac, and how the two products can coexist. [Docker Engine](/engine/userguide/), Docker CLI client, [Docker Compose](/compose/overview/), [Docker Machine](/machine/overview/), and [Kitematic](/kitematic/userguide.md). -## Install and run Docker for Mac +## Install and run Docker Desktop for Mac 1. Double-click `Docker.dmg` to open the installer, then drag Moby the whale to the Applications folder. @@ -80,13 +80,13 @@ for Docker for Mac, and how the two products can coexist. Preferences and other options. 4. Select **About Docker** to verify that you have the latest version. -Congratulations! You are up and running with Docker for Mac. +Congratulations! You are up and running with Docker Desktop for Mac. ## Where to go next -* [Getting started](index.md) provides an overview of Docker for Mac, basic +* [Getting started](index.md) provides an overview of Docker Desktop for Mac, basic Docker command examples, how to get help or give feedback, and links to all - topics in the Docker for Mac guide. + topics in the Docker Desktop for Mac guide. * [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. * [FAQs](faqs.md) provides answers to frequently asked questions. From bccca852e25f1524735d481b59555fb228ada645 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:29:19 -0500 Subject: [PATCH 70/84] Update index.md --- docker-for-mac/index.md | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 7c72f64381..a3e88804e0 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -11,14 +11,14 @@ redirect_from: - /engine/installation/mac/ - /docker-for-mac/index/ - /docker-for-mac/osx/ -title: Get started with Docker for Mac +title: Get started with Docker Desktop for Mac --- -Welcome to Docker for Mac! Docker is a full development platform for creating -containerized apps, and Docker for Mac is the best way to get started with +Welcome to Docker Desktop for Mac! Docker is a full development platform for creating +containerized apps, and Docker Desktop for Mac is the best way to get started with Docker _on a Mac_. -> See [Install Docker for Mac](install.md){: target="_blank" class="_"} for +> See [Install Docker Desktop for Mac](install.md){: target="_blank" class="_"} for > information on system requirements and stable & edge channels. ## Check versions @@ -119,7 +119,7 @@ General settings are: manually by choosing ![whale menu](images/whale-x.png){: .inline} → **Check for Updates**. -- **Include VM in Time Machine backups** backs up the Docker for Mac virtual +- **Include VM in Time Machine backups** backs up the Docker Desktop for Mac virtual machine. (Disabled by default.) - **Securely store Docker logins in MacOS keychain** stores your Docker login @@ -167,11 +167,11 @@ settings-advanced](images/menu/prefs-advanced.png){:width="400px"} Advanced settings are: -**CPUs**: By default, Docker for Mac is set to use half the number of processors +**CPUs**: By default, Docker Desktop for Mac is set to use half the number of processors available on the host machine. To increase processing power, set this to a higher number; to decrease, lower the number. -**Memory**: By default, Docker for Mac is set to use `2` GB runtime memory, +**Memory**: By default, Docker Desktop for Mac is set to use `2` GB runtime memory, allocated from the total available memory on your Mac. To increase RAM, set this to a higher number; to decrease it, lower the number. @@ -190,7 +190,7 @@ the existing image or replace it. ### Proxies -Docker for Mac detects HTTP/HTTPS Proxy Settings from macOS and automatically +Docker Desktop for Mac detects HTTP/HTTPS Proxy Settings from macOS and automatically propagates these to Docker and to your containers. For example, if you set your proxy settings to `http://proxy.example.com`, Docker uses this proxy when pulling containers. @@ -234,10 +234,10 @@ Select **Basic** to configure the daemon with interactive settings, or select #### Experimental features -Both Docker for Mac Stable and Edge releases have experimental features enabled +Both Docker Desktop for Mac Stable and Edge releases have experimental features enabled on Docker Engine, as described [Docker Experimental Features README](https://github.com/docker/docker-ce/blob/master/components/cli/experimental/README.md){: -target="_blank" class="_"}. If you uncheck **experimental mode**, Docker for Mac +target="_blank" class="_"}. If you uncheck **experimental mode**, Docker Desktop for Mac uses the current generally available release of Docker Engine. > Don't enable experimental features in production @@ -288,7 +288,7 @@ changes when asked. ### Kubernetes -In Docker for Mac [17.12 Edge +In Docker Desktop for Mac [17.12 Edge (mac45)](/docker-for-mac/edge-relese-notes/#docker-community-edition-17120-ce-mac45-2018-01-05) and higher, and [18.06 Stable (mac70)](/docker-for-mac/release-notes/#docker-community-edition-18060-ce-mac70-2018-07-25) @@ -323,7 +323,7 @@ experience conflicts, remove `/usr/local/bin/kubectl`. `/usr/local/bin/kubectl` command is installed on your Mac. When Kubernetes is enabled and running, an additional status bar item displays - at the bottom right of the Docker for Mac Preferences dialog. + at the bottom right of the Docker Desktop for Mac Preferences dialog. ![Installation complete](images/kubernetes/kubernetes-install-complete.png){:width="400px"} @@ -343,7 +343,7 @@ experience conflicts, remove `/usr/local/bin/kubectl`. Kubernetes containers are stopped and removed, and the `/usr/local/bin/kubectl` command is removed. - For more about using the Kubernetes integration with Docker for Mac, see + For more about using the Kubernetes integration with Docker Desktop for Mac, see [Deploy on Kubernetes](kubernetes.md){:target="_blank" class="_"}. ### Reset @@ -362,12 +362,12 @@ Reset settings are: reset to factory defaults (which would cause you to lose settings). * **Reset to factory defaults** - Choose this option to reset all options on - Docker for Mac to its initial state, the same as when it was first installed. + Docker Desktop for Mac to its initial state, the same as when it was first installed. - * **Uninstall** - Choose this option to remove Docker for Mac from your + * **Uninstall** - Choose this option to remove Docker Desktop for Mac from your system. -> Uninstall Docker for Mac from the commandline +> Uninstall Docker Desktop for Mac from the commandline > >To uninstall Docker from Mac from a terminal, run: ` >--uninstall`. If your instance is installed in the default location, this @@ -389,13 +389,13 @@ registries) to your Docker daemon. ### Add custom CA certificates (server side) -All trusted CAs (root or intermediate) are supported. Docker for Mac creates a +All trusted CAs (root or intermediate) are supported. Docker Desktop for Mac creates a certificate bundle of all user-trusted CAs based on the Mac Keychain, and appends it to Moby trusted certificates. So if an enterprise SSL certificate is -trusted by the user on the host, it is trusted by Docker for Mac. +trusted by the user on the host, it is trusted by Docker Desktop for Mac. To manually add a custom, self-signed certificate, start by adding the -certificate to the macOS keychain, which is picked up by Docker for Mac. Here is +certificate to the macOS keychain, which is picked up by Docker Desktop for Mac. Here is an example. ```bash @@ -412,12 +412,12 @@ $ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychai See also, [Directory structures for certificates](#directory-structures-for-certificates). -> **Note:** You need to restart Docker for Mac after making any changes to the +> **Note:** You need to restart Docker Desktop for Mac after making any changes to the keychain or to the `~/.docker/certs.d` directory in order for the changes to take effect. For a complete explanation of how to do this, see the blog post [Adding -Self-signed Registry Certs to Docker & Docker for +Self-signed Registry Certs to Docker & Docker Desktop for Mac](http://container-solutions.com/adding-self-signed-registry-certs-docker-mac/){:target="_blank" class="_"}. @@ -427,16 +427,16 @@ You can put your client certificates in `~/.docker/certs.d/:/client.cert` and `~/.docker/certs.d/:/client.key`. -When the Docker for Mac application starts up, it copies the `~/.docker/certs.d` +When the Docker Desktop for Mac application starts up, it copies the `~/.docker/certs.d` folder on your Mac to the `/etc/docker/certs.d` directory on Moby (the Docker for Mac `xhyve` virtual machine). -> * You need to restart Docker for Mac after making any changes to the keychain +> * You need to restart Docker Desktop for Mac after making any changes to the keychain > or to the `~/.docker/certs.d` directory in order for the changes to take > effect. > > * The registry cannot be listed as an _insecure registry_ (see [Docker -> Daemon](index.md#docker-daemon)). Docker for Mac ignores certificates listed +> Daemon](index.md#docker-daemon)). Docker Desktop for Mac ignores certificates listed > under insecure registries, and does not send client certificates. Commands > like `docker run` that attempt to pull from the registry produce error > messages on the command line, as well as on the registry. @@ -483,7 +483,7 @@ topics. ## Install shell completion -Docker for Mac comes with scripts to enable completion for the `docker`, +Docker Desktop for Mac comes with scripts to enable completion for the `docker`, `docker-machine`, and `docker-compose` commands. The completion scripts may be found inside `Docker.app`, in the `Contents/Resources/etc/` directory and can be installed both in Bash and Zsh. @@ -521,10 +521,10 @@ ln -s $etc/docker-compose.zsh-completion /usr/local/share/zsh/site-functions/_do ## Give feedback and get help To get help from the community, review current user topics, join or start a -discussion, log on to our [Docker for Mac +discussion, log on to our [Docker Desktop for Mac forum](https://forums.docker.com/c/docker-for-mac){:target="_blank" class="_"}. -To report bugs or problems, log on to [Docker for Mac issues on +To report bugs or problems, log on to [Docker Desktop for Mac issues on GitHub](https://github.com/docker/for-mac/issues){:target="_blank" class="_"}, where you can review community reported issues, and file new ones. See [Logs and Troubleshooting](troubleshoot.md) for more details. @@ -535,16 +535,16 @@ options at the bottom of each docs page. ## Docker Hub You can access your [Docker ID](/docker-id/index.md){:target="_blank" -class="_"} account from within Docker for Mac. +class="_"} account from within Docker Desktop for Mac. ![Docker ID](images/docker-cloud.png){:width="550px"} -From the Docker for Mac menu, sign in to Docker Hub with your Docker ID, or +From the Docker Desktop for Mac menu, sign in to Docker Hub with your Docker ID, or create one. ![Docker ID sign-in](images/menu/sign-in.png){: .with-border width="250px"} -Then use the Docker for Mac menu to create, view, or navigate directly to your +Then use the Docker Desktop for Mac menu to create, view, or navigate directly to your Cloud resources, including **organizations**, **repositories**, and **swarms**. Check out these [Docker Hub topics](/docker-hub/index.md){:target="_blank" From 9f59812fc582188e2f28cc4325cb5a79c19a7858 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:32:40 -0500 Subject: [PATCH 71/84] Update advisories.yaml --- _data/advisories.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_data/advisories.yaml b/_data/advisories.yaml index f69a8b7ca1..cc8e6b0a03 100644 --- a/_data/advisories.yaml +++ b/_data/advisories.yaml @@ -10,13 +10,13 @@ texts: experimental: "The functionality described on this page is marked as Experimental, and as such, may change before it becomes generally available." rc: "The Swarm mode feature included in Docker Engine 1.12 is a release candidate feature and might be subject to non backward-compatible changes. Some functionality may change before the feature becomes generally available." - docker4mac-beta: "Docker for Mac is currently in public beta. Some functionality may change before the product becomes generally available." - docker4win-beta: "Docker for Windows is currently in public beta. Some functionality may change before the product becomes generally available." - toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible." - kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker for Mac](/docker-for-mac/) or [Docker for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications." + docker4mac-beta: "Docker Desktop for Mac is currently in public beta. Some functionality may change before the product becomes generally available." + docker4win-beta: "Docker Desktop for Windows is currently in public beta. Some functionality may change before the product becomes generally available." + toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker Desktop for Mac](/docker-for-mac/) and [Docker Desktop for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible." + kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker Desktop for Mac](/docker-for-mac/) or [Docker Desktop for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications." swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product." swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the [Get started with Docker walkthrough](/get-started/)). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands." - engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta." + engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker Desktop for Mac and Docker Desktop for Windows are currently in Beta." # URL based advisories From 548c172240204334b0694c248f717fd0064394f0 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:35:47 -0500 Subject: [PATCH 72/84] Update toolbox_install_mac.md --- toolbox/toolbox_install_mac.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/toolbox/toolbox_install_mac.md b/toolbox/toolbox_install_mac.md index d80f8df579..98e55287a5 100644 --- a/toolbox/toolbox_install_mac.md +++ b/toolbox/toolbox_install_mac.md @@ -7,7 +7,7 @@ title: Install Docker Toolbox on macOS Docker Toolbox provides a way to use Docker on older Macs that do not meet -minimal system requirements for [Docker for Mac](/docker-for-mac/index.md). +minimal system requirements for [Docker Desktop for Mac](/docker-for-mac/index.md). If you have not done so already, download the installer here: @@ -32,7 +32,7 @@ attach to a small Linux VM on your machine. This VM hosts Docker Engine for you on your Mac. >**Tip**: One of the advantages of the newer -[Docker for Mac](/docker-for-mac/index.md) solution is that +[Docker Desktop for Mac](/docker-for-mac/index.md) solution is that it uses native virtualization and does not require VirtualBox to run Docker. @@ -51,12 +51,12 @@ software. To find out what version of the OS you have: If you aren't using a supported version, you could consider upgrading your operating system. - If you have macOS 10.10.3 Yosemite or newer, consider using [Docker for + If you have macOS 10.10.3 Yosemite or newer, consider using [Docker Desktop for Mac](/docker-for-mac/) instead. It runs natively on the Mac, so there is no need for a pre-configured Docker QuickStart shell. It uses the native macOS Hypervisor framework for virtualization, instead of Oracle VirutalBox. Full - install prerequisites are provided in the Docker for Mac topic in [Docker - for Mac](/docker-for-mac/#what-to-know-before-you-install). + install prerequisites are provided in the Docker Desktop for Mac topic in [Docker + Desktop for Mac](/docker-for-mac/#what-to-know-before-you-install). ## Step 2: Install Docker Toolbox @@ -245,7 +245,7 @@ you created with Docker Machine. In some cases, you might want to keep machines created with Docker Machine. For example, if you plan to re-install Docker Machine as a part of -Docker for Mac you can continue to manage those machines through +Docker Desktop for Mac you can continue to manage those machines through Docker. Or, if you have remote machines on a cloud provider and you plan to manage them using the provider, you wouldn't want to remove them. So the step to remove machines is described here as optional. @@ -271,7 +271,7 @@ To uninstall Toolbox on a Mac, do the following: This step is optional because if you plan to re-install Docker Machine as a part - of [Docker for Mac](/docker-for-mac/index.md), you can import and + of [Docker Desktop for Mac](/docker-for-mac/index.md), you can import and continue to manage those machines through Docker. 3. In your "Applications" folder, remove the "Docker" directory, @@ -284,9 +284,9 @@ To uninstall Toolbox on a Mac, do the following: ``` 5. Remove the `docker`, `docker-compose`, and `docker-machine` commands from - the `/usr/local/bin` folder. Docker for Mac and Brew may also have + the `/usr/local/bin` folder. Docker Desktop for Mac and Brew may also have installed them; in case of doubt leave them, or reinstall them via Brew, or - rerun Docker for Mac (no need to reinstall it). + rerun Docker Desktop for Mac (no need to reinstall it). ``` $ rm -f /usr/local/bin/docker From c2cef4bc02da9db74d5b086f6f9170bf7163b623 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:39:50 -0500 Subject: [PATCH 73/84] Update index.md --- release-notes/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-notes/index.md b/release-notes/index.md index d86253c4e5..92ee971e5e 100644 --- a/release-notes/index.md +++ b/release-notes/index.md @@ -9,8 +9,8 @@ Find out what's new in Docker products! - [Docker Enterprise and Community Engine](/engine/release-notes) - [Docker Trusted Registry](/ee/dtr/release-notes/) - [Docker Universal Control Plane](/ee/ucp/release-notes/) -- [Docker for Mac](/docker-for-mac/release-notes.md) ([Edge Releases](/docker-for-mac/edge-release-notes.md)) -- [Docker for Windows](/docker-for-windows/release-notes.md) ([Edge Releases](/docker-for-windows/edge-release-notes.md)) +- [Docker Desktop for Mac](/docker-for-mac/release-notes.md) ([Edge Releases](/docker-for-mac/edge-release-notes.md)) +- [Docker Desktop for Windows](/docker-for-windows/release-notes.md) ([Edge Releases](/docker-for-windows/edge-release-notes.md)) - [Docker for Azure](/docker-for-azure/release-notes.md) or [Docker for AWS](/docker-for-aws/release-notes.md) - [Docker Compose](docker-compose.md) - [Docker Machine](docker-machine.md) From d46c74430432072ade46bd8650006ed1663b40c3 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:43:15 -0500 Subject: [PATCH 74/84] Update networking.md --- docker-for-mac/networking.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-for-mac/networking.md b/docker-for-mac/networking.md index 0376286d58..c7f8d2110b 100644 --- a/docker-for-mac/networking.md +++ b/docker-for-mac/networking.md @@ -3,19 +3,19 @@ description: Networking keywords: mac, networking redirect_from: - /mackit/networking/ -title: Networking features in Docker for Mac +title: Networking features in Docker Desktop for Mac --- {% assign Arch = 'Mac' %} -Docker for {{Arch}} provides several networking features to make it +Docker Desktop for {{Arch}} provides several networking features to make it easier to use. ## Features ### VPN Passthrough -Docker for {{Arch}}'s networking can work when attached to a VPN. To do this, -Docker for {{Arch}} intercepts traffic from the containers and injects it into +Docker Desktop for {{Arch}}'s networking can work when attached to a VPN. To do this, +Docker Desktop for {{Arch}} intercepts traffic from the containers and injects it into {{Arch}} as if it originated from the Docker application. ### Port Mapping @@ -26,7 +26,7 @@ When you run a container with the `-p` argument, for example: $ docker run -p 80:80 -d nginx ``` -Docker for {{Arch}} makes whatever is running on port 80 in the container (in +Docker Desktop for {{Arch}} makes whatever is running on port 80 in the container (in this case, `nginx`) available on port 80 of `localhost`. In this example, the host and container ports are the same. What if you need to specify a different host port? If, for example, you already have something running on port 80 of @@ -45,18 +45,18 @@ See [Proxies](index#proxies). ## Known limitations, use cases, and workarounds -Following is a summary of current limitations on the Docker for {{Arch}} +Following is a summary of current limitations on the Docker Desktop for {{Arch}} networking stack, along with some ideas for workarounds. ### There is no docker0 bridge on macOS -Because of the way networking is implemented in Docker for Mac, you cannot see a +Because of the way networking is implemented in Docker Desktop for Mac, you cannot see a `docker0` interface on the host. This interface is actually within the virtual machine. ### I cannot ping my containers -Docker for Mac can't route traffic to containers. +Docker Desktop for Mac can't route traffic to containers. ### Per-container IP addressing is not possible @@ -72,7 +72,7 @@ The host has a changing IP address (or none if you have no network access). From 18.03 onwards our recommendation is to connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. -This is for development purpose and will not work in a production environment outside of Docker for Mac. +This is for development purpose and will not work in a production environment outside of Docker Desktop for Mac. The gateway is also reachable as `gateway.docker.internal`. From c12f6206ffeb1774cdbd6f1710859422536a4f98 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:46:04 -0500 Subject: [PATCH 75/84] Update osxfs.md --- docker-for-mac/osxfs.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-for-mac/osxfs.md b/docker-for-mac/osxfs.md index 5df2636310..02e3bfac3f 100644 --- a/docker-for-mac/osxfs.md +++ b/docker-for-mac/osxfs.md @@ -6,14 +6,14 @@ redirect_from: title: File system sharing (osxfs) --- -`osxfs` is a new shared file system solution, exclusive to Docker for Mac. +`osxfs` is a new shared file system solution, exclusive to Docker Desktop for Mac. `osxfs` provides a close-to-native user experience for bind mounting macOS file system trees into Docker containers. To this end, `osxfs` features a number of unique capabilities as well as differences from a classical Linux file system. ### Case sensitivity -With Docker for Mac, file systems operate in containers in the same way as they +With Docker Desktop for Mac, file systems operate in containers in the same way as they operate in macOS. If a file system on macOS is case-insensitive, that behavior is shared by any bind mount from macOS into a container. @@ -31,7 +31,7 @@ on case-insensitivity to function. ### Access control `osxfs`, and therefore Docker, can access only those file system resources that -the Docker for Mac user has access to. `osxfs` does not run as `root`. If the macOS +the Docker Desktop for Mac user has access to. `osxfs` does not run as `root`. If the macOS user is an administrator, `osxfs` inherits those administrator privileges. We are still evaluating which privileges to drop in the file system process to balance security and ease-of-use. `osxfs` performs no additional permissions @@ -160,7 +160,7 @@ between macOS userspace processes and the macOS kernel. With regard to reported performance issues ([GitHub issue 77: File access in mounted volumes extremely slow](https://github.com/docker/for-mac/issues/77)), -and a similar thread on [Docker for Mac forums on topic: File access in mounted +and a similar thread on [Docker Desktop for Mac forums on topic: File access in mounted volumes extremely slow](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/), this topic provides an explanation of the issues, recent progress in addressing @@ -176,7 +176,7 @@ mentioned. We want to surface it in the documentation for wider reach. Perhaps the most important thing to understand is that shared file system performance is multi-dimensional. This means that, depending on your workload, you may experience exceptional, adequate, or poor performance with `osxfs`, the -file system server in Docker for Mac. File system APIs are very wide (20-40 +file system server in Docker Desktop for Mac. File system APIs are very wide (20-40 message types) with many intricate semantics involving on-disk state, in-memory cache state, and concurrent access by multiple processes. Additionally, `osxfs` integrates a mapping between macOS's FSEvents API and Linux's `inotify` API @@ -207,7 +207,7 @@ haven't implemented all those improvements yet (more on this below in [What you can do](osxfs.md#what-you-can-do)). A second approach to improving performance is to reduce the number of -roundtrips by caching data. Recent versions of Docker for Mac (17.04 onwards) +roundtrips by caching data. Recent versions of Docker Desktop for Mac (17.04 onwards) include caching support that brings significant (2-4×) improvements to many applications. Much of the overhead of osxfs arises from the requirement to keep the container's and the host's view of the file system consistent, but @@ -310,7 +310,7 @@ can be easily tracked. #### What you can expect We continue to work toward an optimized shared file system implementation -on the Edge channel of Docker for Mac. +on the Edge channel of Docker Desktop for Mac. You can expect some of the performance improvement work mentioned above to reach the Edge channel in the coming release cycles. @@ -330,7 +330,7 @@ We hope this gives you a rough idea of where `osxfs` performance is and where it's going. We are treating good performance as a top priority feature of the file system sharing component and we are actively working on improving it through a number of different avenues. The osxfs project started in December -2015. Since the first integration into Docker for Mac in February 2016, we've +2015. Since the first integration into Docker Desktop for Mac in February 2016, we've improved performance by 50x or more for many workloads while achieving nearly complete POSIX compliance and without compromising coherence (it is shared and not simply synced). Of course, in the beginning there was lots of low-hanging From 5213464c900d2394da624225b914e47fdeb97cf8 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:47:00 -0500 Subject: [PATCH 76/84] Update multi-arch.md --- docker-for-mac/multi-arch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-mac/multi-arch.md b/docker-for-mac/multi-arch.md index 80b4d504ce..52e218d1e1 100644 --- a/docker-for-mac/multi-arch.md +++ b/docker-for-mac/multi-arch.md @@ -7,7 +7,7 @@ title: Leverage multi-CPU architecture support notoc: true --- -Docker for Mac provides `binfmt_misc` multi architecture support, so you can run +Docker Desktop for Mac provides `binfmt_misc` multi architecture support, so you can run containers for different Linux architectures, such as `arm`, `mips`, `ppc64le`, and even `s390x`. From b6ed815c32fb45fef3af1f0b258d5481678a2bf1 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:49:15 -0500 Subject: [PATCH 77/84] Update osxfs-caching.md --- docker-for-mac/osxfs-caching.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-mac/osxfs-caching.md b/docker-for-mac/osxfs-caching.md index a7c990565a..5e0943756d 100644 --- a/docker-for-mac/osxfs-caching.md +++ b/docker-for-mac/osxfs-caching.md @@ -9,7 +9,7 @@ Edge](/edge/index.md#docker-ce-edge-new-features) adds support for two new flags to the [docker run `-v`, `--volume`](/engine/reference/run/#volume-shared-filesystems) option, `cached` and `delegated`, that can significantly improve the performance -of mounted volume access on Docker for Mac. These options begin to solve some of +of mounted volume access on Docker Desktop for Mac. These options begin to solve some of the challenges discussed in [Performance issues, solutions, and roadmap](osxfs.md#performance-issues-solutions-and-roadmap). @@ -191,7 +191,7 @@ visible to the host, but there may be a delay before writes performed on the host are visible within containers. >**Tip:** To learn more about `cached`, see the article on -[User-guided caching in Docker for Mac](https://blog.docker.com/2017/05/user-guided-caching-in-docker-for-mac/). +[User-guided caching in Docker Desktop for Mac](https://blog.docker.com/2017/05/user-guided-caching-in-docker-for-mac/). 1. Implementations **_must_** obey `delegated` Semantics 1-5. From 1e96404f09b76de94b7e3af9c33b8ba29b513696 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:50:11 -0500 Subject: [PATCH 78/84] Update kubernetes.md --- docker-for-mac/kubernetes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-mac/kubernetes.md b/docker-for-mac/kubernetes.md index 1e2cdbce58..bc81d6f078 100644 --- a/docker-for-mac/kubernetes.md +++ b/docker-for-mac/kubernetes.md @@ -1,5 +1,5 @@ --- -description: Deploying to Kubernetes on Docker for Mac +description: Deploying to Kubernetes on Docker Desktop for Mac keywords: mac, edge, kubernetes, kubectl, orchestration title: Deploy on Kubernetes --- From 7d79c203d20a81ca1b69caf66ff72ca42e7f61ef Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:55:08 -0500 Subject: [PATCH 79/84] Update install-cni-plugin.md --- ee/ucp/kubernetes/install-cni-plugin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/kubernetes/install-cni-plugin.md b/ee/ucp/kubernetes/install-cni-plugin.md index 4929cb30af..554c754969 100644 --- a/ee/ucp/kubernetes/install-cni-plugin.md +++ b/ee/ucp/kubernetes/install-cni-plugin.md @@ -49,7 +49,7 @@ Use the following commands to get the YAML files for popular CNI plugins. CNI_URL="https://cloud.weave.works/k8s/net?k8s-version=Q2xpZW50IFZlcnNpb246IHZlcnNpb24uSW5mb3tNYWpvcjoiMSIsIE1pbm9yOiI5IiwgR2l0VmVyc2lvbjoidjEuOS4zIiwgR2l0Q29tbWl0OiJkMjgzNTQxNjU0NGYyOThjOTE5ZTJlYWQzYmUzZDA4NjRiNTIzMjNiIiwgR2l0VHJlZVN0YXRlOiJjbGVhbiIsIEJ1aWxkRGF0ZToiMjAxOC0wMi0wN1QxMjoyMjoyMVoiLCBHb1ZlcnNpb246ImdvMS45LjIiLCBDb21waWxlcjoiZ2MiLCBQbGF0Zm9ybToibGludXgvYW1kNjQifQpTZXJ2ZXIgVmVyc2lvbjogdmVyc2lvbi5JbmZve01ham9yOiIxIiwgTWlub3I6IjgrIiwgR2l0VmVyc2lvbjoidjEuOC4yLWRvY2tlci4xNDMrYWYwODAwNzk1OWUyY2UiLCBHaXRDb21taXQ6ImFmMDgwMDc5NTllMmNlYWUxMTZiMDk4ZWNhYTYyNGI0YjI0MjBkODgiLCBHaXRUcmVlU3RhdGU6ImNsZWFuIiwgQnVpbGREYXRlOiIyMDE4LTAyLTAxVDIzOjI2OjE3WiIsIEdvVmVyc2lvbjoiZ28xLjguMyIsIENvbXBpbGVyOiJnYyIsIFBsYXRmb3JtOiJsaW51eC9hbWQ2NCJ9Cg==" ``` If you have kubectl available, for example by using - [Docker for Mac](/docker-for-mac/kubernetes.md), you can use the following + [Docker Desktop for Mac](/docker-for-mac/kubernetes.md), you can use the following command to get the URL for the [Weave](https://www.weave.works/) CNI plugin: ```bash # Get the URL for the Weave CNI plugin. From 4bc888a9c26f6f1f1a6e23bd990fa105405979f8 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 15:59:42 -0500 Subject: [PATCH 80/84] Update bind-mounts.md --- storage/bind-mounts.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/bind-mounts.md b/storage/bind-mounts.md index db7c2708b0..c8d69fd266 100644 --- a/storage/bind-mounts.md +++ b/storage/bind-mounts.md @@ -66,7 +66,7 @@ syntax separates them. Here is a comparison of the syntax for each flag. `private`, `rshared`, `shared`, `rslave`, `slave`. - The [`consistency`](#configure-mount-consistency-for-macos) option, if present, may be one of `consistent`, `delegated`, or `cached`. This setting - only applies to Docker for Mac, and is ignored on all other platforms. + only applies to Docker Desktop for Mac, and is ignored on all other platforms. - The `--mount` flag does not support `z` or `Z` options for modifying selinux labels. @@ -383,9 +383,9 @@ $ docker run -d \ ## Configure mount consistency for macOS -Docker for Mac uses `osxfs` to propagate directories and files shared from macOS +Docker Desktop for Mac uses `osxfs` to propagate directories and files shared from macOS to the Linux VM. This propagation makes these directories and files available to -Docker containers running on Docker for Mac. +Docker containers running on Docker Desktop for Mac. By default, these shares are fully-consistent, meaning that every time a write happens on the macOS host or through a mount in a container, the changes are From 4fae447532010e592502bd33b7d3866f157e18b0 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 16:02:53 -0500 Subject: [PATCH 81/84] Update release-notes.md --- docker-for-windows/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-windows/release-notes.md b/docker-for-windows/release-notes.md index 4bae94eab3..397a685377 100644 --- a/docker-for-windows/release-notes.md +++ b/docker-for-windows/release-notes.md @@ -1,9 +1,9 @@ --- description: Change log / release notes per stable release -keywords: Docker for Windows, stable, release notes +keywords: Docker Desktop for Windows, stable, release notes redirect_from: - /winkit/release-notes/ -title: Docker for Windows Stable Release notes +title: Docker Desktop for Windows Stable Release notes --- Here are the main improvements and issues per stable release, starting with the From b47ac9ae3b943808749503abb723c3678d6dd93e Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 16:10:52 -0500 Subject: [PATCH 82/84] Update index.md --- compose/compose-file/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index 7aadd71548..d03635548a 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -1794,13 +1794,13 @@ services: constraints: [node.role == manager] ``` -#### Caching options for volume mounts (Docker for Mac) +#### Caching options for volume mounts (Docker Desktop for Mac) On Docker 17.04 CE Edge and up, including 17.06 CE Edge and Stable, you can configure container-and-host consistency requirements for bind-mounted directories in Compose files to allow for better performance on read/write of volume mounts. These options address issues specific to `osxfs` file sharing, -and therefore are only applicable on Docker for Mac. +and therefore are only applicable on Docker Desktop for Mac. The flags are: @@ -1828,7 +1828,7 @@ services: ``` Full detail on these flags, the problems they solve, and their -`docker run` counterparts is in the Docker for Mac topic [Performance tuning for +`docker run` counterparts is in the Docker Desktop for Mac topic [Performance tuning for volume mounts (shared filesystems)](/docker-for-mac/osxfs-caching.md). ### restart From b932ce75e92d4fc888dc1cd510139636d64041ce Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 16:12:33 -0500 Subject: [PATCH 83/84] Update edge-release-notes.md --- docker-for-windows/edge-release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md index fd234c5f34..af505fbc56 100644 --- a/docker-for-windows/edge-release-notes.md +++ b/docker-for-windows/edge-release-notes.md @@ -1,7 +1,7 @@ --- description: Change log / release notes per edge release -keywords: Docker for Windows, edge, release notes -title: Docker for Windows Edge Release notes +keywords: Docker Desktop for Windows, edge, release notes +title: Docker Desktop for Windows Edge Release notes --- Here are the main improvements and issues per edge release, starting with the From 7b95f9ad5e427d27d139085cd1b86b651c322358 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Fri, 11 Jan 2019 16:15:17 -0500 Subject: [PATCH 84/84] Update secrets.md --- engine/swarm/secrets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/swarm/secrets.md b/engine/swarm/secrets.md index 3f91419388..e52c644220 100644 --- a/engine/swarm/secrets.md +++ b/engine/swarm/secrets.md @@ -274,7 +274,7 @@ real-world example, continue to This is a very simple example which shows how to use secrets with a Microsoft IIS service running on Docker 17.06 EE on Microsoft Windows Server 2016 or Docker -for Mac 17.06 on Microsoft Windows 10. It is a naive example that stores the +Desktop for Mac 17.06 on Microsoft Windows 10. It is a naive example that stores the webpage in a secret. This example assumes that you have PowerShell installed.