Skip to content

Commit 20a79d7

Browse files
add subscription pages
1 parent 3cbb955 commit 20a79d7

File tree

9 files changed

+164
-230
lines changed

9 files changed

+164
-230
lines changed

content/manuals/security/faqs/single-sign-on/idp-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: SSO and identity provider FAQs
2+
title: SSO identity provider FAQs
33
linkTitle: Identity providers
44
description: Frequently asked questions about Docker SSO and identity provider configuration
55
keywords: identity providers, SSO IdP, SAML, Azure AD, Entra ID, certificate management

content/manuals/subscription/_index.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Subscription
3-
description: Learn about subscription features and how to manage your subscription
4-
keywords: Docker, pricing, billing, Pro, Team, business, subscription, tier
3+
description: Learn about Docker subscription features and how to manage your subscription
4+
keywords: docker subscription, pricing, billing, pro, team, business, subscription management
55
weight: 50
66
params:
77
sidebar:
@@ -40,10 +40,8 @@ aliases:
4040
- /docker-hub/billing/faq/
4141
---
4242

43-
A Docker subscription includes licensing for commercial use of Docker products
44-
including Docker Desktop, Docker Hub, Docker Build Cloud, Docker Scout, and
45-
Testcontainers Cloud.
43+
Docker subscriptions provide licensing for commercial use of Docker products including Docker Desktop, Docker Hub, Docker Build Cloud, Docker Scout, and Testcontainers Cloud.
4644

47-
Use the resources here to decide what subscription you need, or manage an existing subscription.
45+
Use these resources to choose the right subscription for your needs or manage your existing subscription.
4846

4947
{{< grid items="grid_subscriptions" >}}
Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
description: Learn how to change your Docker subscription
3-
keywords: Docker Hub, upgrade, downgrade, subscription, Pro, Team, business, pricing
42
title: Change your subscription
3+
description: Upgrade or downgrade your Docker subscription and understand billing changes
4+
keywords: upgrade subscription, downgrade subscription, docker pricing, subscription changes
55
aliases:
66
- /docker-hub/upgrade/
77
- /docker-hub/billing/upgrade/
@@ -18,27 +18,20 @@ weight: 30
1818

1919
{{% include "tax-compliance.md" %}}
2020

21-
The following sections describe how to change plans when you have a Docker
22-
subscription or legacy Docker subscription.
21+
You can upgrade or downgrade your Docker subscription at any time to match your changing needs. This page explains how to make subscription changes and what to expect with billing and feature access.
2322

2423
> [!NOTE]
2524
>
26-
> Legacy Docker plans apply to Docker subscribers who last purchased or renewed
27-
> their subscription before December 10, 2024. These subscribers will keep
28-
> their current subscription and pricing until their next renewal date that falls on or
29-
> after December 10, 2024. To see purchase or renewal history, view your
30-
> [billing history](../billing/history.md). For more details about legacy
31-
> subscriptions, see [Announcing Upgraded Docker
32-
> Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/).
25+
> Legacy Docker subscribers have different interfaces for subscription changes. Legacy subscriptions apply to subscribers who last purchased or renewed before December 10, 2024. For details, see [Announcing Upgraded Docker Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/).
3326
3427
## Upgrade your subscription
3528

36-
When you upgrade a Docker subscription, you immediately have access to all the features and entitlements available in your Docker subscription. For detailed information on features available in each subscription, see [Docker Pricing](https://www.docker.com/pricing).
29+
When you upgrade your Docker subscription, you immediately get access to all features and entitlements in your new subscription tier. For detailed feature information, see [Docker Pricing](https://www.docker.com/pricing).
3730

3831
{{< tabs >}}
3932
{{< tab name="Docker subscription" >}}
4033

41-
To upgrade your Docker subscription:
34+
To upgrade your subscription:
4235

4336
1. Sign in to [Docker Home](https://app.docker.com/) and select the organization
4437
you want to upgrade.
@@ -55,9 +48,7 @@ you want to upgrade.
5548
{{< /tab >}}
5649
{{< tab name="Legacy Docker subscription" >}}
5750

58-
You can upgrade a legacy Docker Core, Docker Build Cloud, or Docker Scout subscription to a Docker subscription that includes access to all tools.
59-
60-
Contact [Docker sales](https://www.docker.com/pricing/contact-sales/) to upgrade your legacy Docker subscription.
51+
To upgrade your legacy Docker subscription to a new Docker subscription that includes access to all tools, contact [Docker sales](https://www.docker.com/pricing/contact-sales/).
6152

6253
{{< /tab >}}
6354
{{< /tabs >}}
@@ -66,21 +57,26 @@ Contact [Docker sales](https://www.docker.com/pricing/contact-sales/) to upgrade
6657

6758
You can downgrade your Docker subscription at anytime before the renewal date. The unused portion of the subscription isn't refundable or creditable.
6859

69-
When you downgrade your subscription, access to paid features is available until the next billing cycle. The downgrade takes effect on the next billing cycle.
60+
You can downgrade your Docker subscription at any time before the renewal date. The unused portion isn't refundable, but you retain access to paid features until the next billing cycle.
7061

71-
> [!IMPORTANT]
72-
>
73-
> If you downgrade your personal account from a Pro subscription to a Personal subscription, note that [Personal subscriptions](details.md#docker-personal) don't include collaborators for private repositories. Only one private repository is included with a Personal subscription. When you downgrade, all collaborators will be removed and additional private repositories are locked.
74-
> Before you downgrade, consider the following:
75-
> - Team size: You may need to reduce the number of team members and convert any private repositories to public repositories or delete them. For information on features available in each tier, see [Docker Pricing](https://www.docker.com/pricing).
76-
> - SSO and SCIM: If you want to downgrade a Docker Business subscription and your organization uses single sign-on (SSO) for user authentication, you need to remove your SSO connection and verified domains before downgrading. After removing the SSO connection, any organization members that were auto-provisioned (for example, with SCIM) need to set up a password to sign in without SSO. To do this, users can [reset their password at sign in](/accounts/create-account/#reset-your-password).
62+
### Downgrade considerations
63+
64+
Consider the following before downgrading:
65+
66+
- Team size and repositories: You may need to reduce team members and convert private repositories to public or delete them based on your new subscription limits.
67+
- SSO and SCIM: If downgrading from Docker Business and your organization uses single sign-on, remove your SSO connection and verified domains first. Organization members who were auto-provisioned through SCIM need to reset their passwords to sign in without SSO.
68+
- Private repository collaborators: Personal subscriptions don't include collaborators for private repositories. When downgrading from Pro to Personal, all collaborators are removed and additional private repositories are locked.
69+
70+
For feature limits in each tier, see [Docker Pricing](https://www.docker.com/pricing).
7771

7872
{{< tabs >}}
7973
{{< tab name="Docker subscription" >}}
8074

81-
If you have a [sales-assisted Docker Business subscription](details.md#sales-assisted), contact your account manager to downgrade your subscription.
75+
> [!IMPORTANT]
76+
>
77+
> If you have a [sales-assisted Docker Business subscription](details.md#sales-assisted), contact your account manager to downgrade your subscription.
8278
83-
To downgrade your Docker subscription:
79+
To downgrade your subscription:
8480

8581
1. Sign in to [Docker Home](https://app.docker.com/) and select
8682
the organization you want to downgrade.
@@ -91,9 +87,9 @@ the organization you want to downgrade.
9187
{{< /tab >}}
9288
{{< tab name="Legacy Docker subscription" >}}
9389

94-
If you have a [sales-assisted Docker Business subscription](details.md#sales-assisted), contact your account manager to downgrade your subscription.
95-
96-
### Downgrade Legacy Docker subscription
90+
> [!IMPORTANT]
91+
>
92+
> If you have a [sales-assisted Docker Business subscription](details.md#sales-assisted), contact your account manager to downgrade your subscription.
9793
9894
To downgrade your legacy Docker subscription:
9995

@@ -103,8 +99,6 @@ To downgrade your legacy Docker subscription:
10399
1. On the upgrade page, select **Downgrade** in the **Free Team** plan card.
104100
1. Follow the on-screen instructions to complete your downgrade.
105101

106-
### Downgrade Docker Build Cloud subscription
107-
108102
To downgrade your Docker Build Cloud subscription:
109103

110104
1. Sign in to [Docker Home](https://app.docker.com) and select **Build Cloud**.
@@ -115,6 +109,6 @@ To downgrade your Docker Build Cloud subscription:
115109
{{< /tab >}}
116110
{{< /tabs >}}
117111

118-
## Pause a subscription
112+
## Subscription pause policy
119113

120-
You can't pause or delay a subscription. If a subscription invoice hasn't been paid on the due date, there's a 15 day grace period, including the due date.
114+
You can't pause or delay a subscription. If a subscription invoice isn't paid by the due date, there's a 15-day grace period starting from the due date.

content/manuals/subscription/desktop-license.md

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
11
---
22
title: Docker Desktop license agreement
3-
description: Information about Docker Desktop's license agreement
4-
keywords: license agreement, docker desktop, subscription
3+
description: Information about Docker Desktop's license agreement and commercial use requirements
4+
keywords: docker desktop license, subscription service agreement, commercial use, licensing terms
55
weight: 40
66
---
77

8-
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.
8+
Docker Desktop is licensed under the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement). When you download and install Docker Desktop, you're asked to agree to these terms.
99

10-
Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement) states:
10+
The Docker Subscription Service Agreement states:
1111

12-
- Docker Desktop is 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.
13-
- Otherwise, it requires a paid subscription for professional use.
14-
- Paid subscriptions are also required for government entities.
15-
- The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
12+
- Docker Desktop is free for:
13+
- Small businesses (fewer than 250 employees AND less than $10 million in annual revenue)
14+
- Personal use
15+
- Education
16+
- Non-commercial open source projects
17+
- Docker Desktop requires a paid subscription for:
18+
- Professional use in larger organizations
19+
- Government entities
20+
- Commercial use beyond the free tier limits
21+
- Paid subscriptions that include Docker Desktop:
22+
- Docker Pro, Team, and Business subscriptions
1623

17-
Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/) and [Docker subscription FAQs](https://www.docker.com/pricing/faq) to learn how this may affect companies using Docker Desktop.
24+
## Understanding licensing terms
25+
26+
For detailed information about how these terms may affect your organization, see:
27+
28+
- [Subscription updates blog post](https://www.docker.com/blog/updating-product-subscriptions/)
29+
- [Docker subscription FAQs](https://www.docker.com/pricing/faq) to learn how this may affect companies using Docker Desktop.
1830

1931
> [!NOTE]
2032
>
2133
> The licensing and distribution terms for Docker and Moby open-source projects, such as Docker Engine, aren't changing.
2234
2335
Docker Desktop is built using open-source software. For information about the licensing of open-source components in Docker Desktop, select the whale menu > **About Docker Desktop** > **Acknowledgements**.
2436

37+
## Open source components
38+
2539
Docker Desktop distributes some components that are licensed under the
2640
GNU General Public License. Select [here](https://download.docker.com/opensource/License.tar.gz) to download the source for these components.
27-
28-
> [!TIP]
29-
>
30-
> Explore [Docker subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you.

0 commit comments

Comments
 (0)