diff --git a/_includes/desktop-license-update.md b/_includes/desktop-license-update.md index b0362b5bc5..8c330492d9 100644 --- a/_includes/desktop-license-update.md +++ b/_includes/desktop-license-update.md @@ -3,7 +3,7 @@ **Here’s a summary of the key changes:** - Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} includes 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 **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 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 existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription . diff --git a/compose/index.md b/compose/index.md index 638ce84ff7..7245511f26 100644 --- a/compose/index.md +++ b/compose/index.md @@ -8,6 +8,12 @@ redirect_from: - /compose/swarm/ --- + +> **Accelerating new features in Docker Desktop** +> +> Docker Desktop helps you build, share, and run containers easily on Mac and Windows as you do on Linux. Docker handles the complex setup and allows you to focus on writing the code. Thanks to the positive support we received on the [subscription updates](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}, we've started working on [Docker Desktop for Linux](https://www.docker.com/blog/accelerating-new-features-in-docker-desktop/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"} which is the second-most popular feature request in our public roadmap. If you are interested in early access, sign up for our [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. +{: .important} + >**Looking for Compose file reference?** [Find the latest version here](compose-file/index.md). Compose is a tool for defining and running multi-container Docker applications. diff --git a/desktop/faqs.md b/desktop/faqs.md index 9d26b87541..77f79982db 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -24,7 +24,7 @@ By default, Docker Desktop is installed at the following location: ### Do I need to pay to use Docker Desktop? -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. +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 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. 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="_"}. Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} to learn how companies using Docker Desktop may be affected. For information about Docker Desktop licensing, see [Docker Desktop License Agreement](../subscription/index.md#docker-desktop-license-agreement). diff --git a/desktop/index.md b/desktop/index.md index bd64e94402..8fed46cf91 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -12,7 +12,7 @@ redirect_from: > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../subscription/index.md#docker-desktop-license-agreement). +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../subscription/index.md#docker-desktop-license-agreement). {: .important} Docker Desktop is an easy-to-install application for your Mac or Windows environment diff --git a/desktop/mac/install.md b/desktop/mac/install.md index cceab818a6..1336d7ac79 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -6,6 +6,11 @@ redirect_from: - /docker-for-mac/install/ --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"} and the [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement). +{: .important} + Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, instructions to install and update Docker Desktop for Mac. > Download Docker Desktop for Mac diff --git a/desktop/mac/release-notes/3.x.md b/desktop/mac/release-notes/3.x.md index 77b6d4c2ea..cca45da02c 100644 --- a/desktop/mac/release-notes/3.x.md +++ b/desktop/mac/release-notes/3.x.md @@ -13,7 +13,7 @@ This page contains release notes for Docker Desktop for Mac 3.x. > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). {: .important} This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. diff --git a/desktop/mac/release-notes/index.md b/desktop/mac/release-notes/index.md index 30c3a85ab4..49adddb5b5 100644 --- a/desktop/mac/release-notes/index.md +++ b/desktop/mac/release-notes/index.md @@ -12,7 +12,7 @@ redirect_from: > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). {: .important} This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. diff --git a/desktop/windows/install.md b/desktop/windows/install.md index fed487e055..53bc5bc2ef 100644 --- a/desktop/windows/install.md +++ b/desktop/windows/install.md @@ -14,7 +14,7 @@ redirect_from: > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement). +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"} and the [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement). {: .important} Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows. diff --git a/desktop/windows/release-notes/3.x.md b/desktop/windows/release-notes/3.x.md index b40d8e2061..9924c9687a 100644 --- a/desktop/windows/release-notes/3.x.md +++ b/desktop/windows/release-notes/3.x.md @@ -13,7 +13,7 @@ This page contains release notes for Docker Desktop for Windows 3.x. > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). {: .important} This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. diff --git a/desktop/windows/release-notes/index.md b/desktop/windows/release-notes/index.md index 2656689662..8652ec4633 100644 --- a/desktop/windows/release-notes/index.md +++ b/desktop/windows/release-notes/index.md @@ -12,7 +12,7 @@ redirect_from: > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022 for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../../subscription/index.md#docker-desktop-license-agreement). {: .important} This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. diff --git a/desktop/windows/wsl.md b/desktop/windows/wsl.md index ce05c89299..75ce01beba 100644 --- a/desktop/windows/wsl.md +++ b/desktop/windows/wsl.md @@ -9,6 +9,11 @@ toc_min: 2 toc_max: 3 --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"} and the [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement). +{: .important} + Windows Subsystem for Linux (WSL) 2 introduces a significant architectural change as it is a full Linux kernel built by Microsoft, allowing Linux containers to run natively without emulation. With Docker Desktop running on WSL 2, users can leverage Linux workspaces and avoid having to maintain both Linux and Windows build scripts. In addition, WSL 2 provides improvements to file system sharing, boot time, and allows access to some cool new features for Docker Desktop users. Docker Desktop uses the dynamic memory allocation feature in WSL 2 to greatly improve the resource consumption. This means, Docker Desktop only uses the required amount of CPU and memory resources it needs, while enabling CPU and memory-intensive tasks such as building a container to run much faster. diff --git a/engine/install/index.md b/engine/install/index.md index 339e20aa27..7cbfa28dc8 100644 --- a/engine/install/index.md +++ b/engine/install/index.md @@ -28,6 +28,10 @@ redirect_from: - /install/linux/docker-ee/oracle/ --- +> **Docker Desktop for Linux** +> +> Docker Desktop helps you build, share, and run containers easily on Mac and Windows as you do on Linux. Docker handles the complex setup and allows you to focus on writing the code. Thanks to the positive support we received on the [subscription updates](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}, we've started working on [Docker Desktop for Linux](https://www.docker.com/blog/accelerating-new-features-in-docker-desktop/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"} which is the second-most popular feature request in our public roadmap. If you are interested in early access, sign up for our [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. +{: .important} ## Supported platforms diff --git a/get-docker.md b/get-docker.md index d49cb8bbd0..c103f92c2c 100644 --- a/get-docker.md +++ b/get-docker.md @@ -10,7 +10,7 @@ redirect_from: > **Update to the Docker Desktop terms** > -> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .important} Docker is an open platform for developing, shipping, and running applications. diff --git a/get-started/index.md b/get-started/index.md index 55b49667d8..04ab9e4466 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -57,6 +57,10 @@ redirect_from: - /windows/step_two/ --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in annual revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. +{: .important} Welcome! We are excited that you want to learn Docker. diff --git a/subscription/index.md b/subscription/index.md index 4cab67885e..c8e868d49d 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -64,7 +64,7 @@ Docker Desktop is licensed under the Docker Subscription Service Agreement. When Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} includes 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 **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 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 existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription .