diff --git a/_config.yml b/_config.yml index 0cd2a2d794..b84fc4af19 100644 --- a/_config.yml +++ b/_config.yml @@ -31,18 +31,15 @@ distribution_version: "2.7" # URLs for license and conditions # TODO move these inline once these are stable / final # TODO add final link to DSST -dsst_url: "https://www.docker.com/sites/default/files/d8/2021-01/Docker%2520Data%2520Processing%2520Agreement%25202021.pdf" # Docker Subscription Service Terms +dsst_url: "https://www.docker.com/legal/docker-subscription-service-agreement" # Docker Subscription Service Agreement -# Link to Docker Subscription Service Terms announcement blog-post -# TODO add final link to Docker Subscription Service Terms announcement blog-post -dsst_announcement_url: "XXXXXXX ADD BLOG LINK" +# Link to Docker Subscription Service Agreement announcement blog-post +dsst_announcement_url: "https://www.docker.com/blog/updating-product-subscriptions/" -# Link to Docker Subscription Service Terms FAQst -# TODO add link to Docker Subscription Service Terms FAQs -dsst_faqs_url: "XXXXXXX ADD FAQs LINK" +# Link to Docker Subscription Service Agreement FAQs +dsst_faqs_url: "https://www.docker.com/pricing/faq" # Link to Docker Terms of Service -# TODO add link to Docker Terms of Service tos_url: "https://www.docker.com/legal/docker-terms-service" # List of plugins to enable for local development builds. Mostly the same as diff --git a/_includes/desktop-license-update.md b/_includes/desktop-license-update.md new file mode 100644 index 0000000000..700ede27d0 --- /dev/null +++ b/_includes/desktop-license-update.md @@ -0,0 +1,16 @@ + + + > **Docker Subscription Service Agreement** + > + > We’ve updated the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}. Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} to learn how companies using Docker Desktop may be affected. + + **Here’s a summary of the key changes:** + + - Our Docker Subscription Service Agreement include a change to the terms of use for Docker Desktop + - It **remains free** for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open source projects. + - It requires a paid subscription for professional use in larger enterprises. + - The effective date of these terms is August 31, 2021. There is a **grace period** until 31 January 2022 for those that will require a paid subscription to use Docker Desktop. + - The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription . + - The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop. + + diff --git a/_includes/desktop-update.md b/_includes/desktop-update.md index e4d4327b1e..e3b959055a 100644 --- a/_includes/desktop-update.md +++ b/_includes/desktop-update.md @@ -4,19 +4,17 @@ When an update is available, Docker Desktop displays an icon to indicate the ava To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option. -> **Docker Subscription Service Terms** +> **Docker Subscription Service Agreement** > -> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} to learn more about the changes. - -![Snooze update](/desktop/mac/images/snooze-update.png){:width="500px"} +> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} to learn more about the changes. Click **Download update** When you are ready to download the update. This downloads the update in the background. After downloading the update, click **Update and restart** from the Docker menu. This installs the latest update and restarts Docker Desktop for the changes to take effect. -When Docker Desktop starts, it displays the Subscription Service Terms window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. +When Docker Desktop starts, it displays the Docker Subscription Service Agreement window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. > **Important** > -> If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine.You can choose to accept the terms at a later date by opening Docker Desktop. +> If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop. {: .important} -Docker Desktop starts after you accept the terms of service. +Docker Desktop starts after you accept the terms. diff --git a/_includes/eula-modal.html b/_includes/eula-modal.html index ddb9690974..8f01d36154 100644 --- a/_includes/eula-modal.html +++ b/_includes/eula-modal.html @@ -9,14 +9,14 @@

- We've updated the Docker Subscription Service Terms. - Please read the announcement - and FAQs + We've updated the Docker Subscription Service Agreement. + Please read the announcement + and FAQs to learn how companies using Docker Desktop may be affected.

- By clicking “Accept and Download”, you agree to these updated - terms of service, + By clicking "Accept and Download", you agree to these updated + terms, the Docker Data Processing Agreement, and the Data Privacy Policy.

