Skip to content

Commit e73cdcf

Browse files
usha-mandyausha-mandya
committed
More updates related to subscription changes, address review comments
Signed-off-by: Usha Mandya <[email protected]>
1 parent 8c30296 commit e73cdcf

40 files changed

+1701
-393
lines changed

‎_config.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,15 @@ distribution_version: "2.7"
3131
# URLs for license and conditions
3232
# TODO move these inline once these are stable / final
3333
# TODO add final link to DSST
34-
dsst_url: "https://www.docker.com/sites/default/files/d8/2021-01/Docker%2520Data%2520Processing%2520Agreement%25202021.pdf" # Docker Subscription Service Terms
34+
dsst_url: "https://www.docker.com/legal/docker-subscription-service-agreement" # Docker Subscription Service Agreement
3535

36-
# Link to Docker Subscription Service Terms announcement blog-post
37-
# TODO add final link to Docker Subscription Service Terms announcement blog-post
38-
dsst_announcement_url: "XXXXXXX ADD BLOG LINK"
36+
# Link to Docker Subscription Service Agreement announcement blog-post
37+
dsst_announcement_url: "https://www.docker.com/blog/updating-product-subscriptions/"
3938

40-
# Link to Docker Subscription Service Terms FAQst
41-
# TODO add link to Docker Subscription Service Terms FAQs
42-
dsst_faqs_url: "XXXXXXX ADD FAQs LINK"
39+
# Link to Docker Subscription Service Agreement FAQs
40+
dsst_faqs_url: "https://www.docker.com/pricing/faq"
4341

4442
# Link to Docker Terms of Service
45-
# TODO add link to Docker Terms of Service
4643
tos_url: "https://www.docker.com/legal/docker-terms-service"
4744

4845
# List of plugins to enable for local development builds. Mostly the same as

‎_includes/desktop-license-update.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!-- This is a summary of the license changes related to Docker Desktop. It is included in the Mac and Windows Install topic -->
2+
3+
> **Docker Subscription Service Agreement**
4+
>
5+
> 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.
6+
7+
**Here’s a summary of the key changes:**
8+
9+
- Our Docker Subscription Service Agreement include a change to the terms of use for Docker Desktop
10+
- 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.
11+
- It requires a paid subscription for professional use in larger enterprises.
12+
- 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.
13+
- The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription .
14+
- The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
15+
16+

‎_includes/desktop-update.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ When an update is available, Docker Desktop displays an icon to indicate the ava
44

55
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.
66

7-
> **Docker Subscription Service Terms**
7+
> **Docker Subscription Service Agreement**
88
>
9-
> 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.
10-
11-
![Snooze update](/desktop/mac/images/snooze-update.png){:width="500px"}
9+
> 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.
1210
1311
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.
1412

15-
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.
13+
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.
1614

1715
> **Important**
1816
>
19-
> 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.
17+
> 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.
2018
{: .important}
2119

22-
Docker Desktop starts after you accept the terms of service.
20+
Docker Desktop starts after you accept the terms.

‎_includes/eula-modal.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ <h5 class="modal-title">Download Docker Desktop</h5>
99
</div>
1010
<div class="modal-body">
1111
<p>
12-
We've updated the <a href="{{ site.dsst_url }}" target="_blank" rel="noopener" class="_">Docker Subscription Service Terms</a>.
13-
Please read <a href="{{ site.dsst_announcement_url }}" target="_blank" rel="noopener" class="_">the announcement</a>
14-
and <a href="{{ site.dsst_faqs_url }}" target="_blank" rel="noopener" class="_">FAQs</a>
12+
We've updated the <a href="https://www.docker.com/legal/docker-subscription-service-agreement" target="_blank" rel="noopener" class="_">Docker Subscription Service Agreement</a>.
13+
Please read <a href="https://www.docker.com/blog/updating-product-subscriptions/" target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_blog_btl">the announcement</a>
14+
and <a href="https://www.docker.com/pricing/faq" target="_blank" rel="noopener" class="_">FAQs</a>
1515
to learn how companies using Docker Desktop may be affected.
1616
</p>
1717
<p>
18-
By clicking “Accept and Download”, you agree to these updated
19-
<a href="{{ site.tos_url }}" target="_blank" rel="noopener" class="_">terms of service</a>,
18+
By clicking "Accept and Download", you agree to these updated
19+
<a href="{{ site.tos_url }}" target="_blank" rel="noopener" class="_">terms</a>,
2020
the <a href="https://www.docker.com/legal/data-processing-agreement" target="_blank" rel="noopener" class="_">Docker Data Processing Agreement</a>,
2121
and the <a href="https://www.docker.com/legal/docker-privacy-policy" target="_blank" rel="noopener" class="_">Data Privacy Policy</a>.
2222
</p>

