Merge pull request #22082 from docker/published-update

publish updates from main

Author: sarahsanders-docker

content/includes/hub-limits.md

@@ -1,8 +1,8 @@
----
----
-
 > [!NOTE]
 >
-> The Docker Hub plan limits will take effect on March 1, 2025. No charges on
-> Docker Hub pulls or storage will be incurred between December 10, 2024,
-> and February 28, 2025.
+> Starting April 1, 2025, all users with a Pro, Team, or Business
+> subscription will have unlimited Docker Hub pulls with fair use.
+> Unauthenticated users and users with a free Personal account have the
+> following pull limits:
+>    - Unauthenticated users: 10 pulls/hour
+>    - Authenticated users with a free account: 100 pulls/hour

content/manuals/billing/docker-hub-pricing.md

@@ -10,28 +10,22 @@ aliases:
 
 {{% include "hub-limits.md" %}}
 
-When using Docker Hub, unauthenticated and Docker Personal users are subject to
-strict limits. In contrast, Docker Pro, Team, and Business users benefit from a
-consumption-based model with a base amount of included usage. This included
-usage is not a hard limit; users can scale or upgrade their subscriptions to
-receive additional usage or use on-demand usage.
-
 The following table provides an overview of the included usage and limits for each
 user type, subject to fair use:
 
 
-| User type                | Pulls per month | Pull rate limit per hour               | Public repositories | Public repository storage | Private repositories | Private repository storage |
-|--------------------------|-----------------|----------------------------------------|---------------------|---------------------------|----------------------|----------------------------|
-| Business (authenticated) | 1M              | Unlimited                              | Unlimited           | Unlimited                 | Unlimited            | Up to 500 GB               |
-| Team (authenticated)     | 100K            | Unlimited                              | Unlimited           | Unlimited                 | Unlimited            | Up to 50 GB                |
-| Pro (authenticated)      | 25K             | Unlimited                              | Unlimited           | Unlimited                 | Unlimited            | Up to 5 GB                 |
-| Personal (authenticated) | Not applicable  | 40                                     | Unlimited           | Unlimited                 | Up to 1              | Up to 2 GB                 |
-| Unauthenticated users    | Not applicable  | 10 per IPv4 address or IPv6 /64 subnet | Not applicable      | Not applicable            | Not applicable       | Not applicable             |
+| User type                | Pull rate limit per hour               | Number of public repositories | Number of private repositories |
+|--------------------------|----------------------------------------|---------------------|----------------------|
+| Business (authenticated) | Unlimited                              | Unlimited           | Unlimited            |
+| Team (authenticated)     | Unlimited                              | Unlimited           | Unlimited            |
+| Pro (authenticated)      | Unlimited                              | Unlimited           | Unlimited            |
+| Personal (authenticated) | 100                                    | Unlimited           | Up to 1              |
+| Unauthenticated users    | 10 per IPv4 address or IPv6 /64 subnet | Not applicable      | Not applicable       |
 
 For more details, see the following:
 
 - [Pull usage and limits](./pulls.md)
-- [Storage usage and limits](./storage.md)
+- [Docker Hub repositories](./repositories.md)
 
 ## Fair use
 

content/manuals/docker-hub/usage/_index.md

@@ -36,10 +36,7 @@ both individuals and organizations:
     - Regularly auditing and [removing entire repositories](../repos/delete.md) with untagged, unused, or outdated images.
     - Using [Image Management](../repos/manage/hub-images/manage.md) to remove stale and outdated images within a repository.
 
