Skip to content

Commit 2502083

Browse files
subscription: add enhanced plan info (#20864)
* added enhanced plan announcement Signed-off-by: Craig Osterhout <[email protected]> * add note to service accounts Signed-off-by: Craig Osterhout <[email protected]> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Allie Sadler <[email protected]> --------- Signed-off-by: Craig Osterhout <[email protected]> Co-authored-by: Allie Sadler <[email protected]>
1 parent 3700434 commit 2502083

File tree

9 files changed

+118
-3
lines changed

9 files changed

+118
-3
lines changed

content/includes/new-plans.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
---
3+
4+
> [!IMPORTANT]
5+
>
6+
> Docker is introducing enhanced subscription plans. Our new plans are packed
7+
> with more features, higher usage limits, and simplified pricing. The new
8+
> subscription plans take effect at your next renewal date that occurs on or
9+
> after November 15, 2024. No charges on Docker Hub image pulls or storage will
10+
> be incurred between November 15, 2024, and January 31, 2025. See [Announcing
11+
> Upgraded Docker
12+
> Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/)
13+
> for more details and learn how your usage fits into these updates.

content/manuals/billing/build-billing.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ keywords: payments, billing, subscription, build, cloud, Build Cloud, remote bui
66
weight: 20
77
---
88

9+
{{< include "new-plans.md" >}}
10+
911
Build Cloud is a next-gen build tool that enables improved build speed, a shared build cache, and native multi-platform builds. Build Cloud is available for free with an existing Docker subscription. To get additional seats and increase your available build minutes, you can buy a subscription to enhance your builds.
1012

1113
If you don’t have a Docker Core subscription, you can buy Docker Build Cloud Team and create a team in Docker Build Cloud.

content/manuals/billing/core-billing/get-started-core.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ description: Learn how to start your Docker Core subscription.
55
keywords: payments, billing, subscription, invoices, docker core, subscribe
66
---
77

8+
{{< include "new-plans.md" >}}
9+
810
{{< include "tax-compliance.md" >}}
911

1012
Docker Core subscriptions offer features and benefits to support both new and professional developers, as well as plans for individuals, teams, and enterprise businesses. To learn more about what's included with each tier, see [Docker Core subscriptions and features](../../subscription/core-subscription/details.md) and [Docker Pricing](https://www.docker.com/pricing/).

content/manuals/billing/scout-billing.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ keywords: payments, billing, subscription, scout, buy docker scout, subscribe to
66
weight: 30
77
---
88

9+
{{< include "new-plans.md" >}}
10+
911
Docker Scout lets users secure their software supply chain and continuously observe and improve their security posture. Docker Scout is free for up to 3 repositories. You can buy Docker Scout Team or Docker Scout Business to turn on Docker Scout for additional repositories. See [Docker Scout subscription and features](../subscription/scout-details.md) to select the plan that works for you.
1012

1113
In this section, learn how to buy and manage a Docker Scout Team subscription for your personal account or for an organization. If you're an organization with multiple teams, a Docker Scout Business plan may be better. To buy Docker Scout Business, [contact sales](https://www.docker.com/products/docker-scout/#contact-sales).

content/manuals/docker-hub/download-rate-limit.md

Lines changed: 91 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,26 @@ linkTitle: Usage and rate limits
66
weight: 30
77
---
88

9-
Understanding your Docker Hub usage and rate limits helps you manage your and
10-
your organization's usage effectively.
9+
{{< include "new-plans.md" >}}
1110

12-
## View Docker Hub usage
11+
Docker may impose usage and rate limits for Docker Hub to ensure fair resource
12+
consumption and maintain service quality. Understanding your usage helps you
13+
manage you and your organization's usage effectively.
14+
15+
## Usage
16+
17+
Usage refers to the amount of data transferred from Docker Hub and the amount of
18+
data stored on Docker Hub.
19+
20+
### Fair use
21+
22+
When utilizing the Docker Platform, users should be aware that excessive data
23+
transfer or storage can lead to throttling, or additional charges. To ensure
24+
fair resource usage and maintain service quality, we reserve the right to impose
25+
restrictions or apply additional charges to accounts exhibiting excessive data
26+
and storage consumption.
27+
28+
### View Docker Hub usage
1329

1430
You can download a CSV file of your or your organization's Docker Hub usage. To
1531
download the file:
@@ -42,6 +58,46 @@ The file contains the following comma separated values.
4258
| `version_checks` | The number of version checks accumulated for the date and hour of each image repository. Depending on the client, a pull request can do a version check to verify the existence of an image or tag without downloading it. | This helps identify the frequency of version checks, which you can use to analyze usage trends and potential unexpected behaviors. |
4359
| `pulls` | The number of pulls accumulated for the date and hour of each image repository. | This helps identify the frequency of repository pulls, which you can use to analyze usage trends and potential unexpected behaviors. |
4460

61+
### Optimize and manage Docker Hub usage
62+
63+
Use the following steps to help optimize and manage your Docker Hub usage for
64+
both individuals and organizations.
65+
66+
1. [View your Docker Hub usage](#view-docker-hub-usage).
67+
68+
2. Use the Docker Hub usage data to identify which accounts consume the most
69+
data, determine peak usage times, and identify which images are related to
70+
the most data usage. In addition, look for usage trends, such as the
71+
following:
72+
73+
- Inefficient pull behavior: Identify frequently accessed repositories to
74+
assess whether you can optimize caching practices or consolidate usage to
75+
reduce pulls.
76+
- Inefficient automated systems: Check which automated tools, such as CI/CD
77+
pipelines, may be causing higher pull rates, and configure them to avoid
78+
unnecessary image pulls.
79+
80+
3. Optimize image pulls by doing the following:
81+
82+
- Use caching: Implement local image caching via
83+
[mirroring](/docker-hub/mirror/) or within your CI/CD pipelines to reduce
84+
redundant pulls.
85+
- Automate manual workflows: Avoid unnecessary pulls by configuring automated
86+
systems to pull only when a new version of an image is available.
87+
88+
4. Optimize the size of repositories by regularly auditing and removing
89+
untagged, unused, or outdated images.
90+
91+
5. Increase your limits by upgrading or purchasing add-ons. For details, see
92+
[Docker pricing](https://www.docker.com/pricing/).
93+
94+
6. For organizations, monitor and enforce organizational policies by doing the
95+
following:
96+
97+
- Routinely [view Docker Hub usage](#view-docker-hub-usage) to monitor usage.
98+
- [Enforce sign-in](/security/for-admins/enforce-sign-in/) to ensure that you
99+
can monitor the usage of your users and users receive higher usage limits.
100+
45101
## Rate limit
46102

47103
A user's rate limit is equal to the highest entitlement of their personal
@@ -62,6 +118,38 @@ URLs (`/v2/*/manifests/*`).
62118
and [Docker Verified Publisher](https://www.docker.com/partners/programs)
63119
programs.
64120

121+
122+
> [!IMPORTANT]
123+
>
124+
> Docker is introducing enhanced subscription plans. Our new plans are packed
125+
> with more features, higher usage limits, and simplified pricing. The new
126+
> subscription plans take effect at your next renewal date that occurs on or
127+
> after November 1, 2024. No charges on Docker Hub image pulls or storage will
128+
> be incurred between November 15, 2024, and January 31, 2025. See [Announcing
129+
> Upgraded Docker
130+
> Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/)
131+
> for more details and learn how your usage fits into these updates.
132+
>
133+
> Note that when these changes take effect, the following new definition of a
134+
> pull request and limits will take effect:
135+
>
136+
> - A Docker pull request includes both a version check and any download that
137+
> occurs as a result of the pull. Depending on the client, a `docker pull` can
138+
> verify the existence of an image or tag without downloading it by performing
139+
> a version check.
140+
> - A pull request for a normal image makes one pull for a [single
141+
> manifest](https://github.com/opencontainers/image-spec/blob/main/manifest.md).
142+
> - A pull request for a multi-arch image will count as one pull for each
143+
> different architecture.
144+
> - Pulls are accounted to the user doing the pull, not to the owner of the
145+
> image.
146+
>
147+
> There will be no image pull rate limit for users or automated systems with a
148+
> paid subscription. Anonymous and Docker Personal users using Docker Hub will
149+
> experience rate limits on image pull requests. For authenticated users, there
150+
> will be a 40 pull/hour rate limit per user; for unauthenticated usage, there
151+
> will be a 10 pull/hour rate limit per IP address.
152+
65153
### What's the download rate limit on Docker Hub?
66154

67155
Docker Hub limits the number of Docker image downloads, or pulls, based on the

content/manuals/docker-hub/service-accounts.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ title: Service accounts
55
weight: 50
66
---
77

8+
{{< include "new-plans.md" >}}
9+
810
> [!NOTE]
911
>
1012
> Service accounts require a

content/manuals/subscription/build-cloud/build-details.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ aliases:
66
- /subscription/build-details/
77
---
88

9+
{{< include "new-plans.md" >}}
10+
911
You can enhance your teams' builds with a Build Cloud subscription. This page describes the features available for the different subscription tiers. To compare features available for each tier, see [Docker Build Cloud pricing](https://www.docker.com/products/build-cloud/#pricing).
1012

1113
## Docker Build Cloud Starter

content/manuals/subscription/core-subscription/details.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ aliases:
88
weight: 10
99
---
1010

11+
{{< include "new-plans.md" >}}
12+
1113
You can do more with Docker with a Docker Core subscription, such as add collaborators, create scoped access tokens, and create private repositories. This page provides an overview of each subscription tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
1214

1315
The following describes some of the key features included with your Docker Core subscription:

content/manuals/subscription/scout-details.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ keywords: subscription, free, team, business, features
55
weight: 30
66
---
77

8+
{{< include "new-plans.md" >}}
9+
810
This page provides an overview of the subscription plans for Docker Scout. To compare features available for each plan, see [Docker Scout Pricing](https://docker.com/products/docker-scout).
911

1012
## Docker Scout Free

0 commit comments

Comments
 (0)