‎_includes/eula.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- This text will be included in topics containing Docker Desktop download URLs -->
2-
<span class="no-js">We've updated the [Docker Subscription Service Terms]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}.
2+
<span class="no-js">We've updated the [Docker Subscription Service Agreement]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}.
33
Please [read the announcement]({{ site.dsst_announcement_url }}){: target="_blank" rel="noopener" class="_"}
44
and [FAQs]({{ site.dsst_faqs_url }}){: target="_blank" rel="noopener" class="_"}
55
to learn how companies using Docker Desktop may be affected.
6-
By downloading Docker Desktop, you agree to these updated [terms of service]({{ site.tos_url }}){: target="_blank" rel="noopener" class="_"},
6+
By downloading Docker Desktop, you agree to these updated [terms]({{ site.tos_url }}){: target="_blank" rel="noopener" class="_"},
77
the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"},
88
and the [Data Privacy Policy](https://www.docker.com/legal/docker-privacy-policy){: target="_blank" rel="noopener" class="_"}.</span>

‎ci-cd/best-practices.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ We know there are a lot more tips and tricks for using Docker in CI, however, we
4040

4141
> **Note**
4242
>
43-
> 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="_"} .
43+
> 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="_"}.
4444
4545
For information on how to configure GitHub Actions CI/CD pipeline, see [Configure GitHub Actions](github-actions.md).

‎desktop/dashboard.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ To interact with remote repositories:
223223

224224
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.
225225

226-
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.
226+
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.
227227

228228
## Explore volumes
229229

230230
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.
231231

232-
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.
232+
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.
233233

234234
{% include upgrade-cta.html
235235
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:
241241

242242
{% assign yes = '![yes](/images/green-check.svg){: .inline style="height: 14px; margin: 0 auto"}' %}
243243

244-
| Feature | Free | Pro | Team |
245-
|:----------------------------------------------|:---------:|:---------:|:--------:|
246-
| View, create, and delete volumes | {{ yes }} | {{ yes }} | {{ yes }} |
247-
| See which volumes are in use | {{ yes }} | {{ yes }} | {{ yes }} |
248-
| See the size of the volume | {{ yes }} | {{ yes }} | {{ yes }} |
249-
| See volume data details (modified date, size) | X | {{ yes }} | {{ yes }} |
250-
| See which container is using a volume | X | {{ yes }} | {{ yes }} |
251-
| Save or delete files from a volume | X | {{ yes }} | {{ yes }} |
244+
| Feature | Personal | Pro | Team | Business |
245+
|:----------------------------------------------|:---------:|:---------:|:--------:|:--------:|
246+
| View, create, and delete volumes | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} |
247+
| See which volumes are in use | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} |
248+
| See the size of the volume | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} |
249+
| See volume data details (modified date, size) | X | {{ yes }} | {{ yes }} | {{ yes }} |
250+
| See which container is using a volume | X | {{ yes }} | {{ yes }} | {{ yes }} |
251+
| Save or delete files from a volume | X | {{ yes }} | {{ yes }} | {{ yes }} |
252252

253253
### Manage volumes
254254

‎desktop/faqs.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo
1717

1818
### Do I need to pay to use Docker Desktop?
1919

20-
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.
20+
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.
2121
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.
2222

23-
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="_"}.
23+
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="_"}.
2424

2525
[Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
2626

@@ -134,9 +134,9 @@ Starting with Docker Desktop 3.0.0, Stable and Edge releases are combined into a
134134

135135
### Does Docker Desktop offer support?
136136

137-
Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support).
137+
Yes, Docker Desktop offers support for users with a paid Docker subscription. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support).
138138

139-
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="_"}.
139+
For information about Docker subscriptions and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
140140

141141
### What kind of feedback are you looking for?
142142

‎desktop/mac/apple-silicon.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Download Docker Desktop for Mac on Apple silicon:
1919
>
2020
> {%- include eula.md -%}
2121
>
22-
> [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 }
22+
> [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 }
2323
2424
<br>
2525

0 commit comments

Comments
 (0)