diff --git a/content/manuals/admin/company/manage/organizations.md b/content/manuals/admin/company/manage/organizations.md index 016b28da5c58..baef9af03e12 100644 --- a/content/manuals/admin/company/manage/organizations.md +++ b/content/manuals/admin/company/manage/organizations.md @@ -21,10 +21,9 @@ The **Organizations** view displays all organizations under your company. ## Add seats to an organization -If you have a [self-serve](../../../subscription/details.md#self-serve) -subscription that has no pending subscription changes, you can add seats using -Docker Home. For more information about adding seats, -see [Manage seats](/manuals/subscription/manage-seats.md#add-seats). +If you have a self-serve subscription that has no pending subscription changes, +you can add seats using Docker Home. For more information about adding seats, +see [Manage seats](/manuals/subscription/manage-seats.md#add-seats-to-your-subscription). If you have a sales-assisted subscription, you must contact Docker support or sales to add seats. diff --git a/content/manuals/dhi/how-to/select-enterprise.md b/content/manuals/dhi/how-to/select-enterprise.md index 645aff470beb..8c97665516f6 100644 --- a/content/manuals/dhi/how-to/select-enterprise.md +++ b/content/manuals/dhi/how-to/select-enterprise.md @@ -19,8 +19,8 @@ To use this workflow, you need: - Organization owner access in your Docker Hub namespace. - One of the following: - A DHI Select or Enterprise subscription. [Contact Docker - sales](https://www.docker.com/products/hardened-images/#compare) to purchase - or learn more about these subscriptions. + 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). - 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 876a08baa584..18529d919bb2 100644 --- a/content/manuals/subscription/change.md +++ b/content/manuals/subscription/change.md @@ -1,5 +1,6 @@ --- title: Change your subscription +linkTitle: Upgrade or change description: Upgrade or downgrade your Docker subscription and understand billing changes keywords: upgrade subscription, downgrade subscription, docker pricing, subscription changes aliases: @@ -13,7 +14,7 @@ aliases: - /docker-hub/billing/downgrade/ - /billing/scout-billing/ - /billing/subscription-management/ -weight: 30 +weight: 40 --- 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. @@ -22,22 +23,25 @@ You can upgrade or downgrade your Docker subscription at any time to match your When you upgrade your Docker subscription, you immediately get access to all features and entitlements in your new subscription tier. -For detailed feature information, see [Docker Pricing](https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscriptionChange). +> [!TIP] +> If you're upgrading from a Personal subscription to a Team subscription +> and want to keep your username, [convert your user account into an organization](../admin/organization/setup/convert-account.md). To upgrade your subscription: 1. Sign in to [Docker Home](https://app.docker.com/) and select the organization you want to upgrade. -1. Select **Billing**. -1. Optional. If you're upgrading from a free Personal subscription to a Team subscription and want to keep your username, [convert your user account into an organization](../admin/organization/setup/convert-account.md). -1. Select **Upgrade**. -1. Follow the on-screen instructions to complete your upgrade. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account). - -## Downgrade your subscription +1. Select **Billing** to view your current plans. +1. Select **Browse products**. +1. Choose **View plans** from the Docker product tile on the products catalog page. +1. Choose a Docker Team or Docker Business plan for the organization. +1. Follow the on-screen instructions to complete your upgrade. + - If you choose to pay using a US bank account, you must verify the account. + - For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account). -You can downgrade your Docker subscription at any time before the renewal date. The unused portion isn't refundable, but you retain access to paid features until the next billing cycle. +For detailed feature information, see [Docker Pricing](https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscriptionChange). -### Downgrade considerations +## Downgrade considerations Consider the following before downgrading: @@ -47,12 +51,16 @@ Consider the following before downgrading: For feature limits in each tier, see [Docker Pricing](https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscriptionChange). +## Downgrade your subscription + +You can downgrade your Docker subscription at any time before the renewal date. The unused portion isn't refundable, but you retain access to paid features until the end of the current billing cycle. + To downgrade your subscription: 1. Sign in to [Docker Home](https://app.docker.com/) and select the organization you want to downgrade. 1. Select **Billing**. -1. Select the action icon and then **Cancel subscription**. +1. Select the action menu, then **Cancel subscription**. 1. Fill out the feedback survey to continue with cancellation. > [!IMPORTANT] diff --git a/content/manuals/subscription/desktop-license.md b/content/manuals/subscription/desktop-license.md index 58ecc6d6a884..747223dbfc52 100644 --- a/content/manuals/subscription/desktop-license.md +++ b/content/manuals/subscription/desktop-license.md @@ -2,7 +2,7 @@ title: Docker Desktop license agreement description: Information about Docker Desktop's license agreement and commercial use requirements keywords: docker desktop license, subscription service agreement, commercial use, licensing terms -weight: 40 +weight: 60 --- Docker Desktop is licensed under the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement). When you download and install Docker Desktop, you're asked to agree to these terms. diff --git a/content/manuals/subscription/details.md b/content/manuals/subscription/details.md index 8deafc136c03..95c090d3278e 100644 --- a/content/manuals/subscription/details.md +++ b/content/manuals/subscription/details.md @@ -1,7 +1,8 @@ --- title: Compare subscription +linkTitle: Compare weight: 10 params: sidebar: goto: "https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscriptionDetails" ---- \ No newline at end of file +--- diff --git a/content/manuals/subscription/faq.md b/content/manuals/subscription/faq.md index b79b0f47357e..c12254c063c8 100644 --- a/content/manuals/subscription/faq.md +++ b/content/manuals/subscription/faq.md @@ -4,7 +4,7 @@ linkTitle: FAQs description: Frequently asked questions about Docker subscriptions and billing keywords: subscription faqs, docker billing, subscription transfer, academic pricing, docker programs tags: [FAQ] -weight: 50 +weight: 70 --- For more information on Docker subscriptions, see [Docker subscription overview](_index.md). diff --git a/content/manuals/subscription/manage-seats.md b/content/manuals/subscription/manage-seats.md index c29a6b950ec1..13e6669b46a0 100644 --- a/content/manuals/subscription/manage-seats.md +++ b/content/manuals/subscription/manage-seats.md @@ -10,14 +10,14 @@ aliases: - /subscription/remove-seats/ - /subscription/core-subscription/add-seats/ - /subscription/core-subscription/remove-seats/ -weight: 20 +weight: 50 --- You can add or remove seats from your Docker Team or Business subscription at any time to accommodate team changes. When you add seats mid-billing cycle, you're charged a prorated amount for the additional seats. > [!IMPORTANT] > If you have a sales-assisted Docker Business subscription, -> contact your account manager to add seats to your subscription. +> contact your account manager to add or remove seats from your subscription. ## Add seats to your subscription @@ -26,14 +26,12 @@ To add seats: 1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. 1. Select **Billing**. - - If you choose to pay using a US bank account, you must verify the account. - - For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account). -1. Select **Add seats** and follow the on-screen instructions to complete - adding seats. +1. Select the action menu from the **Active Plans** tile, then choose **Add seats**. +1. Follow the on-screen instructions to complete adding seats. - You can't use pay by invoice for purchasing additional seats. - You must use a card or US bank account. -You can now add more members to your organization. For more information, see [Manage organization members](../admin/organization/manage/members.md). +You can add more members to your organization. For more information, see [Manage organization members](../admin/organization/manage/members.md). ## Volume pricing @@ -41,16 +39,17 @@ Docker offers volume pricing for Docker Business subscriptions starting at 25 se ## Remove seats from your subscription -You can remove seats from your Team or Business subscription at any time. Changes apply to your next billing cycle, and unused portions aren't refundable. - -For example, if you're billed on the 8th of every month for 10 seats and remove 2 seats on the 15th, the 2 seats remain available until your next billing cycle. Your payment for 8 seats begins on the next billing cycle. - -If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription. To remove seats: +You can remove seats from your Team or Business subscription at any time. To remove seats: 1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. 1. Select **Billing**. -1. In the **Seats** row, select the action icon, then **Remove seats**. +1. Select the action menu, then choose **Remove seats**. 1. Follow the on-screen instructions to complete removing seats. -You can cancel the removal of seats before your next billing cycle. To do so, select **Cancel change**. +Changes apply to your next billing cycle, and unused portions aren't refundable. + +For example, if you're billed on the 8th of every month for 10 seats and remove 2 seats on the 15th, the 2 seats remain available until your next billing cycle. Your payment for 8 seats begins on the next billing cycle. + +> [!TIP] +> You can cancel the removal of seats before your next billing cycle. To do so, select **Cancel change**. diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index ef60b13bbff2..e94b3a7bdf2d 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -1,15 +1,18 @@ --- 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: 17 +weight: 30 --- Docker subscriptions let you scale consumption as your needs grow. All paid Docker subscriptions include base amounts of Docker Build Cloud build minutes and Testcontainers Cloud runtime minutes that you can supplement with additional capacity. + You can scale consumption for: - Docker Build Cloud build minutes - Testcontainers Cloud runtime minutes +- Docker Hardened Images (DHI) repositories To understand your usage patterns, [view your consumption](../admin/organization/manage/manage-products.md#monitor-product-usage-for-your-organization) at any time. @@ -28,9 +31,9 @@ For example, with an annual Docker Team subscription (500 included minutes), if Purchase additional build minutes through the Docker Build Cloud Dashboard: 1. Sign in to [Docker Home](https://app.docker.com/) and choose -your organization. + your organization. 1. Select **Build Cloud**, then **Build minutes**. -1. Select **Add prepaid minutes**. +1. Select **Add minutes**. 1. Select your additional minute amount, then **Continue to payment**. 1. Enter your payment details and billing address. 1. Review your order and select **Pay**. @@ -45,3 +48,25 @@ You can add Testcontainers Cloud runtime minutes in two ways: - Use unlimited runtime minutes on-demand with billing at the end of each monthly cycle 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 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. + +> [!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 learn more, see: + +- [Testcontainers overview](/manuals/testcontainers.md) +- [Docker Build Cloud overview](/manuals/build-cloud/_index.md) +- [DHI Select and Enterprise quickstart](/manuals/dhi/how-to/select-enterprise.md) diff --git a/content/manuals/subscription/setup.md b/content/manuals/subscription/setup.md index 3c85a540a137..92f88d620e0a 100644 --- a/content/manuals/subscription/setup.md +++ b/content/manuals/subscription/setup.md @@ -2,7 +2,8 @@ description: Set up Docker subscriptions for personal accounts and organizations keywords: subscription setup, docker pro, docker team, docker business, organization setup title: Set up your subscription -weight: 15 +linkTitle: Setup +weight: 20 --- Docker subscriptions provide features and benefits for individual developers, teams, and enterprise businesses. This page explains how to set up subscriptions for personal accounts and organizations. @@ -21,6 +22,29 @@ You can subscribe a new or existing organization to Docker Team or Business subs 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. Choose and purchase a Docker Team or Business subscription for the organization. +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. Fill in plan entitlements, verify your billing details, then continue to payment to complete checkout. -To upgrade an existing organization's subscription, see [Upgrade your subscription](./change.md#upgrade-your-subscription). +## 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).