diff --git a/_includes/eula.md b/_includes/eula.md index 46920de2db..26b867f1fd 100644 --- a/_includes/eula.md +++ b/_includes/eula.md @@ -1,8 +1,8 @@ -We've updated the [Docker Subscription Service Terms]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}. +We've updated the [Docker Subscription Service Agreement]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}. Please [read the announcement]({{ site.dsst_announcement_url }}){: target="_blank" rel="noopener" class="_"} and [FAQs]({{ site.dsst_faqs_url }}){: target="_blank" rel="noopener" class="_"} to learn how companies using Docker Desktop may be affected. -By downloading Docker Desktop, you agree to these updated [terms of service]({{ site.tos_url }}){: target="_blank" rel="noopener" class="_"}, +By downloading Docker Desktop, you agree to these updated [terms]({{ site.tos_url }}){: target="_blank" rel="noopener" class="_"}, the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"}, and the [Data Privacy Policy](https://www.docker.com/legal/docker-privacy-policy){: target="_blank" rel="noopener" class="_"}. diff --git a/ci-cd/best-practices.md b/ci-cd/best-practices.md index d9f3878352..dcab0879ad 100644 --- a/ci-cd/best-practices.md +++ b/ci-cd/best-practices.md @@ -40,6 +40,6 @@ We know there are a lot more tips and tricks for using Docker in CI, however, we > **Note** > - > If you are still experiencing issues with pull limits after you are authenticated, you can consider upgrading to either a [Pro or a Team account](https://www.docker.com/pricing){:target="_blank" rel="noopener" class="_"} . + > If you are still experiencing issues with pull limits after you are authenticated, you can consider upgrading to a [Docker subscription](https://www.docker.com/pricing){:target="_blank" rel="noopener" class="_"}. For information on how to configure GitHub Actions CI/CD pipeline, see [Configure GitHub Actions](github-actions.md). diff --git a/desktop/dashboard.md b/desktop/dashboard.md index 5ebf073c57..7c2b614bc3 100644 --- a/desktop/dashboard.md +++ b/desktop/dashboard.md @@ -223,13 +223,13 @@ To interact with remote repositories: The **View in Hub** option opens the Docker Hub page and displays detailed information about the image, such as the OS architecture, size of the image, the date when the image was pushed, and a list of the image layers. - If you have subscribed to a Pro or a Team plan and have enabled [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md) the Docker Hub page also displays a summary of the vulnerability scan report and provides detailed information about the vulnerabilities identified. + If you have a paid Docker subscription and have enabled [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md) the Docker Hub page also displays a summary of the vulnerability scan report and provides detailed information about the vulnerabilities identified. ## Explore volumes You can use [volumes](../storage/volumes.md) to store files and share them among containers. Volumes are created and are directly managed by Docker. They are also the preferred mechanism to persist data in Docker containers and services. -The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. If you are a developer subscribed to a Pro or a Team plan, you can also see which container is using a specific volume and explore the files and folders in your volumes. +The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. If you are user with a paid Docker subscription, you can also see which container is using a specific volume and explore the files and folders in your volumes. {% include upgrade-cta.html body="To start exploring the details in your volumes, upgrade to a Docker Pro, Team, or a Business subscription." @@ -241,14 +241,14 @@ The following table lists the Volumes UI features available in each plan: {% assign yes = '![yes](/images/green-check.svg){: .inline style="height: 14px; margin: 0 auto"}' %} -| Feature | Free | Pro | Team | -|:----------------------------------------------|:---------:|:---------:|:--------:| -| View, create, and delete volumes | {{ yes }} | {{ yes }} | {{ yes }} | -| See which volumes are in use | {{ yes }} | {{ yes }} | {{ yes }} | -| See the size of the volume | {{ yes }} | {{ yes }} | {{ yes }} | -| See volume data details (modified date, size) | X | {{ yes }} | {{ yes }} | -| See which container is using a volume | X | {{ yes }} | {{ yes }} | -| Save or delete files from a volume | X | {{ yes }} | {{ yes }} | +| Feature | Personal | Pro | Team | Business | +|:----------------------------------------------|:---------:|:---------:|:--------:|:--------:| +| View, create, and delete volumes | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} | +| See which volumes are in use | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} | +| See the size of the volume | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} | +| See volume data details (modified date, size) | X | {{ yes }} | {{ yes }} | {{ yes }} | +| See which container is using a volume | X | {{ yes }} | {{ yes }} | {{ yes }} | +| Save or delete files from a volume | X | {{ yes }} | {{ yes }} | {{ yes }} | ### Manage volumes diff --git a/desktop/faqs.md b/desktop/faqs.md index e491fcc375..8f20b16fac 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -17,10 +17,10 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo ### Do I need to pay to use Docker Desktop? -Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects. It requires a paid subscription for professional use in larger enterprises. +Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open source projects. It requires a paid subscription for professional use in larger enterprises. The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop. -When downloading and installing Docker Desktop, you will be asked to agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}. +When downloading and installing Docker Desktop, you will be asked to agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"}. [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}. @@ -134,9 +134,9 @@ Starting with Docker Desktop 3.0.0, Stable and Edge releases are combined into a ### Does Docker Desktop offer support? -Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support). +Yes, Docker Desktop offers support for users with a paid Docker subscription. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support). -For information about the pricing plans and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +For information about Docker subscriptions and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. ### What kind of feedback are you looking for? diff --git a/desktop/mac/apple-silicon.md b/desktop/mac/apple-silicon.md index 98345f88d8..974ea6c0a8 100644 --- a/desktop/mac/apple-silicon.md +++ b/desktop/mac/apple-silicon.md @@ -19,7 +19,7 @@ Download Docker Desktop for Mac on Apple silicon: > > {%- include eula.md -%} > -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula } +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula }
diff --git a/desktop/mac/edge-release-notes.md b/desktop/mac/edge-release-notes.md index 37c35760b0..faf7887cf4 100644 --- a/desktop/mac/edge-release-notes.md +++ b/desktop/mac/edge-release-notes.md @@ -40,7 +40,7 @@ For information about Stable releases, see the [Stable release notes](release-no > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/50261/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/50261/Docker.dmg){: .accept-eula } ### Upgrades @@ -58,7 +58,7 @@ For information about Stable releases, see the [Stable release notes](release-no > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/50165/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/50165/Docker.dmg){: .accept-eula } ### New @@ -78,7 +78,7 @@ For information about Stable releases, see the [Stable release notes](release-no > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/49923/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/49923/Docker.dmg){: .accept-eula } This release contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing Docker Desktop. @@ -105,7 +105,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/48975/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48975/Docker.dmg){: .accept-eula } ### New @@ -139,7 +139,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/48583/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48583/Docker.dmg){: .accept-eula } ### Upgrades @@ -161,7 +161,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/48173/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48173/Docker.dmg){: .accept-eula } ### New @@ -195,7 +195,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/47792/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47792/Docker.dmg){: .accept-eula } ### Upgrades @@ -212,7 +212,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/47622/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47622/Docker.dmg){: .accept-eula } ### New @@ -243,7 +243,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/47376/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47376/Docker.dmg){: .accept-eula } ### New @@ -277,7 +277,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46980/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46980/Docker.dmg){: .accept-eula } ### New @@ -321,7 +321,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46574/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46574/Docker.dmg){: .accept-eula } ### Upgrades @@ -343,7 +343,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46268/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46268/Docker.dmg){: .accept-eula } ### Upgrades @@ -370,7 +370,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/45408/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/45408/Docker.dmg){: .accept-eula } ### New @@ -395,7 +395,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/44875/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/44875/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -408,7 +408,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/44472/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/44472/Docker.dmg){: .accept-eula } ### Upgrades @@ -435,7 +435,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/43965/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/43965/Docker.dmg){: .accept-eula } ### Upgrades @@ -471,7 +471,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/43066/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/43066/Docker.dmg){: .accept-eula } This release contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing Docker Desktop. @@ -492,7 +492,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/42746/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/42746/Docker.dmg){: .accept-eula } ### Upgrades @@ -506,7 +506,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/41561/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/41561/Docker.dmg){: .accept-eula } > **Note:** Docker Desktop Edge 2.1.7.0 is the release candidate for the upcoming major Stable release. Please help us test this version before the wider release and report any issues in the [docker/for-mac](https://github.com/docker/for-mac/issues) GitHub repository. @@ -532,7 +532,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/40807/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/edge/40807/Docker.dmg){: .accept-eula } ### Upgrades @@ -770,7 +770,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Full BuildKit capabilities with container driver - Multiple builder instance support - Multi-node builds for cross-platform images (out-of-the-box support for linux/arm/v7 and linux/arm64) - - Parallel building of Compose files + - Concurrent building of Compose files - High-level build constructs with `bake` * Bug fixes and minor changes diff --git a/desktop/mac/images/subscription-terms.png b/desktop/mac/images/subscription-terms.png index 05d4412fc1..09ebe0fece 100644 Binary files a/desktop/mac/images/subscription-terms.png and b/desktop/mac/images/subscription-terms.png differ diff --git a/desktop/mac/install.md b/desktop/mac/install.md index 0cf51c3e5d..043b340920 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -10,10 +10,8 @@ Welcome to Docker Desktop for Mac. This page contains information about Docker D > Download Docker Desktop for Mac > -> {%- include eula.md -%} -> -> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn .accept-eula } -> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn } +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn } ## System requirements @@ -73,33 +71,18 @@ The Docker Desktop installation includes ![Docker app in Hockeyapp](images/docker-app-in-apps.png) -3. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Subscription Service Terms window. It includes a change to the terms of use for Docker Desktop. +3. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. It includes a change to the terms of use for Docker Desktop. - > **Docker Subscription Service Terms** - > - > Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the information presented on the screen to understand how the changes impact you. + {% include desktop-license-update.md %} - ![Subscription service terms](images/subscription-terms.png){:width="700px"} +Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms. - **Here’s a summary of the key changes:** + > **Important** + > + > If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop. + {: .important} - - Docker Subscription Service Terms include a change to the terms of use for Docker Desktop - - It remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects. - - It requires a paid subscription for professional use in larger enterprises. - - The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop. - - The existing Docker Free subscription has been renamed Docker Personal and we have introduced a Docker Business subscription . - The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop. - - The [blog post](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} also give you detailed information about the changes. - -4. Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. Docker Desktop starts after you accept the terms of service. - - > **Important** - > - > If you do not agree to the terms of service, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop. - {: .important} - - For more information, see [Docker Desktop license terms](/subscription/#docker-desktop-license-terms). + For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). ### Quick start guide diff --git a/desktop/mac/previous-versions.md b/desktop/mac/previous-versions.md index e97c8fa7f4..41f2d82a5b 100644 --- a/desktop/mac/previous-versions.md +++ b/desktop/mac/previous-versions.md @@ -13,9 +13,11 @@ This page contains release notes for older versions of Docker Desktop for Mac. ## Docker Desktop Community 2.5.0.1 2020-11-10 +> Download Docker Desktop +> > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/49550/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/49550/Docker.dmg){: .accept-eula } ### Upgrades @@ -32,14 +34,14 @@ This page contains release notes for older versions of Docker Desktop for Mac. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/49427/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/49427/Docker.dmg){: .accept-eula } Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. ### New -- Users subscribed to a Pro or a Team plan can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop. -- Docker Desktop introduces a support option for users who have subscribed to a Pro or a Team Plan. +- Users with a paid Docker subscription plan can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop. +- Docker Desktop introduces a support option for users with a paid Docker subscription. ### Security @@ -76,7 +78,7 @@ Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/48506/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/48506/Docker.dmg){: .accept-eula } Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. @@ -127,7 +129,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/48029/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/48029/Docker.dmg){: .accept-eula } ### New @@ -155,7 +157,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/46911/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/46911/Docker.dmg){: .accept-eula } ### Upgrades @@ -177,7 +179,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/45519/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/45519/Docker.dmg){: .accept-eula } ### Upgrades @@ -195,7 +197,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/45183/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/45183/Docker.dmg){: .accept-eula } ### New @@ -231,7 +233,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/43884/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/43884/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -244,7 +246,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/43472/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/43472/Docker.dmg){: .accept-eula } ### Upgrades @@ -262,7 +264,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/42716/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/42716/Docker.dmg){: .accept-eula } ### Upgrades @@ -276,7 +278,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/42247/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/42247/Docker.dmg){: .accept-eula } Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. @@ -329,7 +331,7 @@ For detailed information about the new Dashboard UI, see [Docker Desktop Dashboa > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/40693/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/40693/Docker.dmg){: .accept-eula } Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. @@ -346,7 +348,7 @@ Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kuber > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/39773/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/39773/Docker.dmg){: .accept-eula } ### Upgrades @@ -367,7 +369,7 @@ For more information, see [Two-factor authentication](index.md#docker-hub). > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/38240/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/38240/Docker.dmg){: .accept-eula } ### Upgrades @@ -384,7 +386,7 @@ For more information, see [Two-factor authentication](index.md#docker-hub). > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/37877/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/37877/Docker.dmg){: .accept-eula } Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. @@ -402,7 +404,7 @@ Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Note that your local Kuber > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/37199/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/37199/Docker.dmg){: .accept-eula } Note that you must sign in and create a Docker ID in order to download Docker Desktop. @@ -467,7 +469,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/31259/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/31259/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2), fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736) @@ -478,7 +480,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/30215/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/30215/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.1](https://github.com/docker/docker-ce/releases/tag/v18.09.1) @@ -498,7 +500,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/29211/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/29211/Docker.dmg){: .accept-eula } * Upgrades - [Docker compose 1.23.2](https://github.com/docker/compose/releases/tag/1.23.2) @@ -509,7 +511,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/28905/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/28905/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.0](https://github.com/docker/docker-ce-packaging/releases/tag/v18.09.0) @@ -538,7 +540,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/26764/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/26764/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.06.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce) @@ -552,7 +554,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/26399/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/26399/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce) @@ -587,7 +589,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/24312/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/24312/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce) @@ -603,7 +605,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/24245/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/24245/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce) @@ -619,7 +621,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/23751/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/23751/Docker.dmg){: .accept-eula } * Bug fixes and minor changes - Fix Upgrade straight from 17.09 versions where Docker for Mac cannot restart once the upgrade has been performed. Fixes [docker/for-mac#2739](https://github.com/docker/for-mac/issues/2739) @@ -630,7 +632,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/23608/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/23608/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce) @@ -662,7 +664,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/23011/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/23011/Docker.dmg){: .accept-eula } * Bug fixes and minor changes - Revert the default disk format to qcow2 for users running macOS 10.13 (High Sierra). There are confirmed reports of file corruption using the raw format which uses sparse files on APFS. Note this change only takes effect after a reset to factory defaults (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625) @@ -674,7 +676,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21805/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/21805/Docker.dmg){: .accept-eula } * Bug fixes and minor changes - Fix error during resize/create Docker.raw disk image in some cases. Fixes [docker/for-mac#2383](https://github.com/docker/for-mac/issues/2383), [docker/for-mac#2447](https://github.com/docker/for-mac/issues/2447), [docker/for-mac#2453], (https://github.com/docker/for-mac/issues/2453), [docker/for-mac#2420](https://github.com/docker/for-mac/issues/2420) @@ -691,7 +693,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula } * Bug fixes and minor changes - Fix for `docker push` to an insecure registry. Fixes [docker/for-mac#2392](https://github.com/docker/for-mac/issues/2392) @@ -703,7 +705,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) @@ -734,7 +736,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21090/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/21090/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.09.1-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce) @@ -750,7 +752,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features. > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/19611/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://download.docker.com/mac/stable/19611/Docker.dmg){: .accept-eula } * Bug fix - Fix Docker For Mac unable to start in some cases : removed use of libgmp sometimes causing the vpnkit process to die. diff --git a/desktop/mac/release-notes.md b/desktop/mac/release-notes.md index b3a8c26d51..a50e944c7a 100644 --- a/desktop/mac/release-notes.md +++ b/desktop/mac/release-notes.md @@ -17,10 +17,8 @@ This page contains information about the new features, improvements, known issue > Download Docker Desktop > -> {%- include eula.md -%} -> -> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn .accept-eula } -> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn } +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn } ### New @@ -57,8 +55,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg){: .accept-eula } ### New @@ -92,8 +90,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66090/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66090/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66090/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66090/Docker.dmg){: .accept-eula } ### New @@ -112,8 +110,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66024/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66024/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66024/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66024/Docker.dmg){: .accept-eula } ### New @@ -151,8 +149,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/65384/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/65384/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/65384/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/65384/Docker.dmg){: .accept-eula } ### New @@ -204,8 +202,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/64133/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/64133/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/64133/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/64133/Docker.dmg){: .accept-eula } ### Upgrades @@ -223,8 +221,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63878/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63878/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63878/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63878/Docker.dmg){: .accept-eula } ### Upgrades @@ -252,8 +250,8 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63152/Docker.dmg){: .accept-eula } | -> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63152/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63152/Docker.dmg){: .accept-eula } | +> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63152/Docker.dmg){: .accept-eula } ### New @@ -280,13 +278,13 @@ Docker Desktop is now available for Apple silicon as well as Intel chips. This e > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/62916/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/62916/Docker.dmg){: .accept-eula } ### New You can now specify when to download and install a Docker Desktop update. When an update becomes available, Docker Desktop displays an icon to indicate the availability of a newer version. You can download the update in the background whenever convenient. When the download is complete, all you need to do is to click Update and restart to install the latest update. -Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, Pro or Team subscription developers can skip notifications for a particular update when a reminder appears. +Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, users with a paid Docker subscription can skip notifications for a particular update when a reminder appears. For developers in IT managed environments, who don’t have administrative access to install updates to Docker Desktop, there is now an option in the Settings menu to opt out of notifications altogether for Docker Desktop updates if your Docker ID is part of a Team subscription. @@ -322,7 +320,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61853/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61853/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -338,7 +336,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61626/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61626/Docker.dmg){: .accept-eula } ### Upgrades @@ -355,7 +353,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61504/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61504/Docker.dmg){: .accept-eula } ### New @@ -403,7 +401,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/51484/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/51484/Docker.dmg){: .accept-eula } ### New @@ -426,7 +424,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/51218/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/51218/Docker.dmg){: .accept-eula } ### Upgrades @@ -448,7 +446,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/51017/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/51017/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -466,7 +464,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/50996/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/50996/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -486,7 +484,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/50773/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/50773/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -505,7 +503,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y > > {%- include eula.md -%} > -> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/50684/Docker.dmg){: .accept-eula } +> [Mac with Intel chip](https://desktop.docker.com/mac/stable/50684/Docker.dmg){: .accept-eula } ### New diff --git a/desktop/mac/troubleshoot.md b/desktop/mac/troubleshoot.md index 3e91670c47..ab46553004 100644 --- a/desktop/mac/troubleshoot.md +++ b/desktop/mac/troubleshoot.md @@ -13,7 +13,7 @@ toc_max: 2 target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support" %} -This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support (Pro and Team plan users only), send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems. +This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support, send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems. ## Troubleshoot @@ -26,7 +26,7 @@ The Troubleshoot page contains the following options: * **Restart Docker Desktop**: Select to restart Docker Desktop. -* **Support**: Developers on Pro and Team plans can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support). +* **Support**: Users with a paid Docker subscription can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support). * **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes). @@ -65,7 +65,7 @@ the log data. Before reporting an issue, we recommend that you read the informat > **Note** > -> Docker Desktop offers support for users subscribed to a Pro or a Team plan. If you are experiencing any issues with Docker Desktop, follow the instructions in this section to send a support request to Docker Support. +> Docker Desktop offers support for users with a paid Docker subscription. If you are experiencing any issues with Docker Desktop, follow the instructions in this section to send a support request to Docker Support. Before you get started, we recommend that you sign into your Docker Desktop application and your [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} account. @@ -75,11 +75,11 @@ Before you get started, we recommend that you sign into your Docker Desktop appl ![Diagnose & Feedback](images/diagnose-support.png){:width="600px"} 4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**. 5. When the diagnostics have been uploaded, Docker Desktop prints a diagnostic ID. Copy this ID. -6. If you have subscribed to a Pro or a Team plan, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support. +6. If you have a paid Docker subscription, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support. > **Note** > - > You must be signed in to Docker Desktop using your Pro or Team plan credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support). -7. If you are not subscribed to a Pro or a team plan, you can click **Upgrade to benefit from Docker Support** to upgrade your existing account. + > You must be signed in to Docker Desktop using your Pro, Team, or Business tier credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support). +7. If you don't have a paid Docker subscription, you can click **Upgrade to benefit from Docker Support** to upgrade your existing account. Alternatively, click **Report a Bug** to open a new Docker Desktop issue on GitHub. This opens Docker Desktop [for Mac](https://github.com/docker/for-mac/issues/) on GitHub in your web browser in a 'New issue' template. Complete the information required and ensure you add the diagnostic ID you copied earlier. Click **submit new issue** to create a new issue. ### Diagnosing from the terminal @@ -366,13 +366,13 @@ This section contains instructions on how to get support, and covers the scope o ### How do I get Docker Desktop support? -If you have subscribed to a Pro and Team account, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}. +If you have a paid Docker subscription, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}. Docker Community users can get support through our Github repos for-win and for-mac, where we respond on a best-effort basis. ### What support can I get? -If you are a Pro or a Team user, you can request for support on the following types of issues: +If you have a paid Docker subscription, you can request for support on the following types of issues: * Desktop upgrade issues * Desktop installation issues diff --git a/desktop/windows/edge-release-notes.md b/desktop/windows/edge-release-notes.md index b717ff69b0..27e89d8b36 100644 --- a/desktop/windows/edge-release-notes.md +++ b/desktop/windows/edge-release-notes.md @@ -957,7 +957,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Full BuildKit capabilities with container driver - Multiple builder instance support - Multi-node builds for cross-platform images (out-of-the-box support for linux/arm/v7 and linux/arm64) - - Parallel building of compose files + - Concurrent building of compose files - High-level build constructs with `bake` * Bug fixes and minor changes diff --git a/desktop/windows/install.md b/desktop/windows/install.md index fcf173acfb..2003d8de2e 100644 --- a/desktop/windows/install.md +++ b/desktop/windows/install.md @@ -16,9 +16,7 @@ Welcome to Docker Desktop for Windows. This page contains information about Dock > Download Docker Desktop for Windows > -> {%- include eula.md -%} -> -> [Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn .accept-eula } +> [Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn } ## System requirements @@ -123,34 +121,18 @@ Docker Desktop does not start automatically after installation. To start Docker ![search for Docker app](images/docker-app-search.png){:width="300px"} +The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Docker Subscription Service Agreement window. It includes a change to the terms of use for Docker Desktop. -The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Subscription Service Terms window. It includes a change to the terms of use for Docker Desktop. + {% include desktop-license-update.md %} - > **Docker Subscription Service Terms** - > - > Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the information presented on the screen to understand how the changes impact you. - - ![Subscription service terms](../mac/images/subscription-terms.png){:width="700px"} - - **Here’s a summary of the key changes:** - - - Docker Subscription Service Terms include a change to the terms of use for Docker Desktop - - It remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects. - - It requires a paid subscription for professional use in larger enterprises. - - The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop. - - The existing Docker Free subscription has been renamed Docker Personal and we have introduced a Docker Business subscription . - The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop. - - The [blog post](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}also give you detailed information about the changes. - - Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. Docker Desktop starts after you accept the terms of service. +Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms. > **Important** > - > If you do not agree to the terms of service, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop. + > If you do not agree to the updated terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop. {: .important} - For more information, see [Docker Desktop license terms](/subscription/#docker-desktop-license-terms). + For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement). ### Quick Start Guide diff --git a/desktop/windows/previous-versions.md b/desktop/windows/previous-versions.md index d64ad70c19..409b86afdf 100644 --- a/desktop/windows/previous-versions.md +++ b/desktop/windows/previous-versions.md @@ -17,7 +17,7 @@ This page contains release notes for older versions of Docker Desktop for Window > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/49550/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/49550/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -31,14 +31,14 @@ This page contains release notes for older versions of Docker Desktop for Window > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/49427/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/49427/Docker%20Desktop%20Installer.exe){: .accept-eula } Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. ### New -- Users subscribed to a Pro or a Team plan can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop. -- Docker Desktop introduces a support option for users who have subscribed to a Pro or a Team Plan. +- Users with a paid Docker subscription can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop. +- Docker Desktop introduces a support option for users who have a paid Docker subscription. ### Upgrades @@ -73,7 +73,7 @@ Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/48506/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/48506/Docker%20Desktop%20Installer.exe){: .accept-eula } Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. @@ -147,7 +147,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/48029/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/48029/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -175,7 +175,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/46911/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/46911/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -200,7 +200,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/45519/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/45519/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -227,7 +227,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/45183/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/45183/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -300,7 +300,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/43884/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/43884/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Bug fixes and minor changes @@ -317,7 +317,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/43472/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/43472/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -352,7 +352,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/42716/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/42716/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -458,7 +458,7 @@ For detailed information about the new Dashboard UI, see [Docker Desktop Dashboa > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/40693/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/40693/Docker%20Desktop%20Installer.exe){: .accept-eula } Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. @@ -475,7 +475,7 @@ Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kuber > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/39773/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/39773/Docker%20Desktop%20Installer.exe){: .accept-eula } Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. @@ -497,7 +497,7 @@ Docker Desktop now enables you to sign into Docker Hub using two-factor authenti > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/38240/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/38240/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -510,7 +510,7 @@ Docker Desktop now enables you to sign into Docker Hub using two-factor authenti > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/37877/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/37877/Docker%20Desktop%20Installer.exe){: .accept-eula } Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. @@ -528,7 +528,7 @@ Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Your local Kubernetes clus > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/37199/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/37199/Docker%20Desktop%20Installer.exe){: .accept-eula } Note that you must sign in and create a Docker ID in order to download Docker Desktop. @@ -599,7 +599,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/31259/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/31259/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2), fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736) @@ -613,7 +613,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/30215/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/30215/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.09.1](https://github.com/docker/docker-ce/releases/tag/v18.09.1) @@ -635,7 +635,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/29211/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/29211/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker compose 1.23.2](https://github.com/docker/compose/releases/tag/1.23.2) @@ -649,7 +649,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/28905/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/28905/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.09.0](https://github.com/docker/docker-ce-packaging/releases/tag/v18.09.0) @@ -682,7 +682,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/19507/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/19507/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.06.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce) @@ -704,10 +704,10 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/19098/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/19098/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * New - - Renewed signing certificate. The installer may show a Windows Defender popup until the renewed certificate is whitelisted. Click "More info" to view the app is published by "Docker Inc" and run it. + - Renewed signing certificate. The installer may show a Windows Defender popup until the renewed certificate is allowlisted. Click "More info" to view the app is published by "Docker Inc" and run it. * Bug fixes and minor changes - Fix bug in automatic feature enabling if "Hyper-V" and "Containers" Windows features are not enabled already when starting Docker Desktop. @@ -718,7 +718,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/19075/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/19075/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce) @@ -747,7 +747,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/17513/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/17513/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce) @@ -764,7 +764,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/17438/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/17438/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce) @@ -781,7 +781,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/16762/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/16762/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 18.03.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce) @@ -817,7 +817,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/15139/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/15139/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Bug fixes and minor changes - Fix linuxkit port-forwarder sometimes not being able to start. Fixes [docker/for-win#1506](https://github.com/docker/for-win/issues/1506) @@ -831,7 +831,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/15048/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/15048/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) @@ -859,7 +859,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/14687/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/14687/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 17.09.1-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce) @@ -880,7 +880,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/13620/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/13620/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Bug fixes - Fix Docker For Windows unable to start in some cases: removed use of libgmp sometimes causing the vpnkit process to die. @@ -891,7 +891,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/13529/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/13529/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 17.09.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.0-ce) @@ -934,7 +934,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/13194/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/13194/Docker%20for%20Windows%20Installer.exe){: .accept-eula } * Upgrades - [Docker 17.06.2-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.2-ce) @@ -946,7 +946,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/13025/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/13025/Docker%20for%20Windows%20Installer.exe){: .accept-eula } **Upgrades** @@ -965,7 +965,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/12627/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/12627/Docker%20for%20Windows%20Installer.exe){: .accept-eula } **Upgrades** @@ -1009,7 +1009,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/12058/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/12058/Docker%20for%20Windows%20Installer.exe){: .accept-eula } **Upgrades** @@ -1021,7 +1021,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features: > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/10743/Docker%20for%20Windows%20Installer.exe){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/10743/Docker%20for%20Windows%20Installer.exe){: .accept-eula } **New** @@ -1060,7 +1060,7 @@ progressively > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/1.13.1.10072/InstallDocker.msi){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/1.13.1.10072/InstallDocker.msi){: .accept-eula } **Upgrades** @@ -1081,7 +1081,7 @@ progressively > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/1.13.0.9795/InstallDocker.msi){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/1.13.0.9795/InstallDocker.msi){: .accept-eula } **Upgrades** @@ -1128,7 +1128,7 @@ progressively > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/1.12.5.9503/InstallDocker.msi){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/1.12.5.9503/InstallDocker.msi){: .accept-eula } **Upgrades** @@ -1145,7 +1145,7 @@ We did not distribute a 1.12.4 stable release > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/1.12.3.8488/InstallDocker.msi){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/1.12.3.8488/InstallDocker.msi){: .accept-eula } **New** @@ -1232,7 +1232,7 @@ We did not distribute a 1.12.4 stable release > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/1.12.1.7135/InstallDocker.msi){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/1.12.1.7135/InstallDocker.msi){: .accept-eula } >**Important Note**: > @@ -1331,7 +1331,7 @@ We did not distribute a 1.12.4 stable release > > {%- include eula.md -%} > -> [Download](https://download.docker.com/win/stable/1.12.0.5968/InstallDocker.msi){: .accept-eula } +> [For Windows](https://download.docker.com/win/stable/1.12.0.5968/InstallDocker.msi){: .accept-eula } * First stable release diff --git a/desktop/windows/release-notes.md b/desktop/windows/release-notes.md index 8d9c80859d..f72d5f7795 100644 --- a/desktop/windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -17,9 +17,7 @@ This page contains information about the new features, improvements, known issue > Download Docker Desktop > -> {%- include eula.md -%} -> -> [Download](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn } ### New @@ -63,7 +61,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/66501/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/66501/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -98,7 +96,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/66090/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/66090/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -118,7 +116,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/66024/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/66024/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -156,7 +154,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/65384/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/65384/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -199,7 +197,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/64133/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/64133/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -217,7 +215,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/63878/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/63878/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -241,7 +239,7 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/63152/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/63152/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Bug fixes and minor changes @@ -257,13 +255,13 @@ This page contains information about the new features, improvements, known issue > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/62916/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/62916/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New You can now specify when to download and install a Docker Desktop update. When an update becomes available, Docker Desktop displays an icon to indicate the availability of a newer version. You can download the update in the background whenever convenient. When the download is complete, all you need to do is to click Update and restart to install the latest update. -Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, Pro or Team subscription developers can skip notifications for a particular update when a reminder appears. +Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, users with a paid Docker subscription can skip notifications for a particular update when a reminder appears. For developers in IT managed environments, who don’t have administrative access to install updates to Docker Desktop, there is now an option in the Settings menu to opt out of notifications altogether for Docker Desktop updates if your Docker ID is part of a Team subscription. @@ -293,7 +291,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/61853/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/61853/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Bug fixes and minor changes @@ -308,7 +306,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/61626/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/61626/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -321,7 +319,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/amd64/61504/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/amd64/61504/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -370,7 +368,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/51484/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/51484/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New @@ -394,7 +392,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/51218/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/51218/Docker%20Desktop%20Installer.exe){: .accept-eula } ### Upgrades @@ -411,7 +409,7 @@ For developers in IT managed environments, who don’t have administrative acces > > {%- include eula.md -%} > -> [Download](https://desktop.docker.com/win/stable/50684/Docker%20Desktop%20Installer.exe){: .accept-eula } +> [For Windows](https://desktop.docker.com/win/stable/50684/Docker%20Desktop%20Installer.exe){: .accept-eula } ### New diff --git a/desktop/windows/troubleshoot.md b/desktop/windows/troubleshoot.md index f2d46da146..32ab9dec63 100644 --- a/desktop/windows/troubleshoot.md +++ b/desktop/windows/troubleshoot.md @@ -14,7 +14,7 @@ toc_max: 2 target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support" %} -This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support (Pro and Team plan users only), send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems. +This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support, send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems. ## Troubleshoot @@ -27,7 +27,7 @@ The Troubleshoot page contains the following options: * **Restart Docker Desktop**: Select to restart Docker Desktop. -* **Support**: Developers on Pro and Team plans can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support). +* **Support**: Users with a paid Docker subscription can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support). * **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes). @@ -53,12 +53,12 @@ from the menu. ![Diagnose & Support](images/diagnose-support.png){:width="600px"} 4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**. 5. When the diagnostics have been uploaded, Docker Desktop prints a Diagnostic ID. Copy this ID. -6. If you have subscribed to a Pro or a Team plan, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support. +6. If you have a paid Docker subscription, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support. > **Note** > > You must be signed in to Docker Desktop using your Pro or Team plan credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support). -7. If you are not subscribed to a Pro or a team plan, you can click **Upgrade to benefit from Docker Support** to upgrade your existing account. +7. If you don't have a paid Docker subscription, click **Upgrade to benefit from Docker Support** to upgrade your existing account. Alternatively, click **Report a Bug** to open a new Docker Desktop issue on GitHub. This opens Docker Desktop [for Windows](https://github.com/docker/for-win/issues/) on GitHub in your web browser in a 'New issue' template. Complete the information required and ensure you add the diagnostic ID you copied earlier. Click **submit new issue** to create a new issue. ### Diagnosing from the terminal @@ -449,13 +449,13 @@ This section contains instructions on how to get support, and covers the scope o ### How do I get Docker Desktop support? -If you have subscribed to a Pro and Team account, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}. +If you have a paid Docker subscription, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}. Docker Community users can get support through our Github repos for-win and for-mac, where we respond on a best-effort basis. ### What support can I get? -If you are a Pro or a Team user, you can request for support on the following types of issues: +If you have a paid Docker subscription, you can request for support on the following types of issues: * Desktop upgrade issues * Desktop installation issues diff --git a/develop/scan-images/index.md b/develop/scan-images/index.md index 7a74bcfb28..31cc09132d 100644 --- a/develop/scan-images/index.md +++ b/develop/scan-images/index.md @@ -5,8 +5,8 @@ keywords: docker scan, scan, images, snyk, vulnerability --- {% include upgrade-cta.html - body="Did you know that Docker subscribers receive 200 Snyk vulnerability scans as part of their subscription? Click [here](https://snyk.co/udvnv) to activate your free monthly scans. Upgrade your existing plan to start scanning your images for vulnerabilities." - header-text="This feature requires a Pro or a Team plan" + body="Did you know that Docker subscribers receive 200 Snyk vulnerability scans as part of their subscription? Click [here](https://snyk.co/udvnv) to activate your free monthly scans. Upgrade your existing subscription to start scanning your images for vulnerabilities." + header-text="This feature requires a paid Docker subscription" target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_scan" %} @@ -39,7 +39,7 @@ You can trigger scans, view, and inspect vulnerabilities through Docker Hub. For > **Note** > -> Docker Hub Vulnerability Scanning is available for developers subscribed to a Pro or a Team plan. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){:target="_blank" rel="noopener" class="_"}. +> Docker Hub Vulnerability Scanning is available for developers subscribed to a Docker Pro, Team, or a Business tier. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){:target="_blank" rel="noopener" class="_"}. ![Hub Vulnerability scanning](/images/hub-hvs.png){:width="700px"} diff --git a/docker-hub/access-tokens.md b/docker-hub/access-tokens.md index 9f0e1135b6..584fdae340 100644 --- a/docker-hub/access-tokens.md +++ b/docker-hub/access-tokens.md @@ -44,14 +44,14 @@ the token will be used, or set a purpose for the token. 5. You can view the following permissions from the drop-down: - | Features | Free | Pro | Team | - | --------------------- | ---- | ----- | ----- | - | Personal Access Tokens (read, write, delete scope only)* | x | x | x | - | Scoped Personal Access Tokens | | x | x | - | Unlimited Personal Access Tokens | | | x | + | Feature | Personal | Pro | Team | Business | + | --------------------- | ---- | ----- | ----- |----- | + | Personal Access Tokens (read, write, delete scope only)* | x | x | x | x | + | Scoped Personal Access Tokens | | x | x | x | + | Unlimited Personal Access Tokens | | | x | x | - >*You can create 1 access token as part of the Free plan, 5 tokens per the Pro plan, and Unlimited tokens for the Team plan. - For more information about a Pro or a Team plan, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}. + >*You can create 1 access token as part of the Docker Personal tier, 5 tokens as part of Docker Pro, and Unlimited tokens as part of Docker Team and Business tier. + For more information, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}. 6. Copy the token that appears on the screen and save it. You will not be able to retrieve the token once you close this prompt. diff --git a/docker-hub/builds/index.md b/docker-hub/builds/index.md index 35f230cf53..aae0daffee 100644 --- a/docker-hub/builds/index.md +++ b/docker-hub/builds/index.md @@ -42,14 +42,14 @@ pushing to the registry. You can use these tests to create a continuous integration workflow where a build that fails its tests does not push the built image. Automated tests do not push images to the registry on their own. [Learn more about automated image testing here.](automated-testing.md) -Depending on your [plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}, you may get parallel builds, which means that `N` +Depending on your [plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}, you may get concurrent builds, which means that `N` autobuilds can be run at the same time. `N` is configured by the plan that you subscribe to. Once `N+1` builds are running, any additional builds are queued to be run later. > **Note** > -> The total number of pending builds in the queue is limited to 30 and further requests will be discarded. The number of parallel builds for Pro is 5 and for Team is 15. +> The total number of pending builds in the queue is limited to 30 and further requests will be discarded. The number of concurrent builds for Pro is 5 and for Team is 15. ![An automated build dashboard](images/index-dashboard.png) diff --git a/docker-hub/builds/previous-versions.md b/docker-hub/builds/previous-versions.md new file mode 100644 index 0000000000..acbf828576 --- /dev/null +++ b/docker-hub/builds/previous-versions.md @@ -0,0 +1,1344 @@ +--- +description: Docker Desktop for Windows Release notes for older versions +keywords: Docker Desktop for Windows, release notes +title: Release notes for previous versions +toc_min: 1 +toc_max: 2 +redirect_from: +- /docker-for-windows/previous-versions/ +--- + +This page contains release notes for older versions of Docker Desktop for Windows. + +## Docker Desktop Community 2.5.0.1 +2020-11-10 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://desktop.docker.com/win/stable/49550/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Upgrades + +- [Compose CLI v1.0.2](https://github.com/docker/compose-cli/releases/tag/v1.0.2) +- [Snyk v1.424.4](https://github.com/snyk/snyk/releases/tag/v1.424.4) + +## Docker Desktop Community 2.5.0.0 +2020-11-02 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://desktop.docker.com/win/stable/49427/Docker%20Desktop%20Installer.exe){: .accept-eula } + +Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. + +### New + +- Users with a paid Docker subscription can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop. +- Docker Desktop introduces a support option for users wwith a paid Docker subscription. + +### Upgrades + +- [Linux kernel 5.4.39](https://hub.docker.com/layers/linuxkit/kernel/5.4.39-f39f83d0d475b274938c86eaa796022bfc7063d2/images/sha256-8614670219aca0bb276d4749e479591b60cd348abc770ac9ecd09ee4c1575405?context=explore) +- [Docker Compose CLI 1.0.1](https://github.com/docker/compose-cli/releases/tag/v1.0.1) +- [Snyk v1.421.1](https://github.com/snyk/snyk/releases/tag/v1.421.1) +- [Go 1.15.2](https://github.com/golang/go/releases/tag/go1.15.2) +- [Kubernetes 1.19.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.19.3) + +### Deprecation + +- Docker Desktop cannot be installed on Windows 1703 (build 15063) anymore. + +### Bug fixes and minor changes + +- Renamed 'Run Diagnostics' to 'Get support'. +- Fixed an issue that intermittently made the WSL 2 backend fail to start. +- Fixed an issue related to NFS mounting. See [docker/for-mac#4958](https://github.com/docker/for-mac/issues/4958). +- Fixed an issue where bash in WSL would not find the docker CLI when it is started before Docker Desktop. +- Fixed an issue with HTTP proxy exclude lists containing entries such as `localhost` or `127.0.0.1`. Fixes [docker/for-win#8750](https://github.com/docker/for-win/issues/8750). +- When the WSL integration process unexpectedly stops, the user is now notified and can decide to restart it or not, instead of always trying to restart it in a loop. fixes [docker/for-win#8968](https://github.com/docker/for-win/issues/8968). +- Fixed an issue related to container logs lagging under heavy load. Fixes [docker/for-win#8216](https://github.com/docker/for-win/issues/8216). +- Diagnostics: avoid hanging when Kubernetes is in a broken state. +- Fixed the path to the installer log file default location when the username contains a space. Fixes [docker/for-win#7941](https://github.com/docker/for-win/issues/7941). +- Fixed an issue where some network plugins may fail to load, provoking a crash of the Docker daemon [docker/for-win#9282](https://github.com/docker/for-win/issues/9282). +- When sharing a file into a container (e.g. `docker run -v ~/.gitconfig`) Docker Desktop does not watch the parent directory. Fixes [docker/for-mac#4981](https://github.com/docker/for-mac/issues/4981). + +## Docker Desktop Community 2.4.0.0 +2020-09-30 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://desktop.docker.com/win/stable/48506/Docker%20Desktop%20Installer.exe){: .accept-eula } + +Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. + +### New + +- [Docker Compose CLI - 0.1.18](https://github.com/docker/compose-cli), enabling use of volumes with Compose and the Cloud through ECS and ACI. +- Docker introduces the new Images view in the Docker Dashboard. The images view allows users to view the Hub images, pull them and manage their local images on disk including cleaning up unwanted and unused images. To access the new Images view, from the Docker menu, select **Dashboard** > **Images**. +- Docker Desktop now enables BuildKit by default after a reset to factory defaults. To revert to the old `docker build` experience, go to **Settings** > **Docker Engine** and then disable the BuildKit feature. +- [Amazon ECR Credential Helper](https://github.com/awslabs/amazon-ecr-credential-helper/releases/tag/v0.4.0) + +### Upgrades + +- [Docker 19.03.13](https://github.com/docker/docker-ce/releases/tag/v19.03.13) +- [Docker Compose 1.27.4](https://github.com/docker/compose/releases/tag/1.27.4) +- [Go 1.14.7](https://github.com/golang/go/releases/tag/go1.14.7) +- [Alpine 3.12](https://alpinelinux.org/posts/Alpine-3.12.0-released.html) +- [Kubernetes 1.18.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.18.8) +- [Qemu 4.2.0](https://git.qemu.org/?p=qemu.git;a=tag;h=1e4aa2dad329852aa6c3f59cefd65c2c2ef2062c) + +### Bug fixes and minor changes + +- Removed the legacy Kubernetes context `docker-for-desktop`. The context `docker-desktop` should be used instead. Fixes [docker/for-win#5089](https://github.com/docker/for-win/issues/5089) and [docker/for-mac#4089](https://github.com/docker/for-mac/issues/4089). +- Removed the option to start with Windows containers from the installer +- Pinning the application to the taskbar and clicking on it will launch the container view if Docker is already running. +- Left-clicking on the whale in the system tray now launches the dashboard container view. +- Docker Desktop now uses a different systray icon for dark and light mode. Fixes [docker/for-win#4113](https://github.com/docker/for-win/issues/4113). +- Added support for emulating Risc-V via Qemu 4.2.0. +- Added a low-level debug shell accessible via `putty -serial \\.\pipe\dockerDebugShell`. +- Copy container logs without ansi colors to clipboard. Fixes [docker/for-mac#4786](https://github.com/docker/for-mac/issues/4786). +- Fix application startup if `hosts` is specified inside the Docker `daemon.json`. See [docker/for-win#6895](https://github.com/docker/for-win/issues/6895#issuecomment-637429117) +- Fixed DNS resolution of short names. See [docker/for-win#4425](https://github.com/docker/for-win/issues/4425). +- Switched from `chronyd` to `sntpcd` to work around host time synchronisation problems. Fixes [docker/for-win#4526](https://github.com/docker/for-win/issues/4526). +- Avoid blocking startup if "Expose daemon on tcp://localhost:2375 without TLS" is set and `localhost:2375` is in use by another program. See [docker/for-win#6929](https://github.com/docker/for-win/issues/6929) [docker/for-win#6961](https://github.com/docker/for-win/issues/6961). +- Fixed an issue where adding a folder on a non-existing drive in the settings would create an empty entry. See [docker/for-win#6797](https://github.com/docker/for-win/issues/6797). +- Avoid failing with "Function not implemented" during file I/O on shared volumes. Fixes [docker/for-win#5955](https://github.com/docker/for-win/issues/5955) +- Ensure that `docker run -v /var/run/docker.sock` rewrites Windows paths properly, see [docker/for-win#6628](https://github.com/docker/for-win/issues/6628). +- Fixed a crash which occurred when Docker Desktop loads a corrupted Docker CLI configuration file. Fixes [docker/for-win#6657](https://github.com/docker/for-win/issues/6657). +- Ensure `localhost` and `127.0.0.1` can both be used in the proxy settings to redirect to a proxy on the host. Fixes [docker/for-win#5715](https://github.com/docker/for-win/issues/5715) and [docker/for-win#6260](https://github.com/docker/for-win/issues/6260). +- Fixed a crash when failing to login with no Internet connection. +- Fixed bug in handling shared volume paths with ".." characters. Fixes [docker/for-win#5375](https://github.com/docker/for-win/issues/5375). +- Report check for updates errors in toast notification. Fixes [docker/for-win#6364](https://github.com/docker/for-win/issues/6364). +- Fixed an upgrade bug where users on versions still using the PowerShell based VM management can experience a silent un-installation crash leading to Docker Desktop being uninstalled instead of upgraded. +- Fixed the path to the installer log file default location when the username contains a space. Fixes [docker/for-win#7941](https://github.com/docker/for-win/issues/7941). +- Docker Desktop always flushes filesystem caches synchronously on container start. See [docker/for-mac#4943](https://github.com/docker/for-mac/issues/4943). +- Compose-on-Kubernetes is no longer included in the Docker Desktop installer. You can download it separately from the compose-on-kubernetes [release page](https://github.com/docker/compose-on-kubernetes/releases). + +### WSL 2 changes + +- Docker contexts are now synced between Windows and WSL distros. +- Fixed an issue that intermittently causes the backend to fail to start. +- Fixed a proxy crash that happened when glibc was not compatible. See [docker/for-win#8183](https://github.com/docker/for-win/issues/8183). +- Fixed an issue when removing a container mounting `/mnt/wsl` would break WSL integration. See [docker/for-win#7836](https://github.com/docker/for-win/issues/7836). +- Added support for mounting files from a distro using the Windows CLI (e.g. `docker run -v \\wsl$\Ubuntu\home\simon\web:/web ...`) +- Fixed the error message when attempting to use a shared volume with a relative path. Fixes [docker/for-win#6894](https://github.com/docker/for-win/issues/6894). +- Fixed an issue when updating Windows to a WSL 2 capable version, where a configuration file is locked by the old Hyper-V VM. +- Fixed a discrepancy in the version of Docker Compose inside and outside of WSL 2. Fixes [docker/for-win#6461](https://github.com/docker/for-win/issues/6461). +- Detect when the `docker-desktop` wsl distro is stopped and display a clearer error message. +- Fix a race condition when exposing ports. +- Enable dialog no longer blocks other windows. + +### Known issues + +- There is a known issue when using `docker-compose` with named volumes and gRPC FUSE: second and subsequent calls to `docker-compose up` will fail due to the volume path having the prefix `/host_mnt`. +- There is a known issue when enabling Kubernetes where the settings UI sometimes fails to update the Kubernetes state. To work around this issue, close and re-open the Window. +- There is a rare known issue when switching users, where the images UI sometimes continues to show the repositories of the previous user. To work around this issue, close and re-open the Window. + +## Docker Desktop Community 2.3.0.5 +2020-09-15 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://desktop.docker.com/win/stable/48029/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### New + +- The new Cloud integration in Docker CLI makes it easy to run containers in the cloud using either Amazon ECS or Microsoft ACI. For more information, see [Deploying Docker containers on ECS](https://docs.docker.com/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](https://docs.docker.com/engine/context/aci-integration/). + +### Upgrades + +- [Docker Compose 1.27.2](https://github.com/docker/compose/releases/tag/1.27.2) +- [Cloud integration v0.1.15](https://github.com/docker/aci-integration-beta/releases/tag/v0.1.15) + +### Bug fixes and minor changes + +- WSL2: Fixed a crash when using an incompatible glibc. See [docker/for-win#8183](https://github.com/docker/for-win/issues/8183). + +### Known issues + +- The `clock_gettime64` system call returns `EPERM` rather than `ENOSYS` +in i386 images. To work around this issue, disable `seccomp` by using +the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for-win/issues/8326). + +## Docker Desktop Community 2.3.0.4 +2020-07-27 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://desktop.docker.com/win/stable/46911/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Upgrades + +- [Docker 19.03.12](https://github.com/docker/docker-ce/releases/tag/v19.03.12) +- [Docker Compose 1.26.2](https://github.com/docker/compose/releases/tag/1.26.2) +- [Go 1.13.14](https://github.com/golang/go/issues?q=milestone%3AGo1.13.14+label%3ACherryPickApproved) + +### Bug fixes and minor changes + +- Docker Desktop now prompts users to share directories for paths like `////c/Users/foo`, rather than only paths like `C:\Users\foo` and `C:/Users/foo`. +- The installer now returns a non-zero exit code on error, or when the user cancels the installation. +- Fixed the path to the installer log file default location when the username contains a space. Fixes [docker/for-win#6552](https://github.com/docker/for-win/issues/6552) +- Dashboard: Fixed opening a CLI for Windows containers. See [docker/for-win#7079](https://github.com/docker/for-win/issues/7079) +- Dashboard: Fixed containers logs which were sometimes truncated. Fixes [docker/for-win#5954](https://github.com/docker/for-win/issues/5954) +- WSL 2: Fixed an issue where changing the user's default shell blocked WSL integration. Fixes [docker/for-win#7653](https://github.com/docker/for-win/issues/7653) +- WSL 2: Fixed an issue to recover WSL distributions stuck in the "Installing" state. + +## Docker Desktop Community 2.3.0.3 +2020-05-27 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://desktop.docker.com/win/stable/45519/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Upgrades + +- [Linux kernel 4.19.76](https://hub.docker.com/layers/docker/for-desktop-kernel/4.19.76-83885d3b4cff391813f4262099b36a529bca2df8-amd64/images/sha256-0214b82436af70054e013ea51cb1fea72bd943d0d6245b6521f1ff09a505c40f?context=repo) + +### Bug fixes and minor changes + +- Fixed a crash when resetting to factory defaults with Hyper-V disabled. Fixes [docker/for-win#6738](https://github.com/docker/for-win/issues/6738). +- Fixed opening an application in VS Code from a WSL 2 running app. Fixes [docker/for-win#6472](https://github.com/docker/for-win/issues/6472). +- Fixed Swarm mounts in WSL 2. Fixes [docker/for-win#6507](https://github.com/docker/for-win/issues/6507). +- Fixed a bug when using the Microsoft `mssql` image. Fixes [docker/for-win#6646](https://github.com/docker/for-win/issues/6646) +- Implemented `fallocate` for shared file systems. See [docker/for-win#6658](https://github.com/docker/for-win/issues/6658#issuecomment-627736820) +- Fixed an installer crash when an old and/or partially uninstalled version of Docker Desktop was present on the system. Fixes [docker/for-win#6536](https://github.com/docker/for-win/issues/6536). +- Fixed a delay caused when opening the systray menu. Fixes [docker/for-win#1011](https://github.com/docker/for-win/issues/1011). +- Fixed a regression where containers couldn’t anymore refer to mounted folders using the host drive letters. Fixes [docker/for-win#6628](https://github.com/docker/for-win/issues/6628). +- Fixed a regression where sharing a folder using a double leading slash notation would fail. Fixes [docker/for-win#6668](https://github.com/docker/for-win/issues/6668). +- Re-added device-mapper to the embedded Linux kernel. Fixes [docker/for-mac#4549](https://github.com/docker/for-mac/issues/4549). +- Fixed an issue which caused the `:z` attribute in bind mounts to fail. Fixes [docker/for-win#6634](https://github.com/docker/for-win/issues/6634). + +## Docker Desktop Community 2.3.0.2 +2020-05-11 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/45183/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### New + +- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](install.md). +- Docker Desktop introduces a new onboarding tutorial upon first startup. The Quick Start tutorial guides users to get started with Docker in a few easy steps. It includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub. +- Docker Desktop now allows sharing individual folders, rather than whole drives, giving more control to users over what is being shared. + +### Upgrades + +- [Docker Compose 1.25.5](https://github.com/docker/compose/releases/tag/1.25.5) +- [Go 1.13.10](https://github.com/golang/go/issues?q=milestone%3AGo1.13.10+label%3ACherryPickApproved) +- [Linux kernel 4.19.76](https://hub.docker.com/layers/docker/for-desktop-kernel/4.19.76-ce15f646db9b062dc947cfc0c1deab019fa63f96-amd64/images/sha256-6c252199aee548e4bdc8457e0a068e7d8e81c2649d4c1e26e4150daa253a85d8?context=repo) +- LinuxKit [init](https://hub.docker.com/layers/linuxkit/init/1a80a9907b35b9a808e7868ffb7b0da29ee64a95/images/sha256-64cc8fa50d63940dbaa9979a13c362c89ecb4439bcb3ab22c40d300b9c0b597e?context=explore), [runc](https://hub.docker.com/layers/linuxkit/runc/69b4a35eaa22eba4990ee52cccc8f48f6c08ed03/images/sha256-57e3c7cbd96790990cf87d7b0f30f459ea0b6f9768b03b32a89b832b73546280?context=explore) and [containerd](https://hub.docker.com/layers/linuxkit/containerd/09553963ed9da626c25cf8acdf6d62ec37645412/images/sha256-866be7edb0598430709f88d0e1c6ed7bfd4a397b5ed220e1f793ee9067255ff1?context=explore) + +### Bug fixes and minor changes + +**WSL 2** + +- Docker Desktop only exposes host ports in Linux if the Windows port is available. +- Docker Desktop now allows users to refresh the list of distros. +- Docker Desktop defaults to WSL 2 on install on compatible OS versions. +- Docker Desktop detects missing Linux kernel and adds a pointer to the Microsoft documentation to download the kernel. +- Detect when the WSL 2 backend stops and allow the user to restart it. +- Added support for `chmod/chown` on WSL 2 bind mounts. Fixes [docker/for-win#6284](https://github.com/docker/for-win/issues/6284). +- Added a check that virtualization is enabled in the BIOS. + +**Filesharing** + +- Fixed a bug where renaming parent directories of shared folders led to spurious `File not found` errors. Fixes [docker/for-win#6200](https://github.com/docker/for-win/issues/6200). +- Fixed bug where a letter and two digit root folder name causes docker-compose to fail creating directories inside the volume. Fixes [docker/for-win#6248](https://github.com/docker/for-win/issues/6248). +- Fixed a bug which prevented containers from seeing file updates on shared volumes, when under load and a container restarts. Fixes [docker/for-win#5530](https://github.com/docker/for-win/issues/5530#issuecomment-608804192). +- Fixed a bug where host paths are incorrectly translated into VM paths. Fixes [docker/for-win#6209](https://github.com/docker/for-win/issues/6209). +- Fixed bug receiving file events on long paths (> 260 characters). Fixes [docker/for-win#6337](https://github.com/docker/for-win/issues/6337). +- Docker Desktop represents valid directory junctions as directories (rather than symlinks) and handles cache invalidation and event injection properly. Fixes [docker/for-win#5582](https://github.com/docker/for-win/issues/5582). + +**Other fixes** + +- Reduced the size of the Docker Desktop installer from 960 MB to 409 MB. +- Added an option to delete data from the Troubleshoot screen. +- Fixed a bug where containers disappeared from the UI when Kubernetes context is invalid. Fixed [docker/for-win#6037](https://github.com/docker/for-win/issues/6037). +- Fixed Windows event logs filtering when copying them to the Docker Desktop log files. Fixed [docker/for-win#6258](https://github.com/docker/for-win/issues/6258). +- Fixed a handle leak in `vpnkit-bridge`. Fixed [docker/for-win#5841](https://github.com/docker/for-win/issues/5841) +- Fixed bug when removing Docker Desktop virtual switch. +- Added a link to the Edge channel from the UI. +- Made the embedded terminal resizable. +- Fixed a bug which only respected the `expose on TCP` Docker engine API setting on application restart. Setting will now take effect when the Apply button is clicked. +- Fixed a bug where diagnostic upload would fail if the username contained spaces. +- Docker Desktop now reads the Hyper-V VM disk max size on startup and uses it as the value to display in the Settings. +- Fixed a bug where the Docker Desktop UI could be started without the engine. Fixes [docker/for-win#5376](https://github.com/docker/for-win/issues/5376). +- Docker Desktop now uses the least possible privilege for querying the Server service. Fixes [docker/for-win#5150](https://github.com/docker/for-win/issues/5150). +- Fixed an issue where a container port could not be exposed on a specific host IP. See [docker/for-win#5546](https://github.com/docker/for-mac/issues/5546). +- Removed port probing from dashboard, just unconditionally showing links to ports that should be available. Fixes [docker/for-win#5903](https://github.com/docker/for-win/issues/5903). +- Ceph support has been removed from Docker Desktop to save disk space. +- Fixed an issue that caused the Windows log file archive to grow indefinitely. Fixes [docker/for-win#5113](https://github.com/docker/for-win/issues/5113). +- Added a prerequisite check in the installer for the LanmanServer service. Fixes [docker/for-win#5150](https://github.com/docker/for-win/issues/5150) + +### Known issues + +- Some CLI commands fail if you are running Docker Desktop in the experimental Linux Containers on Windows (LCOW) mode. As alternatives, we recommend running either traditional Linux containers, or the [WSL 2 backend](wsl.md). + +**WSL 2** + +- Swarm service bind mounts are not always restored correctly. +- Bind mounts of files living outside of the root mount point (files within `/mnt/c`, `/tmp`, `/run...`) don't work correctly when multiple containers mount them. + +## Docker Desktop Community 2.2.0.5 +2020-04-02 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/43884/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Bug fixes and minor changes + +- Docker Desktop generates `fsnotify.WRITE` events in Linux containers when files are changed on the host. Fixes [docker/for-win#5530](https://github.com/docker/for-win/issues/5530#issuecomment-585572414). +- Fixed a race condition in `readlink` on shared volumes using "mfsymlinks". Fixes [docker/for-win#5793](https://github.com/docker/for-win/issues/5793). +- Made the VM time sync more reliable. See [docker/for-win#4526](https://github.com/docker/for-win/issues/4526). +- Fixed bug where files did not change in shared volumes when using `volumes_from` in `docker-compose.yml`. See [docker/for-win#5530](https://github.com/docker/for-win/issues/5530). +- Fixed a bug where opening a read-only file would fail with an `Operation not permitted` error. Fixes [docker/for-win#6016](https://github.com/docker/for-win/issues/6016) and [docker/for-win#6017](https://github.com/docker/for-win/issues/6017). + +## Docker Desktop Community 2.2.0.4 +2020-03-13 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/43472/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Upgrades + +- [Docker 19.03.8](https://github.com/docker/docker-ce/releases/tag/v19.03.8) + +### Bug fixes and minor changes + +- Security: Diagnostics were collected with Administrator privileges, which led to a possible privilege escalation on systems where the Docker Desktop user was not an administrator. +- Docker Desktop now displays hidden files in shared volumes. Fixes [docker/for-win#5808](https://github.com/docker/for-win/issues/5808). +- Docker Desktop now generates the inotify `MODIFY` events on shared file systems for Windows file sharing. Fixes [docker/for-win#5530](https://github.com/docker/for-win/issues/5530). +- Attempts to create files in a shared volume with an identical filename but a different case (uppercase/lowercase) on Windows filesystem will now fail with the error `EEXIST`. Fixes [docker/for-win#5894](https://github.com/docker/for-win/issues/5894). +- Fixed cache invalidation and event injection in shared volumes with host paths longer than 260 characters. +- Docker Desktop now allows users to rename open files in shared volumes. Fixes [docker/for-win#5565](https://github.com/docker/for-win/issues/5565). +- Fixed an issue which caused Docker Desktop Dashboard to attempt connecting to all exposed ports inside a container. Fixes [docker/for-win#5903](https://github.com/docker/for-win/issues/5903). +- Kubernetes: Persistent volumes created by claims are now stored in the virtual machine. Fixes [docker/for-win#5665](https://github.com/docker/for-win/issues/5665). +- Fixed an issue which caused Docker Desktop to hang when users tried to reset to factory defaults. +- Fixed a file sharing issue that caused Docker Desktop to lock random files. Fixes [docker/for-win#5624](https://github.com/docker/for-win/issues/5624) and [docker/for-win#5575](https://github.com/docker/for-win/issues/5575). + +### Known issues + +- Some CLI commands fail if you are running Docker Desktop in the experimental Linux Containers on Windows (LCOW) mode. As alternatives, we recommend running either traditional Linux containers, or the experimental [WSL backend](wsl.md). +- It is not possible to resize the disk image using the Docker Desktop **Settings** UI. If you would like to update the size of the disk image (for example, to 128 GB), run the following command in PowerShell: + + ```powershell + Resize-VHD -Path 'C:\ProgramData\DockerDesktop\vm-data\DockerDesktop.vhdx' -SizeBytes 128gb + ``` + +## Docker Desktop Community 2.2.0.3 +2020-02-11 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/42716/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Upgrades + +- [Docker Compose 1.25.4](https://github.com/docker/compose/releases/tag/1.25.4) +- [Go 1.12.16](https://golang.org/doc/devel/release.html#go1.12) + +### Bug fixes and minor changes + +- Fixed an issue that prevented users from creating files with special characters in the filenames within a shared volume. Fixes [docker/for-win#5520](https://github.com/docker/for-win/issues/5520). +- Fixed handling of shared volumes with relative paths in `docker-compose.yml`. Fixes [docker/for-win#5516](https://github.com/docker/for-win/issues/5516). +- Fixed handling of shared volumes where the path case (uppercase / lowercase) did not exactly match the host. Fixes [docker/for-win#5516](https://github.com/docker/for-win/issues/5516). +- Fixed an issue where changing a file in the Windows file system did not update the file within the container. Fixes [docker/for-win#5530](https://github.com/docker/for-win/issues/5530) and [docker/for-win#5550](https://github.com/docker/for-win/issues/5550). +- Fixed an issue that prevented users from sharing drives and sometimes incorrectly prompted users to enter file system credentials. Fixes [docker/for-win#5567](https://github.com/docker/for-win/issues/5567). +- Fixed an issue which prevented users from mounting nested volumes. Fixes [docker/for-win#5540](https://github.com/docker/for-win/issues/5540). +- Fixed a file synchronization issue on bind mounts. Fixes [docker/for-win#5533](https://github.com/docker/for-win/issues/5533). +- Fixed an issue where timestamps were reset to zero on files within shared volumes. Fixes [docker/for-win#5528](https://github.com/docker/for-win/issues/5528) and [docker/for-win#5543](https://github.com/docker/for-win/issues/5543). +- Fixed a bug which caused Docker Desktop to fail when sharing file paths longer than 260 characters. Fixes [docker/for-win#5572](https://github.com/docker/for-win/issues/5572). +- Fixed an issue where some users were unable to start a container if there is a symlink in a shared volume. Fixes [docker/for-win#5582](https://github.com/docker/for-win/issues/5582). +- Fixed a bug where users were unable to modify the **Manual proxy configuration** settings through the Docker Desktop UI. Fixes [docker/for-win#5606](https://github.com/docker/for-win/issues/5606) and [docker/for-win#5548](https://github.com/docker/for-win/issues/5548). +- Fixed an issue where the Docker Desktop UI failed to start if the `no_proxy` environment variable has an entry that starts with a dot (.). Fixes [docker/for-win/5551](https://github.com/docker/for-win/issues/5551). +- Fixed a bug that did not allow users to access the Docker Desktop UI on machines with a policy preventing access to the Windows registry. Fixes [docker/for-win#5536](https://github.com/docker/for-win/issues/5536). +- Fixed an issue where disabling the WSL2 integration and re-enabling it later resulted in broken symlinks. Fixes [docker/for-win#5613](https://github.com/docker/for-win/issues/5613). +- Fixed a race condition when starting the WSL engine which caused Docker Desktop to incorrectly report that the containers have exited. Fixes [docker/for-win#5607](https://github.com/docker/for-win/issues/5607). +- Fixed an issue where editing code inside a container resulted in an error. Fixes [docker/for-win#5528](https://github.com/docker/for-win/issues/5528). +- Fixed a bug where running the command `DockerCli.exe -SharedDrives` failed to display a list of drives that are shared. Fixes [docker/for-win#5625](https://github.com/docker/for-win/issues/5625). +- Starting with Docker Desktop 2.2.0.3, you must access all shared files using their original case. For example, if you have created a file called `test`, you must open it as `test`. Attempts to open the file as `Test` will fail with the error `No such file or directory`. For more information, see _Tips on shared drives, permissions, and volume mounts_ in [File sharing](index.md#file-sharing). + +### Known issues + +- DockerNAT has been removed from Docker Desktop 2.2.0.0 as using an IP address to communicate from the host to a container is not a supported feature. To communicate from a container to the host, you must use the special DNS name `host.docker.internal`. We also recommend using ports to communicate from the host to a container. For more information, see [Networking](networking.md/#use-cases-and-workarounds). + + However, if your current setup relies on IP addresses for communication, you can use a temporary workaround to reinstate DockerNAT. To do this, open +`C:\Program Files\Docker\Docker\resources\MobyLinux.ps1` and add `$SwitchName = "DockerNAT"` between line 175 and 176. Note that the temporary workaround to reinstate DockerNAT may be removed from future releases. +- Directory junctions in shared volumes pointing outside the shared volume do not work. +- It is currently not possible to rename open files within shared volumes. +- In some cases, Docker containers do not synchronize time with the host when the host machine is put to sleep. +- It is not possible to use `localhost` in the proxy settings. You can instead use `host.docker.internal` to work around this issue. + +## Docker Desktop Community 2.2.0.0 +2020-01-21 + +Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. + +### Upgrades + +- [Docker Compose 1.25.2](https://github.com/docker/compose/releases/tag/1.25.2) +- [Kubernetes 1.15.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.15.5) +- Linux kernel 4.19.76 +- [QEMU 4.0.1](https://github.com/docker/binfmt) + +### New + +- **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior. +For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../dashboard.md). + +- **WSL 2 backend:** The experimental Docker Desktop WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](wsl.md). + +- **New file sharing implementation:** Docker Desktop introduces a new file sharing implementation that replaces Samba, CIFS, and Hyper-V networking. The new implementation offers improved I/O performance. Additionally, when using the new file system: + + - Users don't have to expose the Samba port, and therefore do not experience issues related to IT firewall or drive-sharing policy. + - There is no need to provide user credentials to Docker Desktop. File access rights are automatically enforced when accessing mounted folders through containers. + + For more information, see the blog post [ New file sharing implementation in Docker Desktop Windows](https://www.docker.com/blog/new-filesharing-implementation-in-docker-desktop-windows/). + +- Added the **WSL Integration** option in **Settings** > **Resources** to select WSL 2 distributions. This option will be visible only after enabling WSL 2 on your machine. +- Introduced a new user interface for the Docker Desktop **Settings** menu. +- The Restart, Reset, and Uninstall options are now available on the **Troubleshoot** menu. +- Added the ability to start and stop existing Compose-based applications and view combined logs in the Docker Desktop **Dashboard** UI. + +### Bug fixes and minor changes + +- Enabled Windows features such as Hyper-V and Containers during installation, thereby reducing the need for another restart after installation. +- Added support for `Expect: 100-continue` headers in the Docker API proxy. Some HTTP clients such as `curl` send this header when the payload is large, for example, when creating containers. Fixes [moby/moby#39693](https://github.com/moby/moby/issues/39693). +- Added a loading overlay to the **Settings** and **Troubleshoot** windows to prevent editing conflicts. +- Deactivated the **Reset Kubernetes** button when Kubernetes is not activated. +- Improved the navigation in **Settings** and **Troubleshoot** UI. +- Docker Machine is no longer included in the Docker Desktop installer. You can download it separately from the [Docker Machine releases](https://github.com/docker/machine/releases) page. +- Docker Desktop now automatically restarts after an update. +- Fixed an issue where Docker Desktop auto-start was not being disabled properly on some machines. +- Fixed a container start error when a container has more than one port with an arbitrary or not-yet-configured external port number. For example, `docker run -p 80 -p 443 nginx`). Fixes [docker/for-win#4935](https://github.com/docker/for-win/issues/4935) and [docker/compose#6998](https://github.com/docker/compose/issues/6998). +- Fixed an issue which caused Docker Desktop to crash when resetting to factory defaults while running Windows containers. +- Fixed multiple issues related to Fast Startup. +- Docker Desktop now supports `inotify` events on shared filesystems. +- Docker Desktop startup is now more reliable and does not clash with host firewall software. +- Fixed a rare issue that caused to Docker Desktop to crash with the error `Unable to stop Hyper-V VM: Cannot validate argument on parameter 'SwitchName'. The argument is null or empty.` +- Fixed a bug that caused a rare crash when uninstalling Docker Desktop. +- Fixed an issue that caused Docker Desktop to fail on startup when there is an incomplete Kubernetes config file. +- Fixed various stability issues. + +### Known issues + +- When you start a Docker Compose application and then start a Docker App which has the same name as the Compose application, Docker Desktop displays only one application on the Dashboard. However, when you expand the application, containers that belong to both applications are displayed on the Dashboard. +- When you deploy a Docker App with multiple containers on Kubernetes, Docker Desktop displays each Pod as an application on the Dashboard. +- WSL 2 requires Windows 10 Insider Preview build 19018 or greater. +- The Dashboard stops updating when you switch the container mode between Linux and Windows. To work around this issue, close and reopen the Dashboard. +- The new gRPC FUSE file sharing implementation does not support connecting to new drives (for example, USB drives) added after Docker Desktop starts. If you would like to share the new drive in Docker Desktop, you must quit Docker Desktop and then start the application to refresh the list of drives in Settings. +- Sharing files from virtual drives created by `ImDisk Toolkit` does not work. + +## Docker Desktop Community 2.1.0.5 +2019-11-18 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/40693/Docker%20Desktop%20Installer.exe){: .accept-eula } + +Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. + +### Upgrades + +- [Docker 19.03.5](https://github.com/docker/docker-ce/releases/tag/v19.03.5) +- [Kubernetes 1.14.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.8) +- [Go 1.12.13](https://golang.org/doc/devel/release.html#go1.12) + +## Docker Desktop Community 2.1.0.4 +2019-10-21 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/39773/Docker%20Desktop%20Installer.exe){: .accept-eula } + +Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version. + +### Upgrades + +- [Docker 19.03.4](https://github.com/docker/docker-ce/releases/tag/v19.03.4) +- [Kubernetes 1.14.7](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.7) +- [Go 1.12.10](https://github.com/golang/go/issues?q=milestone%3AGo1.12.10+label%3ACherryPickApproved) +- [Kitematic 0.17.9](https://github.com/docker/kitematic/releases/tag/v0.17.9) + +### New + +Docker Desktop now enables you to sign into Docker Hub using two-factor authentication. For more information, see [Two-factor authentication](index/#docker-hub). + +## Docker Desktop Community 2.1.0.3 +2019-09-16 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/38240/Docker%20Desktop%20Installer.exe){: .accept-eula } + +### Upgrades + +- [Kitematic 0.17.8](https://github.com/docker/kitematic/releases/tag/v0.17.8) + +## Docker Desktop Community 2.1.0.2 +2019-09-04 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/37877/Docker%20Desktop%20Installer.exe){: .accept-eula } + +Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version. + +### Upgrades + +- [Docker 19.03.2](https://github.com/docker/docker-ce/releases/tag/v19.03.2) +- [Kubernetes 1.14.6](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.6) +- [Go 1.12.9](https://github.com/golang/go/issues?q=milestone%3AGo1.12.9+label%3ACherryPickApproved) +- [Docker Machine 0.16.2](https://github.com/docker/machine/releases/tag/v0.16.2) + +## Docker Desktop Community 2.1.0.1 +2019-08-08 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/37199/Docker%20Desktop%20Installer.exe){: .accept-eula } + + Note that you must sign in and create a Docker ID in order to download Docker Desktop. + +### Upgrades + +* [Docker 19.03.1](https://github.com/docker/docker-ce/releases/tag/v19.03.1) +* [Docker Compose 1.24.1](https://github.com/docker/compose/releases/tag/1.24.1) +* [Kubernetes 1.14.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.3) +* [Compose on Kubernetes 0.4.23](https://github.com/docker/compose-on-kubernetes/releases/tag/v0.4.23) +* [Docker Machine 0.16.1](https://github.com/docker/machine/releases/tag/v0.16.1) +* [linuxkit v0.7](https://github.com/linuxkit/linuxkit/releases/tag/v0.7) +* Linux Kernel 4.9.184 +* [Kitematic 0.17.6](https://github.com/docker/kitematic/releases/tag/v0.17.6) +* [Qemu 4.0.0](https://github.com/docker/binfmt) for cross compiling for ARM +* [Alpine 3.10](https://alpinelinux.org/posts/Alpine-3.10.0-released.html) +* [Docker Credential Helpers 0.6.3](https://github.com/docker/docker-credential-helpers/releases/tag/v0.6.3) + +### New + +* Selecting the ‘Experimental features’ checkbox in the Daemon, **Settings** menu turns on experimental features for Docker daemon and Docker CLI. +* Docker Desktop now checks for stored credentials at startup before attempting to mount any shared drives. This prompts users to reenter the credentials if they are invalid. + +### Experimental + +> Experimental features provide early access to future product functionality. These features are intended for testing and feedback only as they may change between releases without warning or can be removed entirely from a future release. Experimental features must not be used in production environments. Docker does not offer support for experimental features. + +Docker Desktop Community 2.1.0.0 contains the following experimental features: + +* Docker App: Docker App is a CLI plugin that helps configure, share, and install applications. For more information, see [Working with Docker App](/app/working-with-app/). +* Docker Buildx: Docker Buildx is a CLI plugin for extended build capabilities with BuildKit. For more information, see [Working with Docker Buildx](/buildx/working-with-buildx/). + +### Bug fixes and minor changes + +* Fixed PowerShell script signing issue that caused `AuthorizationManager check failed` errors on machines with strict group policies on PowerShell script signing. [docker/for-win#4376](https://github.com/docker/for-win/issues/4376) +* Fixed an issue where users were unable to start Docker Desktop after upgrading to version 2.1.0.0. [docker/for-win#4390](https://github.com/docker/for-win/issues/4390) +* Fixed an issue where attempts to upgrade Docker Desktop to version 2.1.0.0 sometimes failed with the error `value cannot be null`. [docker/for-win#4343](https://github.com/docker/for-win/issues/4343) +* Fixed an issue that caused the installer to hang when upgrading Docker Desktop to version 2.1.0.0. [docker/for-win#4387](https://github.com/docker/for-win/issues/4387) +* Improved the error messages displayed during VM lifecycle operations. [docker/for-win#4348](https://github.com/docker/for-win/issues/4348) +* Docker Desktop now supports a configurable user timeout for VMs on slower machines. [docker/for-win#4393](https://github.com/docker/for-win/issues/4393) +* Restricted the `cluster-admin` role on local Kubernetes cluster to `kube-system` namespace. +* Reduced the VM startup time. swap is not created every time a virtual machine boots. +* Fixed a bug which caused Windows to crash when a user cancels switching the version using Windows User Account Control (UAC) settings. +* Fixed an issue where Docker Desktop restarts when a user logs out of Windows and logs back in, which results in retaining the exported ports on containers. +* Fixed Kubernetes installation with VPNkit subnet. +* Fixed a bug where the process output was not redirected to stdout when gathering diagnostics on Windows, which sometimes resulted in a crash. +* Fixed race condition where Kubernetes sometimes fails to start after the app is restarted. +* The system tray icon now opens the Docker Desktop menu with left and right mouse button. +* When displaying the crash report window, Docker Desktop does not send a bugsnag crash report unless the user needs the report to upload diagnostics. +* Docker Desktop has removed the ability to log in using email address as a username as the Docker command line does not support this. +* For Linux containers on Windows (LCOW), the host must run Windows 10 Professional or Windows 10 Enterprise version 1809 or later. +* The **Send usage statistics** checkbox is selected by default in Docker Desktop for Windows Community. This option cannot be modified. +* Docker Desktop has added a new dialog box during startup which allows users to retry mounting a shared drive or remove it from the shared drives list after a failed attempt. +* Fixed the Kubernetes Delete operation of persistent volume claims on Windows. +* Docker Desktop now truncates UDP DNS responses which are over 512 bytes in size. +* Fixed a bug where Docker was not added to PATH after installation in some cases. +* Fixed port 8080 that was used on localhost when starting Kubernetes. +* Renamed the product from **Docker for Windows** to **Docker Desktop**. +* Fixed the **Create issue** link in the Diagnostics window. +* Fixed a bug related to service log collection in diagnostics. +* Docker Desktop now gathers `/etc/hosts` to help with diagnostics. +* Added the missing daemon options in Docker Engine 18.09. +* When two services have a common exposed port, Docker Desktop exposes the available ports for the second service. +* Fixed the UI lock when changing the Kubernetes state. + +### Docker Community Edition 2.0.0.3 2019-02-15 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/31259/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2), fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736) + +* Bug fix + - Fix crash in system tray menu when the Hub login fails or Air gap mode + +### Docker Community Edition 2.0.0.2 2019-01-16 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/30215/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.09.1](https://github.com/docker/docker-ce/releases/tag/v18.09.1) + - [Docker Machine 0.16.1](https://github.com/docker/machine/releases/tag/v0.16.1) + - [Kubernetes 1.10.11](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#v11011), fixes [CVE-2018-1002105](https://github.com/kubernetes/kubernetes/issues/71411) + - [Kitematic 0.17.6](https://github.com/docker/kitematic/releases/tag/v0.17.6) + - Golang 1.10.6, fixes CVEs: [CVE-2018-16875](https://www.cvedetails.com/cve/CVE-2018-16875), [CVE-2018-16873](https://www.cvedetails.com/cve/CVE-2018-16873) and [CVE-2018-16874](https://www.cvedetails.com/cve/CVE-2018-16874) + - Windows 14393 is marked as deprecated ; it will not be supported anymore in the next major stable release (2.1.0.0 and further) + +* Bug fixes and minor changes + - Rename Docker for Windows to Docker Desktop + - Add 18.09 missing daemon options + +## Stable Releases of 2018 + +### Docker Community Edition 2.0.0.0-win81 2018-12-07 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/29211/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker compose 1.23.2](https://github.com/docker/compose/releases/tag/1.23.2) + +* Bug fixes and minor changes + - Compose: Fixed a bug where build context URLs would fail to build on Windows. Fixes [docker/for-win#2918](https://github.com/docker/for-win/issues/2918) + +### Docker Community Edition 2.0.0.0-win78 2018-11-19 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/28905/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.09.0](https://github.com/docker/docker-ce-packaging/releases/tag/v18.09.0) + - [Docker compose 1.23.1](https://github.com/docker/compose/releases/tag/1.23.1) + - [Docker Machine 0.16.0](https://github.com/docker/machine/releases/tag/v0.16.0) + - [Kitematic 0.17.5](https://github.com/docker/kitematic/releases/tag/v0.17.5) + - Linux Kernel 4.9.125 + +* New + - New version scheme + +* Deprecation + - Removed support of AUFS + +* Bug fixes and minor changes + - Windows Containers: Fix group daemon option settings. Fixes [docker/for-win#2647](https://github.com/docker/for-win/issues/2647) + - Windows Containers: Better host.docker.internal resolution, don't rewrite it if not modified. From [docker/for-win#1976](https://github.com/docker/for-win/issues/1976) + - Do not try to update samba share mounts when using Windows Containers + - Improved dns update too verbose in logs + - VPNKit: Improved scalability of port forwarding. + - VPNKit: Limit the size of the UDP NAT table. This ensures port forwarding and regular TCP traffic continue even when running very chatty UDP protocols. + - LCOW does not need --platform flag on multi-arch images any more + - Disk size can now be ajusted from 32GiB to drive space. + - Fix dns update too verbose in logs + - Fix panic in diagnose + +### Docker Community Edition 18.06.1-ce-win73 2018-08-29 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/19507/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.06.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce) + +* Bug fixes and minor changes + - Fix bug in VM activity detection, preventing Docker Desktop from starting. Fixes [docker/for-win#2404](https://github.com/docker/for-win/issues/2404) + - Fix bug in detection when Windows service is not running, and propose to restart the service. + - Fix local DNS failing to resolve inside containers. Fixes [docker/for-win#2301](https://github.com/docker/for-win/issues/2301), [docker/for-win#2304](https://github.com/docker/for-win/issues/2304) + - Fix Kubernetes status display after reset to factory default + - Fix bug where `host.docker.internal` is not resolved in some cases. Fixes [docker/for-win#2402](https://github.com/docker/for-win/issues/2402) + - Use a 1MB vhdx blocksize instead of the default 32MB. See [docker/for-win#244](https://github.com/docker/for-win/issues/244). Also see [Microsoft Best Practices for running Linux on Hyper-V](https://docs.microsoft.com/en-us/windows-server/virtualization/hyper-v/best-practices-for-running-linux-on-hyper-v) + - Fix diagnostics in specific cases when the Windows service is not started. + - Changed the samba default file permission to avoid an issue with too open rights. Fixes [docker/for-win#2170](https://github.com/docker/for-win/issues/2170) + - On RS5 insider, fixed wrong detection of missing feature "Containers" requiring you to install the feature and then reboot. + +### Docker Community Edition 18.06.0-ce-win72 2018-07-26 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/19098/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* New + - Renewed signing certificate. The installer may show a Windows Defender popup until the renewed certificate is allowlisted. Click "More info" to view the app is published by "Docker Inc" and run it. + +* Bug fixes and minor changes + - Fix bug in automatic feature enabling if "Hyper-V" and "Containers" Windows features are not enabled already when starting Docker Desktop. + +### Docker Community Edition 18.06.0-ce-win70 2018-07-25 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/19075/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce) + - [Docker Machine 0.15.0](https://github.com/docker/machine/releases/tag/v0.15.0) + - [Docker compose 1.22.0](https://github.com/docker/compose/releases/tag/1.22.0) + - [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 + +* New + - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See [the Kubernetes section](../kubernetes.md) + +* Bug fixes and minor changes + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes) + - Fix bug which would in some cases cause virtual machine logs to be written to RAM rather than disk, and the virtual machine to hang. + - Fix security issue with named pipe connection to docker service. + - Fix VPNKit memory leak. Fixes [docker/for-win#2087](https://github.com/docker/for-win/issues/2087), [moby/vpnkit#371](https://github.com/moby/vpnkit/issues/371) + - Fix restart issue when using Windows fast startup on latest 1709 Windows updates. Fixes [docker/for-win#1741](https://github.com/docker/for-win/issues/1741), [docker/for-win#1741](https://github.com/docker/for-win/issues/1741) + - DNS name `host.docker.internal` can be used for host resolution from Windows Containers. Fixes [docker/for-win#1976](https://github.com/docker/for-win/issues/1976) + - Fix broken link in diagnostics window. + - Added log rotation for docker-ce logs inside the virtual machine. + - Changed smb permission to avoid issue when trying to manipulate files with different users in containers. Fixes [docker/for-win#2170](https://github.com/docker/for-win/issues/2170) + +### Docker Community Edition 18.03.1-ce-win65 2018-04-30 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/17513/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce) + - [Docker compose 1.21.1](https://github.com/docker/compose/releases/tag/1.21.1) + - [Notary 0.6.1](https://github.com/docker/notary/releases/tag/v0.6.1) + +* Bug fixes and minor changes + - Fix startup failure when the HOME environment variable is already defined (typically started from the command line). Fixes [docker/for-win#1880](https://github.com/docker/for-win/issues/1880) + - Fix startup failure due to incompatibility with other programs (like Razer Synapse 3). Fixes [docker/for-win#1723](https://github.com/docker/for-win/issues/1723) + +### Docker Community Edition 18.03.1-ce-win64 2018-04-26 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/17438/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce) + - [Docker compose 1.21.0](https://github.com/docker/compose/releases/tag/1.21.0) + - [Notary 0.6.1](https://github.com/docker/notary/releases/tag/v0.6.1) + +* Bug fixes and minor changes + - Fix startup failure when the HOME environment variable is already defined (typically started from the command line). Fixes [docker/for-win#1880](https://github.com/docker/for-win/issues/1880) + - Fix startup failure due to incompatibility with other programs (like Razer Synapse 3). Fixes [docker/for-win#1723](https://github.com/docker/for-win/issues/1723) + +### Docker Community Edition 18.03.0-ce-win59 2018-03-26 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/16762/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 18.03.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce) + - [Docker Machine 0.14.0](https://github.com/docker/machine/releases/tag/v0.14.0) + - [Docker compose 1.20.1](https://github.com/docker/compose/releases/tag/1.20.1) + - [Notary 0.6.0](https://github.com/docker/notary/releases/tag/v0.6.0) + - Linux Kernel 4.9.87 + - AUFS 20180312 + +* New + - Virtual machine disk size can be changed in settings. Fixes [docker/for-win#105](https://github.com/docker/for-win/issues/105) + - Virtual machine swap size can be changed in settings. + - New menu item to restart Docker. + - Support NFS Volume sharing. See [docker/for-win#1700](https://github.com/docker/for-win/issues/1700) + - Allow to activate Windows Containers during installation (avoid virtual machine disk creation and virtual machine boot when working only on Windows containers). See [docker/for-win#217](https://github.com/docker/for-win/issues/217). + - Experimental feature: LCOW containers can now be run next to Windows containers (on Windows RS3 build 16299 and later). Use `--platform=linux` in Windows container mode to run Linux Containers On Windows. Note that LCOW is experimental; it requires the daemon `experimental` option. + +* Bug fixes and minor changes + - Fix Windows Containers port forwarding on Windows 10 build 16299 post KB4074588. Fixes [docker/for-win#1707](https://github.com/docker/for-win/issues/1707), [docker/for-win#1737](https://github.com/docker/for-win/issues/1737) + - Fix daemon not starting properly when setting TLS-related options. + - DNS name `host.docker.internal` shoud be used for host resolution from containers. Older aliases (still valid) are deprecated in favor of this one. (See https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06). + - Fix for the HTTP/S transparent proxy when using "localhost" names (for example, `host.docker.internal`). Fixes [docker/for-win#1130](https://github.com/docker/for-win/issues/1130) + - Fix Linuxkit start on Windows RS4 Insider. Fixes [docker/for-win#1458](https://github.com/docker/for-win/issues/1458), [docker/for-win#1514](https://github.com/docker/for-win/issues/1514), [docker/for-win#1640](https://github.com/docker/for-win/issues/1640) + - Fix risk of privilege escalation. (https://www.tenable.com/sc-report-templates/microsoft-windows-unquoted-service-path-vulnerability) + - All users present in the docker-users group are now able to use Docker. Fixes [docker/for-win#1732](https://github.com/docker/for-win/issues/1732) + - Migration of Docker Toolbox images is not proposed in Docker For Windows installer (still possible to [migrate Toolbox images manually](https://docs.docker.com/toolbox/) ). + - Better cleanup for Windows containers and images on reset/uninstall. Fixes [docker/for-win#1580](https://github.com/docker/for-win/issues/1580), [docker/for-win#1544](https://github.com/docker/for-win/issues/1544), [docker/for-win#191](https://github.com/docker/for-win/issues/191) + - Desktop icon creation is optional in installer; do not recreate Desktop icon on upgrade (effective on next upgrade). Fixes [docker/for-win#246](https://github.com/docker/for-win/issues/246), [docker/for-win#925](https://github.com/docker/for-win/issues/925), [docker/for-win#1551](https://github.com/docker/for-win/issues/1551) + +### Docker Community Edition 17.12.0-ce-win47 2018-01-12 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/15139/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Bug fixes and minor changes + - Fix linuxkit port-forwarder sometimes not being able to start. Fixes [docker/for-win#1506](https://github.com/docker/for-win/issues/1506) + - Fix certificate management when connecting to a private registry. Fixes [docker/for-win#1512](https://github.com/docker/for-win/issues/1512) + - Fix Mount compatibility when mounting drives with `-v //c/...`, now mounted in /host_mnt/c in the linuxkit virtual machine. Fixes [docker/for-win#1509](https://github.com/docker/for-win/issues/1509), [docker/for-win#1516](https://github.com/docker/for-win/issues/1516), [docker/for-win#1497](https://github.com/docker/for-win/issues/1497) + - Fix icon displaying edge. Fixes [docker/for-win#1508](https://github.com/docker/for-win/issues/1508) + +### Docker Community Edition 17.12.0-ce-win46 2018-01-09 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/15048/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) + - [Docker compose 1.18.0](https://github.com/docker/compose/releases/tag/1.18.0) + - [Docker Machine 0.13.0](https://github.com/docker/machine/releases/tag/v0.13.0) + - Linux Kernel 4.9.60 + +* New + - Virtual machine entirely built with linuxkit + - Add localhost port forwarder for Windows (thanks @simonferquel). Use Microsoft localhost port forwarder when it is available (insider build RS4). + +* Bug fixes and minor changes + - Display various component versions in About box. + - Fix vpnkit issue when username has spaces. See [docker/for-win#1429](https://github.com/docker/for-win/issues/1429) + - Diagnostic improvements to get VM logs before VM shutdown. + - Fix installer check for not supported Windows `CoreCountrySpecific` Edition. + - Fix a class of startup failures where the database fails to start. See [docker/for-win#498](https://github.com/docker/for-win/issues/498) + - Links in update changelog now open the default browser instead of IE. (fixes [docker/for-win#1311](https://github.com/docker/for-win/issues/1311)) + +## Stable Releases of 2017 + +### Docker Community Edition 17.09.1-ce-win42 2017-12-11 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/14687/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 17.09.1-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce) + - [Docker compose 1.17.1](https://github.com/docker/compose/releases/tag/1.17.1) + - [Docker Machine 0.13.0](https://github.com/docker/machine/releases/tag/v0.13.0) + +* Bug fixes and minor changes + - Fix bug during Windows fast-startup process. Fixes [for-win/#953](https://github.com/docker/for-win/issues/953) + - Fix uninstaller issue (in some specific cases dockerd process was not killed properly) + - Fix Net Promoter Score Gui bug. Fixes [for-win/#1277](https://github.com/docker/for-win/issues/1277) + - Fix `docker.for.win.localhost` not working in proxy settings. Fixes [for-win/#1130](https://github.com/docker/for-win/issues/1130) + - Increased timeout for virtual machine boot startup to 2 minutes. + + +### Docker Community Edition 17.09.0-ce-win33 2017-10-06 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/13620/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Bug fixes + - Fix Docker For Windows unable to start in some cases: removed use of libgmp sometimes causing the vpnkit process to die. + +### Docker Community Edition 17.09.0-ce-win32 2017-10-02 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/13529/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 17.09.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.0-ce) + - [Docker Compose 1.16.1](https://github.com/docker/compose/releases/tag/1.16.1) + - [Docker Machine 0.12.2](https://github.com/docker/machine/releases/tag/v0.12.2) + - [Docker Credential Helpers 0.6.0](https://github.com/docker/docker-credential-helpers/releases/tag/v0.6.0) + - Linux Kernel 4.9.49 + - AUFS 20170911 + +* New + - Windows Docker daemon is now started as service for better lifecycle management + - Store Linux daemon configuration in ~\.docker\daemon.json instead of settings file + - Store Windows daemon configuration in C:\ProgramData\Docker\config\daemon.json instead of settings file + - VPNKit: add support for ping! + - VPNKit: add slirp/port-max-idle-timeout to allow the timeout to be adjusted or even disabled + - VPNKit: bridge mode is default everywhere now + - Add `Skip This Version` button in update window + +* Security fixes + - VPNKit: security fix to reduce the risk of DNS cache poisoning attack (reported by Hannes Mehnert https://hannes.nqsb.io/) + +* Bug fixes and minor changes + - Kernel: Enable TASK_XACCT and TASK_IO_ACCOUNTING + - Rotate logs in the virtual machine more often (docker/for-win#244) + - Reset to default stops all engines and removes settings including all daemon.json files + - Better backend service checks (related to https://github.com/docker/for-win/issues/953) + - Fix auto updates checkbox, no need to restart the application + - Fix check for updates menu when auto updates was disable + - VPNKit: do not block startup when ICMP permission is denied. (Fixes docker/for-win#1036, docker/for-win#1035, docker/for-win#1040) + - VPNKit: change protocol to support error messages reported back from the server + - VPNKit: fix a bug which causes a socket to leak if the corresponding TCP connection is idle + for more than 5 minutes (related to [docker/for-mac#1374](https://github.com/docker/for-mac/issues/1374)) + - VPNKit: improve the logging around the UNIX domain socket connections + - VPNKit: automatically trim whitespace from int or bool database keys + - Do not move credentials into the credential store at startup + +### Docker Community Edition 17.06.2-ce-win27 2017-09-06 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/13194/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +* Upgrades + - [Docker 17.06.2-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.2-ce) + - [Docker Machine 0.12.2](https://github.com/docker/machine/releases/tag/v0.12.2) + +### Docker Community Edition 17.06.1-ce-rc1-win24 2017-08-24 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/13025/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +**Upgrades** + +- [Docker 17.06.1-ce-rc1](https://github.com/docker/docker-ce/releases/tag/v17.06.1-ce-rc1) +- Linux Kernel 4.9.36 +- AUFS 20170703 + +**Bug fixes and minor** + +- Fix locked container id file (Fixes [docker/for-win#818](https://github.com/docker/for-win/issues/818)) +- Avoid expanding variables in PATH env variable (Fixes [docker/for-win#859](https://github.com/docker/for-win/issues/859)) + +### Docker Community Edition 17.06.0-ce-win18 2017-06-28 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/12627/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +**Upgrades** + +- [Docker 17.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.0-ce) +- [Docker Credential Helpers 0.5.2](https://github.com/docker/docker-credential-helpers/releases/tag/v0.5.2) +- [Docker Machine 0.12.0](https://github.com/docker/machine/releases/tag/v0.12.0) +- [Docker compose 1.14.0](https://github.com/docker/compose/releases/tag/1.14.0) +- Linux Kernel 4.9.31 + +**New** + +- Windows Server 2016 support +- Windows 10586 is marked as deprecated; it is not supported going forward in stable releases +- Integration with Docker Cloud, with the ability to control remote Swarms from the local command line interface (CLI) and view your repositories +- Unified login between the Docker CLI and Docker Hub, Docker Cloud. +- Sharing a drive can be done on demand, the first time a mount is requested +- Add an experimental DNS name for the host: docker.for.win.localhost +- Support for client (i.e. "login") certificates for authenticating registry access (fixes [docker/for-win#569](https://github.com/docker/for-win/issues/569)) +- New installer experience + +**Bug fixes and minor changes** + +- Fixed group access check for users logged in with Active Directory (fixes [docker/for-win#785](https://github.com/docker/for-win/issues/785)) +- Checked environment variables and add some warnings in logs if they can cause docker to fail +- Many processes that were running in admin mode now run within the user identity +- Cloud federation command lines now open in the user home directory +- Named pipes are now created with more constrained security descriptors to improve security +- Security fix: Users must be part of the specific group "docker-users" to run Docker for Windows +- Reset to default / uninstall also reset Docker cli settings and logout user from Docker Cloud and registries +- Detected a bitlocker policy preventing windows containers to work +- Fixed an issue on filesharing when explicitly disabled on vmswitch interface +- Fixed virtual machine not starting when the machine had a very long name +- Fixed a bug where Windows daemon.json file was not written (fixes [docker/for-win#670](https://github.com/docker/for-win/issues/670)) +- Added patches to the kernel to fix VMBus crash +- Named pipe client connection should not trigger dead locks on `docker run` with data in stdin any more +- Buffered data should be treated correctly when docker client requests are upgraded to raw streams + +### Docker Community Edition 17.03.1-ce-win12 2017-05-12 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/12058/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +**Upgrades** + +- Security fix for CVE-2017-7308 + +### Docker Community Edition 17.03.0, 2017-03-02 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/10743/Docker%20for%20Windows%20Installer.exe){: .accept-eula } + +**New** + +- Renamed to Docker Community Edition +- Integration with Docker Cloud: control remote Swarms from the local CLI and view your repositories. This feature is going to be rolled out to all users +progressively + +**Upgrades** + +- [Docker 17.03.0-ce](https://github.com/docker/docker/releases/tag/v17.03.0-ce) +- [Docker Compose 1.11.2](https://github.com/docker/compose/releases/tag/1.11.2) +- [Docker Machine 0.10.0](https://github.com/docker/machine/releases/tag/v0.10.0) +- Linux kernel 4.9.12 + +**Bug fixes and minor changes** + +- Matched Hyper-V Integration Services by ID, not name +- Don't consume 100% CPU when the service is stopped +- Log the diagnostic id when uploading +- Improved firewall handling: stop listing the rules since it can take a lot of time +- Don't rollback to the previous engine when the desired engine fails to start +- Don't use port 4222 inside the Linux virtual machine +- Fixed startup error of ObjectNotFound in Set-VMFirmware +- Added detailed logs when firewall is configured +- Added a link to the Experimental Features documentation +- Fixed the copyright in the About dialog +- VPNKit: fix unmarshalling of DNS packets containing pointers to pointers to labels +- VPNKit: set the Recursion Available bit on DNS responses from the cache +- VPNKit: Avoid diagnostics to capture too much data +- VPNKit: fix a source of occasional packet loss (truncation) on the virtual ethernet link +- Fixed negotiation of TimeSync protocol version (through kernel update) + +### Docker for Windows 1.13.1, 2017-02-09 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/1.13.1.10072/InstallDocker.msi){: .accept-eula } + +**Upgrades** + +- [Docker 1.13.1](https://github.com/docker/docker/releases/tag/v1.13.1) +- [Docker Compose 1.11.1](https://github.com/docker/compose/releases/tag/1.11.1) +- Linux kernel 4.9.8 + +**Bug fixes and minor changes** + +- Add link to experimental features +- New 1.13 cancellable operations should now be properly handled by the Docker for desktop +- Various typos fixes +- Fix in Hyper-V VM setup (should fix `ObjectNotFound` errors) + +### Docker for Windows 1.13.0, 2017-01-19 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/1.13.0.9795/InstallDocker.msi){: .accept-eula } + +**Upgrades** + +- [Docker 1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0) +- [Docker Compose 1.10](https://github.com/docker/compose/releases/tag/1.10.0) +- [Docker Machine 0.9.0](https://github.com/docker/machine/releases/tag/v0.9.0) +- [Notary 0.4.3](https://github.com/docker/notary/releases/tag/v0.4.3) +- Linux kernel 4.9.4 + +**New** + +- Windows containers +- Improved UI for Daemon.json editing +- VHDX file containing images and non-host mounted volumes can be moved + (using "advanced" tab in the UI) +- Support for arm, aarch64, ppc64le architectures using qemu +- TRIM support for disk (shrinks virtual disk) +- Virtual machine's time synchronization is forced after the host wakes from sleep mode +- Docker Experimental mode can be toggled + +**Bug fixes and minor changes** + +- Improved Proxy UI +- Improvements to Logging and Diagnostics +- About Box is now copy/paste enabled +- Improvements in drive sharing code +- Optimized boot process +- Trend Micro Office Scan made the API proxy think no drive was shared +- Show a link to the virtualization documentation +- Always remove the disk on factory reset +- VPNKit: Improved diagnostics +- VPNKit: Forwarded UDP datagrams have correct source port numbers +- VPNKit: If one request fails, allow other concurrent requests to succeed. + For example this allows IPv4 servers to work even if IPv6 is broken. +- VPNKit: Fix bug which could cause the connection tracking to + underestimate the number of active connections +- VPNKit: add a local cache of DNS responses + +## Stable Releases of 2016 + +### Docker for Windows 1.12.5, 2016-12-20 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/1.12.5.9503/InstallDocker.msi){: .accept-eula } + +**Upgrades** + +- Docker 1.12.5 +- Docker Compose 1.9.0 + +### Skipped Docker for Windows 1.12.4 + +We did not distribute a 1.12.4 stable release + +### Docker for Windows 1.12.3, 2016-11-09 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/1.12.3.8488/InstallDocker.msi){: .accept-eula } + +**New** + +- Restore the virtual machine's configuration after user changes + +- Detect firewall configurations that might block file sharing + +- Send more GUI usage statistics to help us improve the product + +- The path to HyperV disks is not hardcoded anymore, making the Toolbox import work with non-standard paths + +- Verify that all HyperV features are enabled + +- Added Moby console to the logs + +- Save the current engine with the other settings + +- Notary version 0.4.2 installed + +- Reworked the File Sharing dialog and underlying mechanism + - Pre-fill username + - Faster and more reliable feedback when the user/password is not valid + - Better support for domain users + - Error message in Logs when File Sharing failed for other reasons + +**Upgrades** + +- Docker 1.12.3 +- Linux Kernel 4.4.27 +- Docker Machine 0.8.2 +- Docker Compose 1.8.1 +- aufs 20160912 + +**Bug fixes and minor changes** + +**General** + +- Added the settings to the diagnostics + +- Made sure we didn't use an older Nlog library from the GAC + +- Fixed a password escaping regression + +- Supports writing large values to the database, specially for trusted CAs + +- Preserves the Powershell stacktraces + +- Writes OS and Application versions at the top of each log file + +- Don't recreate the virtual machine if only the DNS server is set + +- The uninstaller now kills the service if it failed to stop it properly + +- Improved debug information + +**Networking** + +- VpnKit is now restarted if it stops + +- VpnKit: impose a connection limit to avoid exhausting file descriptors + +- VpnKit: handle UDP datagrams larger than 2035 bytes + +- VpnKit: reduce the number of file descriptors consumed by DNS + +**File sharing** + + +- Faster mount/unmount of shared drives + +- Added a timeout to mounting/unmounting a shared drive + +**Hyper-V** + +- Make sure invalid "DockerNat" switches are not used + +**Moby** + +- Increase default ulimit for memlock (fixes [https://github.com/docker/for-mac/issues/801](https://github.com/docker/for-mac/issues/801)) + +### Docker for Windows 1.12.1, 2016-09-16 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/1.12.1.7135/InstallDocker.msi){: .accept-eula } + +>**Important Note**: +> +> The auto-update function in Beta 21 cannot install this update. To install the latest beta manually if you are still on Beta 21, download the installer here: + +> [https://download.docker.com/win/beta/InstallDocker.msi](https://download.docker.com/win/beta/InstallDocker.msi) + +> This problem is fixed as of Beta 23 for subsequent auto-updates. + +**New** + +* To support trusted registry transparently, all trusted CAs (root or intermediate) on the Windows host are automatically copied to Moby + +* `Reset Credentials` also unshares the shared drives + +* Logs are now rotated every day + +* Support multiple DNS servers + +* Added `mfsymlinks` SMB option to support symlinks on bind mounted folder + +* Added `nobrl` SMB option to support `sqlite` on bind mounted folders + +* Detect outdated versions of Kitematic + +**Upgrades** + +* Docker 1.12.1 +* Docker machine 0.8.1 +* Linux kernel 4.4.20 +* aufs 20160905 + +**Bug fixes and minor changes** + +**General** + +* Uploading a diagnostic now shows a proper status message in the Settings + +* Docker stops asking to import from the Toolbox after an upgrade + +* Docker can now import from the Toolbox just after HyperV is activated + +* Added more debug information to the diagnostics + +* Sending anonymous statistics doesn't hang anymore when Mixpanel is not available + +* Support newlines in release notes + +* Improve the error message when the Docker daemon is not responding + +* The configuration database is now stored in memory + +* Preserve the stacktrace of PowerShell errors + +* Display service stacktrace in error windows + +**Networking** + +* Improve name servers discovery +* VpnKit supports search domains +* VpnKit is now compiled with OCaml 4.03 rather than 4.02.3 + +**File sharing** + +* Set `cifs` version to 3.02 + +* VnpKit: reduce the number of sockets used by UDP NAT, reduce the probability + +* `slirp`: reduce the number of sockets used by UDP NAT, reduce the probability that NAT rules time out earlier than expected + +* Fixed password handling for host file system sharing + +**Hyper-V** + +* Automatically disable lingering net adapters that prevent Docker from starting or using the network + +* Automatically delete duplicated MobyLinuxVMs on a `reset to factory defaults` + +* Improved the HyperV detection and activation mechanism + +**Moby** + +* Fixed Moby Diagnostics and Update Kernel + +* Use default `sysfs` settings, transparent huge pages disabled + +* `Cgroup` mount to support `systemd` in containers + +**Known issues** + +* Docker automatically disables lingering net adapters. The only way to remove them is manually using `devmgmt.msc` as documented in [Remove stale network adapters](troubleshoot.md#4-remove-stale-network-adapters) under [Networking issues](troubleshoot.md#networking-issues) in Troubleshooting. + +### Docker for Windows 1.12.0, 2016-07-28 + +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [For Windows](https://download.docker.com/win/stable/1.12.0.5968/InstallDocker.msi){: .accept-eula } + +* First stable release + +**Components** + +* Docker 1.12.0 +* Docker Machine 0.8.0 +* Docker Compose 1.8.0 + +{% include eula-modal.html %} diff --git a/docker-hub/convert-account.md b/docker-hub/convert-account.md index 4f2fa215ce..fb2257ddaf 100644 --- a/docker-hub/convert-account.md +++ b/docker-hub/convert-account.md @@ -40,11 +40,11 @@ Before you convert a user account to an organization, ensure that you have compl Your Community account has now been converted to an organization. -## Convert a Pro account into an organization +## Convert a Docker Pro tier into an organization >**Note:** > -> When you convert a Pro or a legacy individual repository plan to an organization, the account +> When you convert a Docker Pro subscription to an organization, the account will be migrated to a Team plan and will be charged $35 per month for 5 seats. For more information, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. diff --git a/docker-hub/deactivate-account.md b/docker-hub/deactivate-account.md index f15aa9af6f..fbbd7fa22e 100644 --- a/docker-hub/deactivate-account.md +++ b/docker-hub/deactivate-account.md @@ -13,7 +13,7 @@ Before deactivating your Docker Hub account, please complete the following: 1. Download any images and tags you want to keep: `docker pull -a :`. -3. If you have an active subscription, downgrade it to the **free** plan. +3. If you have an active subscription, downgrade it to the **Docker Personal** subscription. In Docker Hub, navigate to **_Your Account_** > **Account Settings** > **Billing**. @@ -40,7 +40,7 @@ Before deactivating an organization, please complete the following: 1. Download any images and tags you want to keep: `docker pull -a :`. -2. If you have an active subscription, downgrade it to the **free** plan: +2. If you have an active subscription, downgrade it to the **Docker Personal** subscription: In Docker Hub, navigate to **Organizations** > **_Your Organization_** > **Billing**. diff --git a/docker-hub/download-rate-limit.md b/docker-hub/download-rate-limit.md index 2932ac8107..81c4b23e6a 100644 --- a/docker-hub/download-rate-limit.md +++ b/docker-hub/download-rate-limit.md @@ -87,11 +87,11 @@ This means my limit is 100 per 21600 seconds (6 hours), and I have 76 pulls rema If you do not see these headers, that means pulling that image would not count towards pull limits. This could be because you are authenticated with a user associated with a Pro/Team Docker Hub account, or because the image or your IP is unlimited in partnership with a publisher, provider, or an open-source organization. -## I'm being limited even though I have a Pro/Team account +## I'm being limited even though I have a paid Docker subscription -To take advantage of the higher limits included in these plans, you must [authenticate pulls](#how-do-i-authenticate-pull-requests) with your user account. +To take advantage of the higher limits included in a paid Docker subscription, you must [authenticate pulls](#how-do-i-authenticate-pull-requests) with your user account. -A Pro/Team plan does not increase limits on your images for other users. See our [Open Source](https://www.docker.com/blog/expanded-support-for-open-source-software-projects/){: target="_blank" rel="noopener" class="_"}, [Publisher](https://www.docker.com/partners/programs){: target="_blank" rel="noopener" class="_"}, or [Large Organization](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} offerings. +A Pro, Team, or a Business tier does not increase limits on your images for other users. See our [Open Source](https://www.docker.com/blog/expanded-support-for-open-source-software-projects/){: target="_blank" rel="noopener" class="_"}, [Publisher](https://www.docker.com/partners/programs){: target="_blank" rel="noopener" class="_"}, or [Large Organization](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} offerings. ## How do I authenticate pull requests diff --git a/docker-hub/image-management.md b/docker-hub/image-management.md index b472b842b4..33503455a1 100644 --- a/docker-hub/image-management.md +++ b/docker-hub/image-management.md @@ -10,7 +10,7 @@ title: Advanced Image Management dashboard target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_image-mgmt" %} -The **Advanced Image Management** dashboard allows you to manage Docker images across all repositories. [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} your existing account to a Pro or a Team account to start using the Advanced Image Management dashboard. +The **Advanced Image Management** dashboard allows you to manage Docker images across all repositories. [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} your existing subscription to start using the Advanced Image Management dashboard. The Advanced Image Management dashboard provides a snapshot of your existing images and allows you to view, sort, and filter images by tags, activity status, and date, and contains options to clean up your workspace by deleting images that are no longer required. @@ -28,7 +28,7 @@ To access the Advanced Image Management dashboard: 2. Click **Repositories** from the main menu and select a repository from the list. This displays a banner indicating the number of inactive images in the repository. 3. Click **View inactive images**. This displays the Advanced Image Management dashboard. It lists images in your repository and allows you to sort and filter images by tags, activity status, and the last activity date. - > You must be logged in as a Pro or a Team user to use the Advanced Image Management dashboard. Click [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} to upgrade your existing subscription. + > You must be logged in as a Docker Pro, Team, or a Business user to use the Advanced Image Management dashboard. Click [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} to upgrade your existing subscription. ## View images @@ -38,7 +38,7 @@ The Advanced Image Management dashboard provides a snapshot of your existing ima ## Delete images -> You must be logged in as a Pro or a Team user and have admin access to the repository to delete images. +> You must be logged in as a Docker Pro, Team, or a Business user and have admin access to the repository to delete images. By default, the Advanced Image Management dashboard displays inactive images in the repository. To delete an inactive image: diff --git a/docker-hub/index.md b/docker-hub/index.md index 9b93cbe634..61071f7eb6 100644 --- a/docker-hub/index.md +++ b/docker-hub/index.md @@ -170,5 +170,5 @@ Congratulations! You've successfully: - Create an [organization](orgs.md) to use Docker Hub with your team. - Automatically build container images from code through [builds](builds/index.md). - [Explore](https://hub.docker.com/explore) official & publisher images. -- [Upgrade your plan](https://www.docker.com/pricing) to push additional private Docker images to +- [Upgrade your subscription](https://www.docker.com/pricing) to push additional private Docker images to Docker Hub. diff --git a/docker-hub/release-notes.md b/docker-hub/release-notes.md index fa2d5dc881..2fcf78ac97 100644 --- a/docker-hub/release-notes.md +++ b/docker-hub/release-notes.md @@ -67,7 +67,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically ### New features -* Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/parallel autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription/index.md). +* Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/concurrent autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription/index.md). * Docker has enabled download rate limits for downloads and pull requests on Docker Hub. This caps the number of objects that users can download within a specified timeframe. For more information, see [Download rate limit](download-rate-limit.md). diff --git a/docker-hub/vulnerability-scanning.md b/docker-hub/vulnerability-scanning.md index f5f7d5151a..27feb982cc 100644 --- a/docker-hub/vulnerability-scanning.md +++ b/docker-hub/vulnerability-scanning.md @@ -16,9 +16,9 @@ When you push an image to Docker Hub after enabling vulnerability scanning, Dock ## Scan images -Hub Vulnerability scanning allows repository owners and administrators of a Pro or a Team plan to enable and disable scanning. +Hub Vulnerability scanning allows repository owners and administrators of a Docker Pro, Team, or a Business tier to enable and disable scanning. -In addition, repository owners in a Pro plan and team members in a Team plan can view the detailed scan reports. When scanning is enabled on a specific repository, anyone with push access can trigger a scan by pushing an image to Docker Hub. +In addition, repository owners in a Docker Pro subscription and team members in a Team, or a Business subscription can view the detailed scan reports. When scanning is enabled on a specific repository, anyone with push access can trigger a scan by pushing an image to Docker Hub. > **Note** > @@ -26,7 +26,7 @@ In addition, repository owners in a Pro plan and team members in a Team plan can ### Enable vulnerability scanning -Repository owners and administrators can enable vulnerability scanning on a repository. If you are a member of a Team plan, ensure the repository you would like to enable scanning on is part of the Team plan. +Repository owners and administrators can enable vulnerability scanning on a repository. If you are a member of a Team or a Business subscription, ensure the repository you would like to enable scanning on is part of the Team or a Business tier. To enable vulnerability scanning: diff --git a/engine/security/seccomp.md b/engine/security/seccomp.md index ce4a287091..772ab834db 100644 --- a/engine/security/seccomp.md +++ b/engine/security/seccomp.md @@ -31,8 +31,8 @@ protective while providing wide application compatibility. The default Docker profile can be found [here](https://github.com/moby/moby/blob/master/profiles/seccomp/default.json). -In effect, the profile is a whitelist which denies access to system calls by -default, then whitelists specific system calls. The profile works by defining a +In effect, the profile is a allowlist which denies access to system calls by +default, then allowlists specific system calls. The profile works by defining a `defaultAction` of `SCMP_ACT_ERRNO` and overriding that action only for specific system calls. The effect of `SCMP_ACT_ERRNO` is to cause a `Permission Denied` error. Next, the profile defines a specific list of system calls which are fully @@ -56,9 +56,9 @@ $ docker run --rm \ ### Significant syscalls blocked by the default profile -Docker's default seccomp profile is a whitelist which specifies the calls that +Docker's default seccomp profile is an allowlist which specifies the calls that are allowed. The table below lists the significant (but not all) syscalls that -are effectively blocked because they are not on the whitelist. The table includes +are effectively blocked because they are not on the Allowlist. The table includes the reason each syscall is blocked rather than white-listed. | Syscall | Description | diff --git a/get-docker.md b/get-docker.md index 84c64586d6..d22641401d 100644 --- a/get-docker.md +++ b/get-docker.md @@ -19,8 +19,6 @@ significantly reduce the delay between writing code and running it in production You can download and install Docker on multiple platforms. Refer to the following section and choose the best installation path for you. -{% include eula.md %} -
diff --git a/subscription/add-seats.md b/subscription/add-seats.md index fb33dac2b6..010db11652 100644 --- a/subscription/add-seats.md +++ b/subscription/add-seats.md @@ -1,22 +1,22 @@ --- -description: Add seats to your plan +description: Add seats to your subscription keywords: Docker, Docker Hub, subscription, update, add, seats -title: Add seats to your plan +title: Add seats to your subscription redirect_from: - /docker-hub/billing/add-seats/ --- -You can manage your Docker Hub subscription anytime by adding seats to your plan. +You add seats anytime to your existing subscription. -## Add seats to a monthly plan +## Add seats to a monthly subscription > **Note:** > >- A monthly subscription includes monthly seats only. >- You must be a member of the ‘owners’ team to add seats to your organization. ->- When you add seats to your monthly plan in the middle of your billing cycle, you are charged a prorated amount for the additional seats. +>- When you add seats to your monthly subscription in the middle of your billing cycle, you are charged a prorated amount for the additional seats. -To add seats to a monthly plan: +To add seats to a monthly subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -30,14 +30,14 @@ To add seats to a monthly plan: 6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../orgs.md#add-a-member-to-a-team). -## Add seats to an annual plan +## Add seats to an annual subscription > **Note:** > > - An annual subscription includes annual seats only. -> - When you add seats to your plan in the middle of your billing cycle, you are charged a prorated amount for the additional seats. +> - When you add seats to your subscription in the middle of your billing cycle, you are charged a prorated amount for the additional seats. -To add annual seats to an annual plan: +To add annual seats to an annual subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. diff --git a/subscription/downgrade.md b/subscription/downgrade.md index 584c700d35..8f0e10698d 100644 --- a/subscription/downgrade.md +++ b/subscription/downgrade.md @@ -7,21 +7,21 @@ redirect_from: - /docker-hub/billing/downgrade/ --- -You can downgrade your Pro or Team plan anytime. When you downgrade your plan, changes will be applied at the end of your billing cycle. +You can downgrade your Docker subscription anytime. When you downgrade your subscription, changes are applied at the end of your billing cycle. -For example, if you are currently on a **Team** plan which is billed on the 8th of every month and you choose to downgrade to a **Free** plan on the 15th, your plan will be active until 7th of the following month. You will be transferred to a Free plan on the 8th of the following month. +For example, if you are currently on a **Docker Team** subscription which is billed on the 8th of every month and you choose to downgrade to **Docker Personal** on the 15th, your plan will be active until 7th of the following month. You will be transferred to Docker Personal on the 8th of the following month. -The following sections contain instructions on how to downgrade from Pro and Team plans to a Free plan. +The following sections contain instructions on how to downgrade from a paid subscription to a Docker Personal tier. -## Downgrade from Pro to a Free plan +## Downgrade from Docker Pro to Docker Personal >**Note:** > -> - It is not possible to offer prorated refunds when you downgrade an annual plan that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual plan if it hasn't expired. -> - Before you downgrade to a Free plan, ensure that your account details are updated to reflect features available in the Free plan. For example, you may need to convert any private repositories to public repositories. For information on what’s included in the Free plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn't expired. +> - Before you downgrade to Docker Personal, ensure that your account details are updated to reflect features available in Docker Personal. For example, you may need to convert any private repositories to public repositories. For information on what’s included in the Docker Personal, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. {: .important } -To downgrade from a Pro plan to a Free plan: +To downgrade from a Docker Pro to Docker Personal: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -29,13 +29,13 @@ To downgrade from a Pro plan to a Free plan: 3. Ensure you have selected your personal account on the left side of the **Billing Details** page. -4. Click **Change plan** to downgrade your existing plan. +4. Click **Change plan** to downgrade your existing subscription. 5. On the **Change Plan** page, review the information displayed in the **Free** section and click **Downgrade**. 6. When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**. -7. If your account meets the requirements of a Free plan, the **Downgrade confirmation** screen will be displayed. Click **continue**. +7. If your account meets the requirements of Docker Personal, the **Downgrade confirmation** screen will be displayed. Click **continue**. 8. We’d like to understand the reason for your downgrade. Select a reason for your downgrade from the list. Optionally, add a comment and select the checkbox to discuss your feedback with a member of the Docker team. Click **Send**. @@ -43,15 +43,15 @@ To downgrade from a Pro plan to a Free plan: 10. To cancel the downgrade, click **Cancel the downgrade**. -## Downgrade from Team to a Free plan +## Downgrade from Docker Team to Docker Free Team >**Note:** > -> - It is not possible to offer prorated refunds when you downgrade an annual plan that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual plan if it hasn't expired. -> - Before you downgrade to a Free Team plan, you must convert all private repositories to public repositories and update the organization details to reflect features available in the Free plan. For example, you may need to reduce the number of team members. For information on what’s included in the Free plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn't expired. +> - Before you downgrade to a Free Team, you must convert all private repositories to public repositories and update the organization details to reflect features available in the Free Team. For example, you may need to reduce the number of team members. For information on what’s included in the Free Team, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. {: .important } -To downgrade to a Free Team plan from a Team plan: +To downgrade to a Docker Free Team from Docker Team: 1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. @@ -65,7 +65,7 @@ To downgrade to a Free Team plan from a Team plan: 6. When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**. -7. If your account meets the requirements of a Free plan, the **Downgrade confirmation** screen will be displayed. Click **continue**. +7. If your account meets the requirements of a Free Team plan, the **Downgrade confirmation** screen will be displayed. Click **continue**. 8. We’d like to understand the reason for your downgrade. Select a reason for your downgrade from the list. Optionally, add a comment and select the checkbox to discuss your feedback with a member of the Docker team. Click **Send**. diff --git a/subscription/faq.md b/subscription/faq.md index 1979c841fa..ed3444b429 100644 --- a/subscription/faq.md +++ b/subscription/faq.md @@ -89,7 +89,7 @@ Upgrading your legacy plan to a Pro plan offers you unlimited public and private ### How do I upgrade to a Team plan from a legacy organization plan? -Upgrading your legacy plan to a Team plan offers you unlimited private repos, unlimited teams, and 3 parallel builds. For information on how to upgrade to a Team plan from a legacy (per-repository) plan, see the [How To Upgrade](upgrade.md){:target="blank" rel="noopener" class=""} page. +Upgrading your legacy plan to a Team plan offers you unlimited private repos, unlimited teams, and 3 concurrent builds. For information on how to upgrade to a Team plan from a legacy (per-repository) plan, see the [How To Upgrade](upgrade.md){:target="blank" rel="noopener" class=""} page. ### How do downgrades from a Pro or Team plan work? When you downgrade your Pro or Team plan, changes are applied at the end of your billing cycle. For example, if you are currently on a Team plan which is billed on the 8th of every month and you choose to downgrade to a Free Team plan on the 15th, your Team plan will be active until 7th of the following month. You will be transferred to a Free Team plan on the 8th of the following month. Please refer to the next two questions below for instructions on how to downgrade your account. diff --git a/subscription/images/billing-personal-account.png b/subscription/images/billing-personal-account.png index 3261faa261..334e9de2c9 100644 Binary files a/subscription/images/billing-personal-account.png and b/subscription/images/billing-personal-account.png differ diff --git a/subscription/index.md b/subscription/index.md index 24d5335117..4de7fec9e3 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -1,6 +1,6 @@ --- description: Docker subscription overview -keywords: Docker, pricing, billing, Pro, Team, subscription, tier, plan +keywords: Docker, pricing, billing, Pro, Team, business, subscription, tier, plan title: Docker subscription overview redirect_from: - /docker-hub/billing/ @@ -8,22 +8,23 @@ redirect_from: - /subscription/faq/ --- -On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers. Docker subscription tiers now include Personal, Pro, Team, and Business. +On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers and businesses. Docker subscription tiers now include Personal, Pro, Team, and Business. -Here's a summary of the changes: +### Here's a summary of the changes -- We’re introducing a new product subscription, Docker Business, for large enterprises that require features like registry restrictions, SSO, secure software supply chain management, and more. -- Our Docker Subscription Service Terms include a change to the terms of use for Docker Desktop. - - It remains free for small businesses (fewer than 250 employees AND less than $1 million in annual revenue), personal use, education, and non-commercial open source projects. - - It requires a paid subscription (Pro, Team, or Business), for as little as $5 a month, for professional use in larger enterprises. - - The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop. -- The Docker Pro and Docker Team subscriptions now include commercial use of Docker Desktop. -- The existing Docker Free subscription has been renamed Docker Personal. -- No changes to Docker Engine or any other upstream open source Docker or Moby project. +- We’re introducing a **new** product subscription, Docker Business, for organizations using Docker at scale for application development and require features like secure software supply chain management, single sign-on (SSO), container registry access controls, and more. + +- Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"} includes a change to the terms for **Docker Desktop**. + - Docker Desktop **remains free** for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects. + - It requires a paid subscription (**Pro, Team, or Business**), for as little as $5 a month, for professional use in larger enterprises. + - The effective date of these terms is August 31, 2021. There is a grace period until January 31, 2022 for those that will require a paid subscription to use Docker Desktop. +- The Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop. +- The existing Docker Free subscription has been renamed **Docker Personal**. +- **No changes** to Docker Engine or any other upstream **open source** Docker or Moby project. To understand how these changes affect you, read the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}. -To compare features available in each subscription, see the [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"} page. +The following sections provide an overview of each tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}. ## Docker Personal @@ -35,49 +36,36 @@ For a list of features available in each tier, see [Docker Pricing](https://www. ## Docker Pro -**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It includes unlimited public repositories, unlimited private repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, one [service account](../docker-hub/service-accounts.md) for private repositories, autobuilds with 5 parallel builds, starting at $5 per month with the annual subscription. +**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It reduces the amount of time developers spend on mundane and repetitive tasks and empowers developers to spend more time creating value for their customers. -> **Note** -> -> Docker Pro tiers allow one service account for private repositories. For more information, see [service accounts](../docker-hub/service-accounts.md). If you already have more than one collaborator in your private repository, you’ll not be able to add any further collaborators. Any new private repository that you create will be restricted to one service account. +Docker Pro includes all the features available in Personal, additionally, it unlimited private repositories, unlimited public repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, [Auto Builds](../docker-hub/builds/index.md) with 5 concurrent builds, 300 [Hub Vulnerability Scans](../docker-hub/vulnerability-scanning.md), 5 [Scoped Access Tokens](../docker-hub/access-tokens.md), and more. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}. ## Docker Team -The **Docker Team** tier includes unlimited public and unlimited private repositories starting at $25 per month for the first 5 users and $7 per month for each user thereafter with the annual subscription. In addition, the Team tier offers autobuilds with 15 parallel builds, advanced collaboration and management tools, including organization and team management with role-based access controls for the whole team. +**Docker Team** offers capabilities for collaboration, productivity and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities. + +Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit Logs](../docker-hub/audit-log.md), and more. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}. ## Docker Business -The new Docker Business subscription enables organization-wide management and security for businesses that use Docker at scale. With an easy-to-use SaaS-based management plane, IT leaders can now efficiently monitor and manage all their Docker environments and accelerate their secure software supply chain initiatives. +**Docker Business** offers centralized management and advanced security features for enterprises that use Docker at scale. It empowers leaders to manage their Docker development environments and accelerate their secure software supply chain initiatives. -In addition to all the capabilities available in the Pro and Team tiers, Docker Business tier adds the ability to control what registries and content developers can access, ensuring teams are building secure from the start by only pulling trusted base images. +In addition to all the features available in Docker Pro and Docker Team, Docker Business includes centralized management, [Image Access Management](../docker-hub/image-access-management.md) with the ability to control what registries and content developers can access, ensuring teams are building secure from the start by only pulling trusted base images, SAML SSO (_Coming soon_), Remote Management (_Coming soon_). For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}. -## Docker Desktop license terms +## Docker Desktop License Agreement -Docker Desktop is licensed under the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}. When downloading and installing Docker Desktop, you will be asked to agree to the terms of service. +Docker Desktop is licensed under the Docker Subscription Service Agreement. When you download and install Docker Desktop, you will be asked to agree to the updated terms. -![Subscription service terms](../desktop/mac/images/subscription-terms.png){:width="700px"} - -Here's a summary of the key changes: - -- Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects. -- It requires a paid subscription for professional use in larger enterprises. -The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop. -- The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop - -You can also find a copy of the Docker Subscription Service Terms from the Docker menu. Select ![whale menu](../desktop/mac/images/whale-x.png){: .inline} > **About Docker Desktop** > **Subscription Service Terms**. +{% include desktop-license-update.md %} Docker Desktop is built using open source software. For information about the licensing of open source components in Docker Desktop, Select ![whale menu](../desktop/mac/images/whale-x.png){: .inline} > **About Docker Desktop** > **Acknowledgements**. > **Note** > -> The licensing and distribution terms for Docker and Moby open source projects such as Docker Engine are not changing. - -For information on how to subscribe, see [Upgrade your subscription](../subscription/upgrade.md), or to learn more about the features available in each tier, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. - -For frequently asked questions about pricing, see [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}. +> The licensing and distribution terms for Docker and Moby **open source** projects, such as Docker Engine, are not changing. diff --git a/subscription/remove-seats.md b/subscription/remove-seats.md index 83f5968b4f..9bb8fae3c6 100644 --- a/subscription/remove-seats.md +++ b/subscription/remove-seats.md @@ -1,22 +1,22 @@ --- -description: Remove seats from your plan +description: Remove seats from your subscription keywords: Docker, Docker Hub, subscription, update, remove, seats -title: Remove seats from your plan +title: Remove seats from your subscription redirect_from: - /docker-hub/billing/remove-seats/ --- -You can manage your Docker Hub subscription anytime by removing seats from your plan. If you remove seats in the middle of the billing cycle, changes are applied immediately and reflect in the next billing cycle. +You can manage your Docker Hub subscription anytime by removing seats from your subscription. If you remove seats in the middle of the billing cycle, changes are applied immediately and reflect in the next billing cycle. -For example, if you receive your billing on the 8th of every month for 10 seats and you want to remove 2 seats on the 15th of the month, the 2 seats are removed immediately. Your payment for 8 seats begins the next month. If you are on the annual plan, the 2 seats are removed immediately, and your payment for the 8 seats begins next year. +For example, if you receive your billing on the 8th of every month for 10 seats and you want to remove 2 seats on the 15th of the month, the 2 seats are removed immediately. Your payment for 8 seats begins the next month. If you are on the annual subscription, the 2 seats are removed immediately, and your payment for the 8 seats begins next year. -## Remove seats from a monthly or an annual plan +## Remove seats from a monthly or an annual subscription > **Note:** > > - You must be a member of the ‘Owners’ team to remove seats from your organization. > -To remove seats from a monthly or an annual plan: +To remove seats from a monthly or an annual subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -24,7 +24,7 @@ To remove seats from a monthly or an annual plan: 3. Select the **Billing** tab and click **Remove seats**. -4. Specify how many seats you’d like to reduce from the existing plan and click **Remove** to confirm. +4. Specify how many seats you’d like to reduce from the existing subscription and click **Remove** to confirm. 5. The **Billing** tab confirms the seat removal and the details on when the changes will take effect. diff --git a/subscription/upgrade.md b/subscription/upgrade.md index c3c5bb18a5..881a9d813d 100644 --- a/subscription/upgrade.md +++ b/subscription/upgrade.md @@ -1,37 +1,33 @@ --- description: Upgrading your Docker subscription -keywords: Docker Hub, upgrade, subscription, Pro, Team, pricing plan, +keywords: Docker Hub, upgrade, subscription, Pro, Team, business, pricing plan, title: Upgrade your subscription redirect_from: - /docker-hub/upgrade/ - /docker-hub/billing/upgrade/ --- -This page contains information on how to purchase a Pro or a Team plan. It also contains information on how to upgrade your existing plan and update your billing information. You can upgrade to a Pro or a Team plan from a Free plan, or from your current legacy plan. When you upgrade to a Pro or a Team plan, you can immediately use all the features and entitlements offered in your new plan. For detailed information on features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +This page contains information on how to purchase a Docker paid subscription. It also contains information on how to upgrade your existing subscription and update your billing information. -> **Note:** -> -> If you were previously on a legacy per-repository plan, your plan has been converted to a new Pro or Team monthly plan. For details, see [Pricing FAQ](faq.md). +You can upgrade to a Docker Pro, Team, or a Business subscription from a Personal subscription. When you upgrade to a paid subscription, you can immediately use all the features and entitlements offered in your new subscription. For detailed information on features available in each subscription, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. -## Purchase a Pro plan +## Purchase Docker Pro -The following section contains information on how to purchase a Pro plan for new customers. +The following section contains information on how to purchase a Docker Pro subscription for new customers. -To purchase a Pro plan: +To purchase Docker Pro: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. 2. Open the drop-down menu next to your username in the top-right corner and select **Billing** to go to the **Billing Details** page. This page displays billing information about your existing user account. - The Docker Hub **Pricing** page displays information about the new pricing plans. - 3. Ensure you have selected your personal account on the left side of the **Billing Details** page. 4. Click **Change plan**. -5. Review the plan details in the **Pro** section and click **Upgrade Now**. +5. The Docker Hub **Pricing** page displays information about the new subscription. Review the subscription details in the **Pro** section and click **Upgrade Now**. -5. The **Payment Method** page displays the cost for the annual plan by default. If you prefer to opt for the monthly plan, choose **pay monthly**. +5. The **Payment Method** page displays the cost for the annual subscription by default. If you prefer to opt for the monthly subscription, choose **Pay Monthly**. 6. Enter the card details and click **Purchase**. @@ -39,26 +35,26 @@ To purchase a Pro plan: 8. Open the drop-down menu next to your username in the top-right corner and select **Billing**. - The **Billing** page displays information about your new Pro plan and the total cost. + The **Billing** page displays information about your new subscription and the total cost. -## Purchase a Team plan +## Purchase Docker Team -The following section contains information on how to purchase a Team plan for new organizations. If you do not have a team plan, click here to learn more on how to create a team. +The following section contains information on how to purchase a Docker Team subscription for new organizations. If you do not have a team yet, see [create a team](../docker-hub/orgs.md#create-a-team) for instructions on how to create a new team. -To purchase a Team plan: +To purchase Docker Team: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. 2. Click **Organizations** in the toolbar and select your organization. 3. Click the **Billing** tab and click **Change plan**. - The Docker Hub **Pricing** page displays information about the new pricing plans. + The Docker Hub **Pricing** page displays information about the new subscription. -4. Review the plan details in the **Team** section and click **Buy Now**. +4. Review the subscription details in the **Team** section and click **Buy Now**. 5. Enter a name for your new organization and add a company name. -6. The **Organization size** page displays the cost for the annual plan by default. If you prefer to change this, select **Pay Monthly**. +6. The **Organization size** page displays the cost for the annual subscription by default. If you prefer to change this, select **Pay Monthly**. 7. Specify the number of users you’d like to add to your organization and click **Continue to Payment**. @@ -66,11 +62,15 @@ To purchase a Team plan: 9. Verify your email address. -10. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Team plan and the total cost. +10. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Docker Team subscription and the total cost. -## Upgrade to a Pro plan +## Purchase Docker Business -To upgrade to a Pro plan: +The Docker Business subscription is currently available to purchase through the Docker Sales team. To purchase a Docker Business subscription, [Contact Sales](https://www.docker.com/pricing/contact-sales){: target="_blank" rel="noopener" class="_"}. + +## Upgrade to Docker Pro + +To upgrade to Docker Pro: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -80,21 +80,21 @@ To upgrade to a Pro plan: ![Billing details personal account](images/billing-personal-account.png){:width="750px"} -4. Click **Change plan** to choose a new plan. +4. Click **Change plan** to choose a new subscription. -5. Review the plan details in the **Pro** section and click **Buy Now**. +5. Review the details in the **Pro** section and click **Buy Now**. -6. By default, the **Payment Method** page displays the annual cost to upgrade to a Pro plan. If you prefer to upgrade to a monthly plan, choose **pay monthly**. +6. By default, the **Payment Method** page displays the annual cost to upgrade to Docker Pro. If you prefer to upgrade to a monthly subscription, choose **pay monthly**. 7. Review the card details and the information displayed and click **Purchase** to confirm. - The **Billing** page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The **Billing** page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. -8. You’ll also receive an email confirming the cancellation of your legacy plan. +8. You’ll also receive an email confirming the cancellation of your legacy subscription. -## Upgrade to a Team plan +## Upgrade to Docker Team -To upgrade to a Team plan: +To upgrade to Docker Team subscription: 1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. @@ -102,42 +102,46 @@ To upgrade to a Team plan: 3. Select the **Billing** tab. -4. Click **Change plan** to upgrade to a new plan. +4. Click **Change plan** to upgrade to a new subscription. -5. Review the plan details in the **Team** section and click **Buy Now**. +5. Review the details in the **Team** section and click **Buy Now**. -6. By default, the plan displays the annual cost to upgrade the existing number of users to a Team plan. To switch to a monthly plan, click **Pay Monthly**. +6. By default, the subscription displays the annual cost to upgrade the existing number of users to a Docker Team subscription. To switch to a monthly subscription, click **Pay Monthly**. 7. Review and adjust the number of users as required and click **Continue to payment**. 8. Review the card details and click **Purchase** to confirm. - The **Billing page** now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The **Billing page** now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. - You’ll also receive an email confirming the cancellation of your legacy plan. + You’ll also receive an email confirming the cancellation of your legacy subscription. -## Upgrade from a monthly Team plan to an annual plan +## Upgrade to Docker Business -To upgrade from a monthly Team plan to an annual Team plan: +To upgrade to a Docker Business subscription, [Contact Sales](https://www.docker.com/pricing/contact-sales){: target="_blank" rel="noopener" class="_"}. + +## Upgrade from a monthly Team to an annual subscription + +To upgrade from a monthly Team subscription to an annual Team subscription: 1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. 2. Navigate to **Organizations** from the menu at the top of the page, choose your organization, and select the **Billing** tab. 3. Click **switch to annual billing**. -4. Review the information displayed on the **Change to an Annual Plan** page and click **Accept Terms and Purchase** to confirm. +4. Review the information displayed on the **Change to an Annual subscription** page and click **Accept Terms and Purchase** to confirm. - The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. -## Upgrade from a monthly Pro plan to an annual plan +## Upgrade from a monthly Pro to an annual subscription -To upgrade from a monthly Pro plan to an annual Pro plan: +To upgrade from a monthly Pro subscription to an annual Pro subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. 2. Open the drop-down menu next to your username in the top-right corner and select **Billing** to go to the **Billing Details** page. This page displays billing information about your existing user account. 3. Ensure you have selected your personal account on the left side of the **Billing Details** page. 4. Click **switch to annual billing**. -5. Review the information displayed on the **Change to an Annual Plan** page and click **Accept Terms and Purchase** to confirm. +5. Review the information displayed on the **Change to an Annual subscription** page and click **Accept Terms and Purchase** to confirm. - The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. ## Update billing information