diff --git a/content/includes/new-plans.md b/content/includes/new-plans.md new file mode 100644 index 0000000000..dec253ec71 --- /dev/null +++ b/content/includes/new-plans.md @@ -0,0 +1,13 @@ +--- +--- + +> [!IMPORTANT] +> +> Docker is introducing enhanced subscription plans. Our new plans are packed +> with more features, higher usage limits, and simplified pricing. The new +> subscription plans take effect at your next renewal date that occurs on or +> after November 15, 2024. No charges on Docker Hub image pulls or storage will +> be incurred between November 15, 2024, and January 31, 2025. See [Announcing +> Upgraded Docker +> Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/) +> for more details and learn how your usage fits into these updates. \ No newline at end of file diff --git a/content/manuals/billing/build-billing.md b/content/manuals/billing/build-billing.md index 637469c1f0..1505ca4df8 100644 --- a/content/manuals/billing/build-billing.md +++ b/content/manuals/billing/build-billing.md @@ -6,6 +6,8 @@ keywords: payments, billing, subscription, build, cloud, Build Cloud, remote bui weight: 20 --- +{{< include "new-plans.md" >}} + 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. If you don’t have a Docker Core subscription, you can buy Docker Build Cloud Team and create a team in Docker Build Cloud. diff --git a/content/manuals/billing/core-billing/get-started-core.md b/content/manuals/billing/core-billing/get-started-core.md index af759cbe7b..4571c171d0 100644 --- a/content/manuals/billing/core-billing/get-started-core.md +++ b/content/manuals/billing/core-billing/get-started-core.md @@ -5,6 +5,8 @@ description: Learn how to start your Docker Core subscription. keywords: payments, billing, subscription, invoices, docker core, subscribe --- +{{< include "new-plans.md" >}} + {{< include "tax-compliance.md" >}} 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/). diff --git a/content/manuals/billing/scout-billing.md b/content/manuals/billing/scout-billing.md index 0d732bc43e..7376f3cf0a 100644 --- a/content/manuals/billing/scout-billing.md +++ b/content/manuals/billing/scout-billing.md @@ -6,6 +6,8 @@ keywords: payments, billing, subscription, scout, buy docker scout, subscribe to weight: 30 --- +{{< include "new-plans.md" >}} + 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. 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). diff --git a/content/manuals/docker-hub/download-rate-limit.md b/content/manuals/docker-hub/download-rate-limit.md index 9ff90cf95b..a462103c35 100644 --- a/content/manuals/docker-hub/download-rate-limit.md +++ b/content/manuals/docker-hub/download-rate-limit.md @@ -6,10 +6,26 @@ linkTitle: Usage and rate limits weight: 30 --- -Understanding your Docker Hub usage and rate limits helps you manage your and -your organization's usage effectively. +{{< include "new-plans.md" >}} -## View Docker Hub usage +Docker may impose usage and rate limits for Docker Hub to ensure fair resource +consumption and maintain service quality. Understanding your usage helps you +manage you and your organization's usage effectively. + +## Usage + +Usage refers to the amount of data transferred from Docker Hub and the amount of +data stored on Docker Hub. + +### Fair use + +When utilizing the Docker Platform, users should be aware that excessive data +transfer or storage can lead to throttling, or additional charges. To ensure +fair resource usage and maintain service quality, we reserve the right to impose +restrictions or apply additional charges to accounts exhibiting excessive data +and storage consumption. + +### View Docker Hub usage You can download a CSV file of your or your organization's Docker Hub usage. To download the file: @@ -42,6 +58,46 @@ The file contains the following comma separated values. | `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. | | `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. | +### Optimize and manage Docker Hub usage + +Use the following steps to help optimize and manage your Docker Hub usage for +both individuals and organizations. + +1. [View your Docker Hub usage](#view-docker-hub-usage). + +2. Use the Docker Hub usage data to identify which accounts consume the most + data, determine peak usage times, and identify which images are related to + the most data usage. In addition, look for usage trends, such as the + following: + + - Inefficient pull behavior: Identify frequently accessed repositories to + assess whether you can optimize caching practices or consolidate usage to + reduce pulls. + - Inefficient automated systems: Check which automated tools, such as CI/CD + pipelines, may be causing higher pull rates, and configure them to avoid + unnecessary image pulls. + +3. Optimize image pulls by doing the following: + + - Use caching: Implement local image caching via + [mirroring](/docker-hub/mirror/) or within your CI/CD pipelines to reduce + redundant pulls. + - Automate manual workflows: Avoid unnecessary pulls by configuring automated + systems to pull only when a new version of an image is available. + +4. Optimize the size of repositories by regularly auditing and removing + untagged, unused, or outdated images. + +5. Increase your limits by upgrading or purchasing add-ons. For details, see + [Docker pricing](https://www.docker.com/pricing/). + +6. For organizations, monitor and enforce organizational policies by doing the + following: + + - Routinely [view Docker Hub usage](#view-docker-hub-usage) to monitor usage. + - [Enforce sign-in](/security/for-admins/enforce-sign-in/) to ensure that you + can monitor the usage of your users and users receive higher usage limits. + ## Rate limit A user's rate limit is equal to the highest entitlement of their personal @@ -62,6 +118,38 @@ URLs (`/v2/*/manifests/*`). and [Docker Verified Publisher](https://www.docker.com/partners/programs) programs. + +> [!IMPORTANT] +> +> Docker is introducing enhanced subscription plans. Our new plans are packed +> with more features, higher usage limits, and simplified pricing. The new +> subscription plans take effect at your next renewal date that occurs on or +> after November 1, 2024. No charges on Docker Hub image pulls or storage will +> be incurred between November 15, 2024, and January 31, 2025. See [Announcing +> Upgraded Docker +> Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/) +> for more details and learn how your usage fits into these updates. +> +> Note that when these changes take effect, the following new definition of a +> pull request and limits will take effect: +> +> - A Docker pull request includes both a version check and any download that +> occurs as a result of the pull. Depending on the client, a `docker pull` can +> verify the existence of an image or tag without downloading it by performing +> a version check. +> - A pull request for a normal image makes one pull for a [single +> manifest](https://github.com/opencontainers/image-spec/blob/main/manifest.md). +> - A pull request for a multi-arch image will count as one pull for each +> different architecture. +> - Pulls are accounted to the user doing the pull, not to the owner of the +> image. +> +> There will be no image pull rate limit for users or automated systems with a +> paid subscription. Anonymous and Docker Personal users using Docker Hub will +> experience rate limits on image pull requests. For authenticated users, there +> will be a 40 pull/hour rate limit per user; for unauthenticated usage, there +> will be a 10 pull/hour rate limit per IP address. + ### What's the download rate limit on Docker Hub? Docker Hub limits the number of Docker image downloads, or pulls, based on the diff --git a/content/manuals/docker-hub/service-accounts.md b/content/manuals/docker-hub/service-accounts.md index e3d973ea0c..b8c43a5dc3 100644 --- a/content/manuals/docker-hub/service-accounts.md +++ b/content/manuals/docker-hub/service-accounts.md @@ -5,6 +5,8 @@ title: Service accounts weight: 50 --- +{{< include "new-plans.md" >}} + > [!NOTE] > > Service accounts require a diff --git a/content/manuals/subscription/build-cloud/build-details.md b/content/manuals/subscription/build-cloud/build-details.md index fc9a53c05a..697066f821 100644 --- a/content/manuals/subscription/build-cloud/build-details.md +++ b/content/manuals/subscription/build-cloud/build-details.md @@ -6,6 +6,8 @@ aliases: - /subscription/build-details/ --- +{{< include "new-plans.md" >}} + 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). ## Docker Build Cloud Starter diff --git a/content/manuals/subscription/core-subscription/details.md b/content/manuals/subscription/core-subscription/details.md index e736aa41d6..021f7b2dc1 100644 --- a/content/manuals/subscription/core-subscription/details.md +++ b/content/manuals/subscription/core-subscription/details.md @@ -8,6 +8,8 @@ aliases: weight: 10 --- +{{< include "new-plans.md" >}} + 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/). The following describes some of the key features included with your Docker Core subscription: diff --git a/content/manuals/subscription/scout-details.md b/content/manuals/subscription/scout-details.md index e9fd787eca..690deb2e48 100644 --- a/content/manuals/subscription/scout-details.md +++ b/content/manuals/subscription/scout-details.md @@ -5,6 +5,8 @@ keywords: subscription, free, team, business, features weight: 30 --- +{{< include "new-plans.md" >}} + 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). ## Docker Scout Free