diff --git a/content/includes/hub-limits.md b/content/includes/hub-limits.md index 58f37ef1982b..580271c86551 100644 --- a/content/includes/hub-limits.md +++ b/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. \ No newline at end of file +> 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 \ No newline at end of file diff --git a/content/manuals/billing/docker-hub-pricing.md b/content/manuals/billing/docker-hub-pricing.md deleted file mode 100644 index 812b8b8eb91a..000000000000 --- a/content/manuals/billing/docker-hub-pricing.md +++ /dev/null @@ -1,119 +0,0 @@ ---- -title: Docker Hub storage pricing -description: Learn how Docker Hub storage pricing is calculated -keywords: docker hub, storage, payments, billing, subscription -weight: 55 ---- - -This guide explains how Docker Hub storage is measured, calculated, and billed -to help you understand your storage consumption and costs. - -> [!NOTE] -> -> Docker Hub plan limits will take effect on March 1, 2025. No charges on Docker Hub pulls -or storage will be incurred from December 10, 2024 and February 28, 2025. - -## How storage is measured - -Docker Hub measures storage using: -- Hourly measurement: Storage usage is recorded every hour and expressed in **GB-hours**. This value represents the total storage your repositories consume during each hour. -- Monthly aggregation: At the end of each month, hourly storage usage is divided by the number of hours in that month. - - For example, 900 GB-hours of storage in a 30-day month (720 hours) equates to 900 / 720 = 1.25 gigabytes of monthly storage (GB-month). - -## How storage is calculated - -[Docker subscription plans](/manuals/subscription/details.md) include a specific amount of allocated -private repository storage: - -- Personal plan: Includes up to 2GB of storage. -- Pro plan: Includes up to 5GB of storage. -- Team plan: Includes up to 50GB of storage. -- Business plan: Includes up to 500GB of storage. - -Docker Hub determines additional charges based on your average monthly usage of private repository storage. If a repository is private at any point within an hour, it is counted as private for the full hour. - -If you go over your allocated private repository storage, you will incur overage -costs. To calculate overage costs, the included storage for your plan is subtracted from your average monthly -usage. - -## Docker Hub consumption pricing - -At the end of the month, Docker calculates your total storage usage -and compares it to your plan's included amount. If applicable, the overage cost -is billed to your account as an overage invoice. - -There are two billing models for paying for additional Docker Hub storage: - -- Pre-pay: Pay in advance for a specified amount of storage. - - > [!NOTE] - > - > Pre-purchased storage expires at the end of your subscription period. Subscriptions - > periods are either monthly or annually. For example, if you are on a monthly plan, - > unused storage from each month does not roll over into the next. If you are on an - > annual plan, unused storage from each year does not roll over into the next. - -- Post-pay: Receive an overage invoice for storage usage that exceeds your subscription plan's included amount -at the end of your billing cycle. - -### Storage carryover - -If you pre-pay for storage, your purchased storage is valid for your entire subscription period. You can use it any time during that period, and any unused portion will roll over to the next month until the subscription period ends. - -In the following example, a customer with an annual Business plan pre-pays for 500GB of storage for the year. Their plan includes a base allocation of 500GB of storage per month. -- In January, they use 510 GB-month, exceed their base allocation, and use 10GB from their pre-paid storage. Their remaining pre-paid -storage is 490GB. -- In February, they use 450 GB-month, and do not exceed their base allocation. They do not use any of their pre-paid storage, so it remains at 490GB. -- In March, they use 600 GB-month, exceed their base allocation, and use 100GB from their pre-paid storage. Their remaining pre-paid storage is 390GB. - -| | January | February | March | -|---------------------------------|----------|----------|---------| -| Included GB-month | 500 | 500 | 500 | -| Used storage in month | 510 | 450 | 600 | -| Overage in GB-month | 10 | 0 | 100 | -| Remaining pre-purchased storage | 490 | 490 | 390 | - -At the end of March, the customer has 390GB of pre-purchased storage left to use for the rest of the year. - -## Examples - -### Business plan with pre-pay - -In the following example, a customer with a Business plan has 500GB included in their subscription plan. They pre-pay -for 1700 GB. -- In January, they use 100 GB-month, meaning they did not use any of their pre-pay storage. Their pre-pay storage rolls over to the next month. -- In February, they use 650 GB-month, exceed their base allocation, and use 150GB from their pre-pay storage. -- In March, they use 1800 GB-month, exceed their base allocation, and use 1300GB from their pre-pay storage. -- In April, they use 950 GB-month, exceed their base allocation, and going over their pre-pay storage. This results in an invoice of $14.00 for the storage overage. - -| | January | February | March | April | -|--------------------------|---------|----------|-------|--------| -| Included GB-month | 500 | 500 | 500 | 500 | -| Pre-purchased GB | 1700 | 1700 | 1700 | 1700 | -| Used storage in month | 100 | 650 | 1800 | 950 | -| Remaining pre-purchased | 1700 | 1550 | 250 | -200 | -| Overage invoice | $0.00 | $0.00 | $0.00 | $14.00 | - -For information on storage pricing, see the [Docker Pricing](https://www.docker.com/pricing/) page. - -### Business plan with post-pay - -In the following example, a customer with a Business plan has 500GB included in their subscription plan. They do -not pre-pay for additional storage consumption. -- In January, they use 100 GB-month and do not exceed their base allocation. -- In February, they use 650 GB-month, going over their base allocation by 150 GB-month. They are sent -an overage invoice for $10.50. -- In March, they use 1800 GB-month, going over their base allocation by 1300 GB-month. They are sent -an overage invoice for $91.00. -- In April, they use 950 GB-month, going over their base allocation by 450 GB-month. They are sent an -overage invoice for $31.50. - -| | January | February | March | April | -|-----------------------------------|---------|----------|---------|--------| -| Included GB-month | 500 | 500 | 500 | 500 | -| Used storage in month | 100 | 650 | 1800 | 950 | -| Overage in GB-month | 0 | 150 | 1300 | 450 | -| Overage invoice | $0.00 | $10.50 | $130.00 | $45.00 | - -For information on storage pricing, see the [Docker Pricing](https://www.docker.com/pricing/) page. \ No newline at end of file diff --git a/content/manuals/docker-hub/usage/_index.md b/content/manuals/docker-hub/usage/_index.md index 0c6bc437263b..e543d2678555 100644 --- a/content/manuals/docker-hub/usage/_index.md +++ b/content/manuals/docker-hub/usage/_index.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 diff --git a/content/manuals/docker-hub/usage/manage.md b/content/manuals/docker-hub/usage/manage.md index 9e81b01ad1b8..14a01e7187ff 100644 --- a/content/manuals/docker-hub/usage/manage.md +++ b/content/manuals/docker-hub/usage/manage.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. diff --git a/content/manuals/docker-hub/usage/pulls.md b/content/manuals/docker-hub/usage/pulls.md index a652bcb1276a..cd1c4d2b765b 100644 --- a/content/manuals/docker-hub/usage/pulls.md +++ b/content/manuals/docker-hub/usage/pulls.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 diff --git a/content/manuals/docker-hub/usage/repositories.md b/content/manuals/docker-hub/usage/repositories.md new file mode 100644 index 000000000000..5ea200845bac --- /dev/null +++ b/content/manuals/docker-hub/usage/repositories.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. diff --git a/content/manuals/docker-hub/usage/storage.md b/content/manuals/docker-hub/usage/storage.md deleted file mode 100644 index 37ab629d4f6e..000000000000 --- a/content/manuals/docker-hub/usage/storage.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -description: Learn about storage usage limits for Docker Hub. -keywords: Docker Hub, usage, storage, repository -title: Docker Hub storage usage and limits -linkTitle: Storage -weight: 20 ---- - -{{% include "hub-limits.md" %}} - -The following storage and repository limits apply based on your subscription, subject to fair use: - -| Plan | Public repositories | Public repository storage | Private repositories | Private repository storage | -|----------|---------------------|---------------------------|----------------------------|----------------------------| -| Personal | Unlimited | Unlimited | Up to 1 private repository | Up to 2 GB | -| Pro | Unlimited | Unlimited | Unlimited | Up to 5 GB | -| Team | Unlimited | Unlimited | Unlimited | Up to 50 GB | -| Business | Unlimited | Unlimited | Unlimited | Up to 500 GB | - -Personal plans exceeding 2 GB of storage will be blocked from pushing and pulling content from their private repository. To unblock, delete unused content to stay within the 2 GB limit or upgrade to a higher plan. - -Any storage usage beyond the included amounts in each paid subscription tier -will be charged at an on-demand rate. For more details about storage -calcultations and billing, see [Docker Hub storage -pricing](/manuals/billing/docker-hub-pricing.md). - -## View storage usage and repositories - -You can view your storage usage on the [Usage page](https://hub.docker.com/usage/storage) in Docker Hub. diff --git a/content/manuals/subscription/details.md b/content/manuals/subscription/details.md index a36ce673361e..29eaa2f0b61d 100644 --- a/content/manuals/subscription/details.md +++ b/content/manuals/subscription/details.md @@ -43,8 +43,7 @@ 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 @@ -52,13 +51,15 @@ 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/). diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index 873a950adec0..e086d7010662 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -32,7 +32,6 @@ You can scale consumption for the following: - Docker Build Cloud build minutes - Docker Testcontainers Cloud runtime minutes -- Docker Hub storage and pulls To better understand your needs, you can view your consumption at any time. For more details, see [View Docker product @@ -60,22 +59,4 @@ You can pre-purchase Testcontainers Cloud runtime minutes by [contacting pre-purchase, you are able to use as many minutes as you need on-demand. The usage will be billed at the end of each monthly billing cycle. On-demand usage is billed at a higher rate than pre-purchased capacity. To avoid on-demand -charges, pre-purchase additional minutes. - -## Add Docker Hub storage or pulls - -{{% include "hub-limits.md" %}} - -You can pre-purchase pulls and storage by [contacting -sales](https://www.docker.com/pricing/contact-sales/). For more information on Docker -Hub storage pricing, see [Docker Hub storage pricing](/manuals/billing/docker-hub-pricing.md). - -> [!WARNING] -> -> Once purchased, you can't adjust your pre-paid pulls, only remove them. To change -> the amount of pre-paid pulls you must remove them, wait for the billing cycle to -> end, and then purchase a new amount. - -In addition to pre-purchase, you are able to use as much resources as you need -on-demand. On-demand usage is billed at a higher rate than pre-purchased -capacity. To avoid on-demand charges, pre-purchase additional storage or pulls. \ No newline at end of file +charges, pre-purchase additional minutes. \ No newline at end of file diff --git a/hugo_stats.json b/hugo_stats.json index 545aaa1b58f8..c850bbea5352 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -396,6 +396,7 @@ "mt-2", "mt-20", "mt-4", + "mt-8", "mx-auto", "my-0", "my-1",