diff --git a/desktop/index.md b/desktop/index.md index e07901dc49..f881f0ee1c 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -12,7 +12,11 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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 c962e1226a..8c4884866b 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -8,7 +8,12 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn +> more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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. diff --git a/desktop/mac/release-notes/3.x.md b/desktop/mac/release-notes/3.x.md index cca45da02c..a76359ab10 100644 --- a/desktop/mac/release-notes/3.x.md +++ b/desktop/mac/release-notes/3.x.md @@ -13,7 +13,11 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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 abc4217db2..3d680c3da9 100644 --- a/desktop/mac/release-notes/index.md +++ b/desktop/mac/release-notes/index.md @@ -12,7 +12,11 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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 53bc5bc2ef..8992912c6d 100644 --- a/desktop/windows/install.md +++ b/desktop/windows/install.md @@ -14,7 +14,11 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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 9924c9687a..42eb548742 100644 --- a/desktop/windows/release-notes/3.x.md +++ b/desktop/windows/release-notes/3.x.md @@ -13,7 +13,11 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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 be253a7464..fe834817f0 100644 --- a/desktop/windows/release-notes/index.md +++ b/desktop/windows/release-notes/index.md @@ -12,7 +12,11 @@ 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 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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 389bffa38b..79515c5382 100644 --- a/desktop/windows/wsl.md +++ b/desktop/windows/wsl.md @@ -11,7 +11,11 @@ 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). +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .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. diff --git a/engine/api/sdk/index.md b/engine/api/sdk/index.md index d8e0ea9926..891e0c3e80 100644 --- a/engine/api/sdk/index.md +++ b/engine/api/sdk/index.md @@ -194,6 +194,7 @@ file them with the library maintainers. | C# | [Docker.DotNet](https://github.com/ahmetalpbalkan/Docker.DotNet) | | C++ | [lasote/docker_client](https://github.com/lasote/docker_client) | | Clojure | [clj-docker-client](https://github.com/into-docker/clj-docker-client) | +| Clojure | [contajners](https://github.com/lispyclouds/contajners) | | Dart | [bwu_docker](https://github.com/bwu-dart/bwu_docker) | | Erlang | [erldocker](https://github.com/proger/erldocker) | | Gradle | [gradle-docker-plugin](https://github.com/gesellix/gradle-docker-plugin) | diff --git a/get-docker.md b/get-docker.md index c103f92c2c..db904b479d 100644 --- a/get-docker.md +++ b/get-docker.md @@ -10,7 +10,12 @@ 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 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"}. +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn +> more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + 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 71bd46b50f..113fffb671 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -59,7 +59,11 @@ 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 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"}. +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) now requires a paid +> subscription. The grace period for those that will require a paid subscription +> ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. {: .important} Welcome! We are excited that you want to learn Docker. diff --git a/language/nodejs/develop.md b/language/nodejs/develop.md index 791b6639e7..654cee8e6c 100644 --- a/language/nodejs/develop.md +++ b/language/nodejs/develop.md @@ -60,7 +60,7 @@ server.use( '/', mocks.server( server.Router(), false, false ) ) server.start() ``` -We’ve add the `ronin-database` module and we updated the code to connect to the database and set the in-memory flag to false. We now need to rebuild our image so it contains our changes. +We’ve added the `ronin-database` module and we updated the code to connect to the database and set the in-memory flag to false. We now need to rebuild our image so it contains our changes. First let’s add the `ronin-database` module to our application using npm. diff --git a/registry/notifications.md b/registry/notifications.md index a17ba776e1..6f44c8a251 100644 --- a/registry/notifications.md +++ b/registry/notifications.md @@ -159,7 +159,7 @@ request coming to an endpoint. An example of a full event may look as follows: -```http request +```http GET /callback HTTP/1.1 Host: application/vnd.docker.distribution.events.v1+json Authorization: Bearer diff --git a/subscription/index.md b/subscription/index.md index c8e868d49d..26a23dc0d6 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -16,8 +16,10 @@ On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product- - 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 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. + - It requires a paid subscription (**Pro, Team, or Business**), for as little as $5 a month, for commercial use in larger enterprises. + - The grace period for those that will require a paid subscription ends on + January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"}. - 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. @@ -54,7 +56,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www. **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 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_). +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, [SSO](../single-sign-on/index.md), 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="_" id="dkr_docs_subscription_btl"}. @@ -66,7 +68,8 @@ Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker- - 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 grace period for those that will require a paid subscription ends on January 31, 2022. [Learn more](https://www.docker.com/blog/the-grace-period-for-the-docker-subscription-service-agreement-ends-soon-heres-what-you-need-to-know/){: + target="_blank" rel="noopener" class="_" id="dkr_docs_cta"} - 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.