diff --git a/content/manuals/admin/organization/manage/manage-licenses.md b/content/manuals/admin/organization/manage/manage-licenses.md index 6b43acd41d39..c6567d9ba911 100644 --- a/content/manuals/admin/organization/manage/manage-licenses.md +++ b/content/manuals/admin/organization/manage/manage-licenses.md @@ -44,5 +44,5 @@ See these docs to explore Docker Core add-ons, or products that need licenses: - [Scale your subscription](/manuals/subscription/scale.md) to learn about different add-ons - [Manage seats](/manuals/admin/organization/manage/manage-seats.md) to add more seats to your Docker Core subscription -- [AI Governance](/manuals/ai/sandboxes/security/governance.md) to set up organization policies for your organization members +- [AI Governance](/manuals/ai/sandboxes/governance/org.md) to set up organization policies for your organization members - [Docker Offload](/manuals/offload/about.md) to let your developers offload building and running containers to the cloud diff --git a/content/manuals/dhi/how-to/select-enterprise.md b/content/manuals/dhi/how-to/select-enterprise.md index 05fce50f513e..02f0886901a0 100644 --- a/content/manuals/dhi/how-to/select-enterprise.md +++ b/content/manuals/dhi/how-to/select-enterprise.md @@ -20,7 +20,7 @@ To use this workflow, you need: - One of the following: - A DHI Select or Enterprise subscription. [Contact Docker sales](https://www.docker.com/products/hardened-images/#compare) to purchase DHI Enterprise - or [learn more about DHI Select](../../subscription/setup.md#set-up-docker-hardened-images-select-for-an-organization). + or [learn more about DHI Select](../../subscription/scale.md#add-dhi-select-to-organization-accounts). - An active DHI trial. [Start a free DHI trial](https://hub.docker.com/hardened-images/start-free-trial). - [Docker Desktop](../../desktop/release-notes.md) 4.65 or later to use the diff --git a/content/manuals/subscription/change.md b/content/manuals/subscription/change.md index 18529d919bb2..2ba187eaccbc 100644 --- a/content/manuals/subscription/change.md +++ b/content/manuals/subscription/change.md @@ -14,7 +14,7 @@ aliases: - /docker-hub/billing/downgrade/ - /billing/scout-billing/ - /billing/subscription-management/ -weight: 40 +weight: 30 --- You can upgrade or downgrade your Docker subscription at any time to match your changing needs. This page explains how to make subscription changes and what to expect with billing and feature access. diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index d959ed643f2c..42a04c62ba04 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -1,18 +1,69 @@ --- title: Scale your subscription linkTitle: Scale -description: Scale Docker Build Cloud and Testcontainers Cloud consumption for your subscription -keywords: scale subscription, docker build cloud minutes, testcontainers cloud minutes, usage scaling -weight: 30 +description: Scale Docker Build Cloud, Testcontainers Cloud, Gordon, and DHI consumption for your subscription +keywords: scale subscription, docker build cloud minutes, testcontainers cloud minutes, gordon plan, docker hardened images, dhi repositories, usage scaling +weight: 40 --- -Docker Core subscriptions include basic entitlements for your organizations that you can scale with additional add-ons as your needs grow. You can purchase different add-ons that extend usage for your organizations: +Docker subscriptions include basic entitlements that you can scale with additional add-ons as your needs grow. You can purchase different add-ons that extend usage for your personal or organization accounts: +- Docker Hardened Images (DHI) Select repositories for organization accounts +- Gordon Plus, Max, and Ultra plans for personal accounts - Seats for Docker Core subscriptions like Docker Team and Docker Business - Licenses for individual products, like AI Governance (available for Docker Sandboxes) and Docker Offload - Build minutes for Docker Build Cloud - Cloud runtime minutes for Testcontainers -- Repositories for Docker Hardened Images (DHI) Select + +## Add DHI Select to organization accounts + +DHI Select lets organization admins assign DHI repositories to organization accounts. All organization members can then access those DHI repositories, including members you add to the organization after initial setup. + +To purchase hardened repositories with DHI Select: + +1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. +1. Select **Billing**, then **Browse products**. +1. Select **Hardened Images** from the products page. +1. Choose the organization account that should receive the DHI repository, then **Continue**. You can add repositories for one account at a time. +1. Select **Add repositories**, then add the number of new repositories you want to add to the account. +1. Verify your billing details, continue to payment, and complete checkout. + +To manage the repositories in your active DHI Select plan: + +1. From the Billing overview page, select **Manage** next to **Hardened Images**. +1. Choose from the available actions: + - **Add repositories** lets you add additional repositories to your active plan. You will verify your billing details, continue to payment, and complete checkout. + - **Remove repositories** lets you remove repositories. + - **Disable auto-renewal** cancels your DHI Select plan at the end of the current billing cycle. + +To learn more about DHI Select, see [Get started with DHI Select and Enterprise](/manuals/dhi/how-to/select-enterprise.md). Purchasing eight or more hardened repositories? [Contact Docker sales](https://www.docker.com/pricing/contact-sales/) to discuss an Enterprise plan. + +## Add a Gordon Plus, Max, or Ultra plan to personal accounts + +> [!IMPORTANT] +> Gordon subscriptions apply to personal Docker accounts only. +> If you purchase a Gordon plan while signed in with an organization account, +> the subscription applies to your personal account automatically. + +Gordon Plus, Max, and Ultra plans increase your maximum Gordon usage allowance for your personal account. Gordon plans are billed at a monthly rate at the first of the month. If you purchase a Gordon plan after the first of the month, you'll be billed on a prorated basis. + +To add a new Gordon plan to your account: + +1. Sign in to [Docker Home](https://app.docker.com/) and select your Docker personal account. +1. Select **Billing**, then **Browse products**. +1. Select **View plans** from the **Upgrade Gordon** section of the products page. +1. Choose the Gordon subscription plan you want to apply to your personal account. +1. Verify your billing details, continue to payment, and complete checkout. + +If you have an active Gordon plan and want to upgrade to a higher tier, your new usage allowance takes effect immediately. You pay a prorated charge for the higher tier for the rest of the current billing period. + +To upgrade your Gordon plan: + +1. From the Billing overview page, select **Manage** from the Gordon tile under your active plans. +1. Select **Upgrade plan** and choose the new plan you want to upgrade to. +1. Verify your billing details, continue to payment, and complete checkout. + +To learn about Gordon usage, see [Gordon usage limits and tiers](/manuals/ai/gordon/usage-limits.md). ## Add licenses @@ -20,26 +71,26 @@ Licenses add a layer to your Docker subscriptions, letting you assign products t organization without consuming a Docker Core seat. You can purchase licenses for some Docker products: - AI Governance -- Docker Offload +- Docker Offload Once you've purchased licenses for your organization, you can [manage license assignment](/manuals/admin/organization/manage/manage-licenses.md) from the **Members** page in Docker Home. > [!TIP] -> To purchase licenses for AI Governance and Docker Offload, [contact sales](https://www.docker.com/pricing/contact-sales/). +> To purchase licenses for AI Governance and Docker Offload, [contact sales](https://www.docker.com/pricing/contact-sales/). ### AI Governance licenses AI Governance licenses let admins create and apply organization-wide AI Governance policies for license-holding members. -- AI Governance licenses currently apply to Docker Sandbox usage. +- AI Governance licenses apply to Docker Sandbox usage. - AI Governance licenses are separate from Docker Team or Business, so you can purchase AI Governance licenses without an existing subscription. -- When you purchase AI Governance licenses, you may assign them to organization members without a Docker Core seat. +- When you purchase AI Governance licenses, you may assign them to organization members without a Docker Core seat. -When a member who holds an AI Governance license uses Docker Sandbox, the organization policy overrides the member’s local policy rules. Members without AI Governance licenses can still use Docker Sandbox, but organization policies will not govern their usage. +When a member who holds an AI Governance license uses Docker Sandbox, the organization policy overrides the member’s local policy rules. Members without AI Governance licenses can still use Docker Sandbox, but organization policies will not govern their usage. -### Docker Offload licenses +### Docker Offload licenses -Docker Offload lets developers offload building and running containers to the cloud. +Docker Offload lets developers offload building and running containers to the cloud. - You must have a Docker Team or Docker Business subscription. - You can only assign Docker Offload licenses to members with Docker Team or Docker Business. @@ -73,26 +124,11 @@ You can add Testcontainers Cloud runtime minutes in two ways: On-demand usage is billed at higher rates than pre-purchased capacity. To avoid higher on-demand charges, pre-purchase additional minutes if you expect consistent usage over your subscription's included minutes. -## Add DHI repositories to DHI Select - -To add more hardened repositories to your DHI Select plan: - -1. Sign in to [Docker Home](https://app.docker.com/) and select your - organization. -1. Select **Billing**. -1. On the Overview page, select **Manage** next to **Hardened Images**. -1. Select how many repositories the account can use. - -Purchasing eight or more hardened repositories? [Contact Docker sales](https://www.docker.com/pricing/contact-sales/) to discuss an Enterprise plan. - ## What's next - [Manage licenses](/manuals/admin/organization/manage/manage-licenses.md) - [Manage seats](/manuals/admin/organization/manage/manage-seats.md) -- [View your consumption](../admin/organization/manage/manage-products.md#monitor-product-usage-for-your-organization) +- [View your consumption](../admin/organization/manage/manage-products.md#monitor-product-usage-for-your-organization) - [Docker Build Cloud overview](/manuals/build-cloud/_index.md) - [DHI Select and Enterprise quickstart](/manuals/dhi/how-to/select-enterprise.md) - [Testcontainers overview](/manuals/testcontainers.md) - - - diff --git a/content/manuals/subscription/setup.md b/content/manuals/subscription/setup.md index 92f88d620e0a..77d1333589ec 100644 --- a/content/manuals/subscription/setup.md +++ b/content/manuals/subscription/setup.md @@ -1,6 +1,6 @@ --- description: Set up Docker subscriptions for personal accounts and organizations -keywords: subscription setup, docker pro, docker team, docker business, organization setup +keywords: subscription setup, docker pro, docker team, docker business, organization setup, gordon plan title: Set up your subscription linkTitle: Setup weight: 20 @@ -10,41 +10,25 @@ Docker subscriptions provide features and benefits for individual developers, te Before you begin, make sure you have a [Docker ID](../accounts/create-account.md). To learn more about what's included in each tier, see [Docker Pricing](https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscriptionSetup). -## Set up a Docker subscription for a personal account +## Personal accounts -When you [create your Docker ID](../accounts/create-account.md), you automatically get a Docker Personal subscription. This subscription includes essential Docker tools at no cost. If you want to continue with Docker Personal, no further action is needed. You can start using Docker Desktop, Docker Hub, and other tools immediately. +When you [create your Docker ID](../accounts/create-account.md), you automatically get a Docker Personal subscription. This subscription includes essential Docker tools at no cost. -If you need additional features like Docker Build Cloud minutes and more Docker Scout repositories, see [Upgrade your subscription](./change.md#upgrade-your-subscription). +- To learn about Docker Pro subscriptions, [compare Docker Personal and Docker Pro](https://www.docker.com/pricing/). +- To increase your Gordon usage allowance, see [Scale your subscription](/manuals/subscription/scale.md). -## Set up a Docker subscription for an organization +## Organization accounts You can subscribe a new or existing organization to Docker Team or Business subscriptions. Only organization owners can manage billing for the organization. 1. [Create your Docker ID](../accounts/create-account.md) if you don't already have one. 1. [Create your organization](../admin/organization/setup/orgs.md) or use an existing organization you own. 1. Select **Billing** to view your current plans, then select **Browse products**. -1. From the products catalog page, select **View plans** from the Docker tile. Choose a Docker Team or Business subscription for the organization. +1. From the products catalog page, select **View plans** from the Docker tile. +1. Choose a Docker Team or Business subscription for the organization. 1. Fill in plan entitlements, verify your billing details, then continue to payment to complete checkout. -## Set up Docker Hardened Images Select for an organization - -Docker Hardened Images (DHI) Select lets organization admins assign DHI repositories to organization accounts. When you add repositories for your organization, all members gain access to those DHI repositories. Members you add to the organization after setup inherit the same access. - -To purchase hardened repositories with DHI Select: - -1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. -1. Select **Billing**, then **Browse products**. -1. Select **Hardened Images** from the products page. -1. Choose the organization account that should receive the DHI repository, then **Continue**. You can add repositories for one account at a time. -1. Select how many repositories the account can mirror. -1. Verify your billing details, continue to payment, and complete checkout. - -> [!TIP] -> -> Purchasing eight or more hardened repositories? [Contact Docker sales](https://www.docker.com/pricing/contact-sales/) to discuss an Enterprise plan. - ## What's next - To upgrade an existing organization's subscription, see [Upgrade your subscription](./change.md#upgrade-your-subscription). -- To add more repositories to your DHI Select plan, see [Add DHI repositories](./scale.md#add-dhi-repositories). -- To learn about DHI Select, see [Get started with DHI Select and Enterprise](/manuals/dhi/how-to/select-enterprise.md). +- To scale your subscription with add-ons like DHI Select, Gordon plans, licenses, or usage minutes, see [Scale your subscription](/manuals/subscription/scale.md).