From 79d037dc5a1719caedad4896e06ef158aabeeba5 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 5 Mar 2025 11:10:13 -0500 Subject: [PATCH] Merge pull request #22160 from sarahsanders-docker/tcc-minutes subscription: add callout about TCC minutes rollovers --- content/guides/testcontainers-cloud/_index.md | 2 +- content/manuals/subscription/details.md | 28 ++++++++++--------- content/manuals/subscription/scale.md | 12 ++++++-- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/content/guides/testcontainers-cloud/_index.md b/content/guides/testcontainers-cloud/_index.md index 2d217f2a3e..9cd9b4bebf 100644 --- a/content/guides/testcontainers-cloud/_index.md +++ b/content/guides/testcontainers-cloud/_index.md @@ -38,7 +38,7 @@ Testcontainers Cloud is a cloud-based solution designed to streamline and enhanc Works well with Docker Desktop, GitHub Actions, Jenkins, Kubernetes, and other CI solutions -Docker Pro, Team, and Business subscriptions come with Testcontainers Cloud runtime minutes, and additional minutes are available via consumption pricing. +Docker Pro, Team, and Business subscriptions come with Testcontainers Cloud runtime minutes, and additional minutes are available via consumption pricing. Testcontainers Cloud runtime minutes do not rollover month to month. ## Who’s this for? diff --git a/content/manuals/subscription/details.md b/content/manuals/subscription/details.md index 6da2e7ef33..8a333c66af 100644 --- a/content/manuals/subscription/details.md +++ b/content/manuals/subscription/details.md @@ -69,9 +69,10 @@ Testcontainers Cloud. Docker Pro includes: -- 200 Docker Build Cloud build minutes per month. +- 200 Docker Build Cloud build minutes per month. Docker Build Cloud minutes do not +rollover month to month. - 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. +- 100 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or for CI. Testcontainers Cloud runtime minutes do not rollover month to month. - No Docker Hub image pull rate limits. For a list of features available in each tier, see [Docker @@ -90,9 +91,10 @@ Docker Hub, Docker Scout, Docker Build Cloud, and Testcontainers Cloud. Docker Team includes: -- 500 Docker Build Cloud build minutes per month. +- 500 Docker Build Cloud build minutes per month. Docker Build Cloud minutes do not +rollover month to month. - Unlimited Docker Scout repositories with continuous vulnerability analysis. -- 500 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or for CI. +- 500 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or for CI. Testcontainers Cloud runtime minutes do not rollover month to month. - No Docker Hub image pull rate limits. There are also advanced collaboration and management tools, including @@ -115,10 +117,10 @@ Build Cloud, and Testcontainers Cloud. Docker Business includes: -- 1500 Docker Build Cloud build minutes per month. +- 1500 Docker Build Cloud build minutes per month. Docker Build Cloud minutes do not +rollover month to month. - Unlimited Docker Scout repositories with continuous vulnerability analysis. -- 1500 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or - for CI. +- 1500 Testcontainers Cloud runtime minutes per month for use either in Docker Desktop or for CI. Testcontainers Cloud runtime minutes do not rollover month to month. - No Docker Hub image pull rate limits. In addition, you gain access to enterprise-grade features, such as: @@ -194,9 +196,9 @@ For a list of features available in each legacy tier, see [Legacy Docker Pricing When you upgrade your Legacy Docker Pro plan to a Docker Pro subscription plan, your plan includes the following changes: -- Docker Build Cloud build minutes increased from 100/month to 200/month and no monthly fee. +- Docker Build Cloud build minutes increased from 100/month to 200/month and no monthly fee. Docker Build Cloud minutes do not rollover month to month. - 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. +- 100 Testcontainers Cloud runtime minutes are now included for use either in Docker Desktop or for CI. Testcontainers Cloud runtime minutes do not rollover month to month. - Docker Hub image pull rate limits are removed. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/). @@ -226,9 +228,9 @@ For a list of features available in each legacy tier, see [Legacy Docker Pricing When you upgrade your Legacy Docker Team plan to a Docker Team subscription plan, your plan includes the following changes: - Instead of paying an additional per-seat fee, Docker Build Cloud is now available to all users in your Docker plan. -- Docker Build Cloud build minutes increase from 400/mo to 500/mo. +- Docker Build Cloud build minutes increase from 400/mo to 500/mo. Docker Build Cloud minutes do not rollover month to month. - 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. +- 500 Testcontainers Cloud runtime minutes are now included for use either in Docker Desktop or for CI. Testcontainers Cloud runtime minutes do not rollover month to month. - Docker Hub image pull rate limits are removed. - The minimum number of users is 1 (lowered from 5). @@ -258,9 +260,9 @@ For a list of features available in each tier, see [Legacy Docker Pricing](https When you upgrade your Legacy Docker Business plan to a Docker Business subscription plan, your plan includes the following changes: - Instead of paying an additional per-seat fee, Docker Build Cloud is now available to all users in your Docker plan. -- Docker Build Cloud included minutes increase from 800/mo to 1500/mo. +- Docker Build Cloud included minutes increase from 800/mo to 1500/mo. Docker Build Cloud minutes do not rollover month to month. - 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. +- 1500 Testcontainers Cloud runtime minutes are now included for use either in Docker Desktop or for CI. Testcontainers Cloud runtime minutes do not rollover month to month. - Docker Hub image pull rate limits are removed. 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 1dd53a4d3c..ca5c411b98 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -24,8 +24,7 @@ for legacy Docker subscription plans, all paid Docker subscriptions come with access to Docker Hub, Docker Build Cloud, and Testcontainers Cloud with a base amount of consumption. See [Docker subscriptions and features](./details.md) to learn how much base consumption comes with each subscription. You can scale your -consumption at any time during your subscription period. All purchased -consumption expires at the end of your subscription term. +consumption at any time during your subscription period. You can scale consumption for the following: @@ -36,6 +35,15 @@ To better understand your needs, you can view your consumption at any time. For more details, see [View Docker product usage](../admin/organization/manage-products.md#view-docker-product-usage). +> [!WARNING] +> +> The number of Docker Build Cloud and Testcontainers minutes included in your +subscription do not rollover. Additional minutes expire at the end of your +subscription period (monthly or annually). For example, if you have an annual +Docker Team subscription with 500 included minutes, and purchase 500 additional +minutes, only the 500 additional minutes rollover until the end of your annual +subscription period. + ## Add Docker Build Cloud build minutes You can pre-purchase Docker Build Cloud build minutes in the Docker Build Cloud Dashboard: