From e73cdcf0f1f14140405d75ea3807d77a193b7492 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Thu, 26 Aug 2021 18:54:09 +0000 Subject: [PATCH] More updates related to subscription changes, address review comments Signed-off-by: Usha Mandya --- _config.yml | 13 +- _includes/desktop-license-update.md | 16 + _includes/desktop-update.md | 12 +- _includes/eula-modal.html | 10 +- _includes/eula.md | 4 +- ci-cd/best-practices.md | 2 +- desktop/dashboard.md | 20 +- desktop/faqs.md | 8 +- desktop/mac/apple-silicon.md | 2 +- desktop/mac/edge-release-notes.md | 42 +- desktop/mac/images/subscription-terms.png | Bin 144258 -> 114327 bytes desktop/mac/install.md | 37 +- desktop/mac/previous-versions.md | 70 +- desktop/mac/release-notes.md | 56 +- desktop/mac/troubleshoot.md | 16 +- desktop/windows/edge-release-notes.md | 2 +- desktop/windows/install.md | 30 +- desktop/windows/previous-versions.md | 88 +- desktop/windows/release-notes.md | 34 +- desktop/windows/troubleshoot.md | 12 +- develop/scan-images/index.md | 6 +- docker-hub/access-tokens.md | 14 +- docker-hub/builds/index.md | 4 +- docker-hub/builds/previous-versions.md | 1344 +++++++++++++++++ docker-hub/convert-account.md | 4 +- docker-hub/deactivate-account.md | 4 +- docker-hub/download-rate-limit.md | 6 +- docker-hub/image-management.md | 6 +- docker-hub/index.md | 2 +- docker-hub/release-notes.md | 2 +- docker-hub/vulnerability-scanning.md | 6 +- engine/security/seccomp.md | 8 +- get-docker.md | 2 - subscription/add-seats.md | 18 +- subscription/downgrade.md | 28 +- subscription/faq.md | 2 +- .../images/billing-personal-account.png | Bin 99721 -> 49195 bytes subscription/index.md | 60 +- subscription/remove-seats.md | 14 +- subscription/upgrade.md | 88 +- 40 files changed, 1700 insertions(+), 392 deletions(-) create mode 100644 _includes/desktop-license-update.md create mode 100644 docker-hub/builds/previous-versions.md 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 @@