-5. Increase your limits by upgrading or purchasing additional consumption. For
-   details, see [Scale your subscription](/manuals/subscription/scale.md).
-
-6. For organizations, monitor and enforce organizational policies by doing the
+5. For organizations, monitor and enforce organizational policies by doing the
    following:
 
    - Routinely [view Docker Hub usage](https://hub.docker.com/usage) to monitor usage.

content/manuals/docker-hub/usage/manage.md

@@ -9,27 +9,19 @@ weight: 10
 {{% include "hub-limits.md" %}}
 
 Unauthenticated and Docker Personal users are subject to hourly pull rate limits
-on Docker Hub. In contrast, Docker Pro, Team, and Business users benefit from a
-base number of included pulls per month without hourly rate restrictions. This
-included usage is flexible, allowing you to scale or upgrade your subscription
-to accommodate additional pulls or utilize on-demand pulls as needed.
-
-Any pulls exceeding the included amounts in each subscription tier will be
-charged at an on-demand rate. To increase your monthly pull allowance and avoid
-on-demand charges, you can [scale](/manuals/subscription/scale.md) or
-[upgrade](/manuals/subscription/change.md) your subscription.
+on Docker Hub. In contrast, Docker Pro, Team, and Business users benefit from
+unlimited pulls per hour.
 
 The following pull usage and limits apply based on your subscription, subject to
 fair use:
 
-
-| User type                | Pulls per month | Pull rate limit per hour               |
-|--------------------------|-----------------|----------------------------------------|
-| Business (authenticated) | 1M              | Unlimited                              |
-| Team (authenticated)     | 100K            | Unlimited                              |
-| Pro (authenticated)      | 25K             | Unlimited                              |
-| Personal (authenticated) | Not applicable  | 40                                     |
-| Unauthenticated Users    | Not applicable  | 10 per IPv4 address or IPv6 /64 subnet |
+| User type                | Pull rate limit per hour               |
+|--------------------------|----------------------------------------|
+| Business (authenticated) | Unlimited                              |
+| Team (authenticated)     | Unlimited                              |
+| Pro (authenticated)      | Unlimited                              |
+| Personal (authenticated) | 100                                     |
+| Unauthenticated Users    | 10 per IPv4 address or IPv6 /64 subnet |
 
 ## Pull definition
 

content/manuals/docker-hub/usage/pulls.md

@@ -0,0 +1,22 @@
+---
+description: Learn about storage usage limits for Docker Hub.
+keywords: Docker Hub, usage, storage, repository
+title: Docker Hub repositories
+linkTitle: Number of repositories
+weight: 20
+aliases:
+    - /docker-hub/usage/storage/
+---
+
+The following number of repositories apply based on your subscription, subject to fair use:
+
+| Plan     | Number of public repositories | Number of private repositories       |
+|----------|-------------------------------|----------------------------|
+| Personal | Unlimited                     | Up to 1 private repository |
+| Pro      | Unlimited                     | Unlimited                  |
+| Team     | Unlimited                     | Unlimited                  |
+| Business | Unlimited                     | Unlimited                  |
+
+## View storage usage and repositories
+
+You can view your storage usage on the [Usage page](https://hub.docker.com/usage/storage) in Docker Hub.

content/manuals/docker-hub/usage/repositories.md

@@ -43,22 +43,23 @@ Docker Personal includes:
 
 - 1 included repository with continuous vulnerability analysis in Docker Scout
 - Unlimited public Docker Hub repositories
-- 1 private Docker Hub repository with 2GB storage
-- 40 pulls per hour Docker Hub image pull rate limit
+- 100 pulls per hour Docker Hub image pull rate limit for authenticated users
 - 7-day Docker Build Cloud trial
 - 7-day Testcontainers Cloud trial
 
 Docker Personal users who want to continue using Docker Build Cloud or Docker
 Testcontainers Cloud after their trial can upgrade to a Docker Pro plan at any
 time.
 
-All unauthenticated user, including unauthenticated Docker Personal users, get
+All unauthenticated users, including unauthenticated Docker Personal users, get
 10 pulls per hour per IP address.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
 ## Docker Pro
 
+{{% include "hub-limits.md" %}}
+
 **Docker Pro** enables individual developers to get more control of their
 development environment and provides an integrated and reliable developer
 experience. It reduces the amount of time developers spend on mundane and
@@ -73,13 +74,14 @@ Docker Pro includes:
 - 2 included repositories with continuous vulnerability analysis in Docker Scout.
 - 100 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or for CI.
 - No Docker Hub image pull rate limits.
-- 25K Docker Hub pulls per month are included.
 
 For a list of features available in each tier, see [Docker
 Pricing](https://www.docker.com/pricing/).
 
 ## Docker Team
 
+{{% include "hub-limits.md" %}}
+
 **Docker Team** offers capabilities for collaboration, productivity, and
 security across organizations. It enables groups of developers to unlock the
 full power of collaboration and sharing combined with essential security
@@ -93,7 +95,6 @@ Docker Team includes:
 - Unlimited Docker Scout repositories with continuous vulnerability analysis.
 - 500 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or for CI.
 - No Docker Hub image pull rate limits.
-- 100K Docker Hub pulls per month.
 
 There are also advanced collaboration and management tools, including
 organization and team management with [Role Based Access Control
@@ -104,6 +105,8 @@ Pricing](https://www.docker.com/pricing/).
 
 ## Docker Business
 
+{{% include "hub-limits.md" %}}
+
 **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 speed up their secure software supply chain
@@ -118,7 +121,6 @@ Docker Business includes:
 - 1500 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or
   for CI.
 - No Docker Hub image pull rate limits.
-- 1M Docker Hub pulls per month.
 
 In addition, you gain access to enterprise-grade features, such as:
 - [Hardened Docker Desktop](../security/for-admins/hardened-desktop/_index.md)
@@ -197,7 +199,6 @@ When you upgrade your Legacy Docker Pro plan to a Docker Pro subscription plan,
 - 2 included repositories with continuous vulnerability analysis in Docker Scout.
 - 100 Testcontainers Cloud runtime minutes are now included for use either in Docker Desktop or for CI.
 - Docker Hub image pull rate limits are removed.
-- 25K Docker Hub pulls per month are included.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
@@ -230,7 +231,6 @@ When you upgrade your Legacy Docker Team plan to a Docker Team subscription plan
 - Docker Scout now includes unlimited repositories with continuous vulnerability analysis, an increase from 3.
 - 500 Testcontainers Cloud runtime minutes are now included for use either in Docker Desktop or for CI.
 - Docker Hub image pull rate limits are removed.
-- 100K Docker Hub pulls per month are included.
 - The minimum number of users is 1 (lowered from 5).
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
@@ -263,7 +263,6 @@ When you upgrade your Legacy Docker Business plan to a Docker Business subscript
 - Docker Scout now includes unlimited repositories with continuous vulnerability analysis, an increase from 3.
 - 1500 Testcontainers Cloud runtime minutes are now included for use either in Docker Desktop or for CI.
 - Docker Hub image pull rate limits are removed.
-- 1M Docker Hub pulls per month are included.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).