diff --git a/content/manuals/admin/company/manage/organizations.md b/content/manuals/admin/company/manage/organizations.md index baef9af03e12..4a122de6e069 100644 --- a/content/manuals/admin/company/manage/organizations.md +++ b/content/manuals/admin/company/manage/organizations.md @@ -23,7 +23,7 @@ The **Organizations** view displays all organizations under your company. 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). +see [Manage seats](/manuals/admin/organization/manage/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/admin/company/manage/users.md b/content/manuals/admin/company/manage/users.md index a6119a2508dd..04a7a4285874 100644 --- a/content/manuals/admin/company/manage/users.md +++ b/content/manuals/admin/company/manage/users.md @@ -87,7 +87,7 @@ addresses: > available seats in your organization, you cannot continue to invite members. > To invite members, you can purchase more seats, or remove some email > addresses from the CSV file and re-select the new file. To purchase more - > seats, see [Add seats to your subscription](/manuals/subscription/manage-seats.md#add-seats-to-your-subscription) or + > seats, see [Add seats to your subscription](/manuals/admin/organization/manage/manage-seats.md#add-seats-to-your-subscription) or > [Contact sales](https://www.docker.com/pricing/contact-sales/). 1. After the CSV file has been uploaded, select **Review**. diff --git a/content/manuals/admin/organization/manage/manage-licenses.md b/content/manuals/admin/organization/manage/manage-licenses.md new file mode 100644 index 000000000000..3ba721b65e2b --- /dev/null +++ b/content/manuals/admin/organization/manage/manage-licenses.md @@ -0,0 +1,48 @@ +--- +title: Manage license assignment +linkTitle: License assignment +description: Manage product licenses for your organization, including assignment, revocation, and automatic assignment. +keywords: licenses, organization, members, Docker Offload, AI governance, license assignment, admin console +weight: 30 +--- + +Licenses let you selectively choose which of your organization members have access to supported Docker products. Organization owners can oversee who on their team has active licenses, or configure licenses to assign automatically when members access supported Docker products. Like Docker Core seats, licenses can be configured on a per member basis. + +> [!TIP] +> To learn more about product licenses, Docker Core seats, and other Docker add-ons see [scale your subscription](/manuals/subscription/scale.md), +> or [contact sales](https://www.docker.com/pricing/contact-sales/) to purchase licenses. + +## Manage licenses + +The **Members** page lets you track the number of available licenses for your organization and who currently holds a license. You can also assign or revoke licenses from this page. + +To manage licenses for your organization: + +1. Sign in to [Docker Home](https://app.docker.com), then choose your organization. +1. Select **Members** from the left navigation. +1. Select the action menu at the end of the row to assign or revoke an active license. +1. Optional. To bulk assign or revoke licenses, choose the members you want to bulk manage, then select the **Bulk actions** menu. +1. Optional. To manage automatic license assignment, turn off or turn on with the **Automatically assign licenses** toggle. + +You must assign licenses manually, or configure automatic license assignment to consume a license. Inviting a new member to your organization may consume a seat for your Docker Core subscription, but won't auto-assign product licenses by default. Conversely, purchasing a set of licenses won't trigger automatic assignment to existing members. + +## Automatic license assignment + +Automatic license assignment gives members a product license when they use a supported product for the first time. Automatic license assignment is available for AI Governance licenses. + +- When you purchase AI Governance, signing into [Docker Sandboxes](https://docs.docker.com/ai/sandboxes/) with `login` command in `sbx` CLI (`sbx login`) automatically provisions AI Governance licenses on a first-come, first served basis. +- Similarly, logins to Docker Desktop will automatically provision Docker Core licenses for AI Governance license-holding organizations that have available Docker Core seats. +- Licenses are assigned until exhausted. + - Once the available licenses are exhausted, automatic license assignment will stop until you purchase more licenses or revoke assigned licenses. + - Members can still use Docker Sandbox or Docker Desktop, but organization policies for those products won't affect their usage. + +AI Governance licenses include single sign-on (SSO) and provisioning features regardless of your Docker Core subscription. Automatic license assignment requires [setting up SSO](/manuals/enterprise/security/single-sign-on/connect.md), then [provisioning with System for Cross-domain Identity Management (SCIM) or Just-in-Time (JIT)](/manuals/enterprise/security/provisioning/_index.md). + +## What's next + +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 +- [Docker Offload](/manuals/offload/about.md) to let your developers offload building and running containers to the cloud diff --git a/content/manuals/admin/organization/manage/manage-products.md b/content/manuals/admin/organization/manage/manage-products.md index 294399ccf9f3..7016f69cd409 100644 --- a/content/manuals/admin/organization/manage/manage-products.md +++ b/content/manuals/admin/organization/manage/manage-products.md @@ -1,6 +1,6 @@ --- title: Docker products -weight: 30 +weight: 50 description: Learn how to manage access and usage for Docker products for your organization keywords: organization, tools, products, product access, organization management aliases: diff --git a/content/manuals/subscription/manage-seats.md b/content/manuals/admin/organization/manage/manage-seats.md similarity index 95% rename from content/manuals/subscription/manage-seats.md rename to content/manuals/admin/organization/manage/manage-seats.md index 13e6669b46a0..2005a2b352c6 100644 --- a/content/manuals/subscription/manage-seats.md +++ b/content/manuals/admin/organization/manage/manage-seats.md @@ -1,6 +1,6 @@ --- title: Manage subscription seats -linkTitle: Manage seats +linkTitle: Seats description: Add or remove seats for Docker Team and Business subscriptions keywords: manage seats, add seats, remove seats, subscription billing, team members aliases: @@ -10,7 +10,8 @@ aliases: - /subscription/remove-seats/ - /subscription/core-subscription/add-seats/ - /subscription/core-subscription/remove-seats/ -weight: 50 + - /subscription/manage-seats/ +weight: 40 --- 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. @@ -31,7 +32,7 @@ To add seats: - You can't use pay by invoice for purchasing additional seats. - You must use a card or US bank account. -You can 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](./members.md). ## Volume pricing diff --git a/content/manuals/admin/organization/manage/members.md b/content/manuals/admin/organization/manage/members.md index d731b98e0ab4..0278be28dd61 100644 --- a/content/manuals/admin/organization/manage/members.md +++ b/content/manuals/admin/organization/manage/members.md @@ -87,7 +87,7 @@ Invitation email links expire after 14 days. If your email link has expired, you After inviting members, you can resend or remove invitations as needed. Each invitee occupies one seat, so if the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you won't be able to invite more members. > [!TIP] -> Need to manage more than 1,000 team members? [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminMembers) and advanced role management. You can also [add seats](/manuals/subscription/manage-seats.md) to your subscription. +> Need to manage more than 1,000 team members? [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminMembers) and advanced role management. You can also [add seats](/manuals/admin/organization/manage/manage-seats.md) to your subscription. ### Resend an invitation diff --git a/content/manuals/admin/organization/setup/orgs.md b/content/manuals/admin/organization/setup/orgs.md index d610df176697..4ce5256b3496 100644 --- a/content/manuals/admin/organization/setup/orgs.md +++ b/content/manuals/admin/organization/setup/orgs.md @@ -71,7 +71,7 @@ configure your organization. If you have multiple organizations that you want to merge into one, complete the following steps: -1. Based on the number of seats from the secondary organization, [purchase additional seats](../../../subscription/manage-seats.md) for the primary organization account that you want to keep. +1. Based on the number of seats from the secondary organization, [purchase additional seats](../manage/manage-seats.md) for the primary organization account that you want to keep. 1. Manually add users to the primary organization and remove existing users from the secondary organization. 1. Manually move over your data, including all repositories. 1. Once you're done moving all of your users and data, [downgrade](../../../subscription/change.md) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle. diff --git a/content/manuals/billing/3d-secure.md b/content/manuals/billing/3d-secure.md index fc4ec800ff56..9b1b2efdca39 100644 --- a/content/manuals/billing/3d-secure.md +++ b/content/manuals/billing/3d-secure.md @@ -30,7 +30,7 @@ actions: - Starting a [paid subscription](../subscription/setup.md) - Changing your [billing cycle](/manuals/billing/cycle.md) from monthly to annual - [Upgrading your subscription](../subscription/change.md) -- [Adding seats](../subscription/manage-seats.md) to an existing subscription +- [Adding seats](../admin/organization/manage/manage-seats.md) to an existing subscription If 3DS is required and your payment method supports it, the verification prompt will appear during checkout. diff --git a/content/manuals/enterprise/security/provisioning/auto-provisioning.md b/content/manuals/enterprise/security/provisioning/auto-provisioning.md index dce2f65d085c..b573cbfc55e7 100644 --- a/content/manuals/enterprise/security/provisioning/auto-provisioning.md +++ b/content/manuals/enterprise/security/provisioning/auto-provisioning.md @@ -20,20 +20,20 @@ When auto-provisioning is enabled for a verified domain: - Auto-provisioning only adds existing Docker users to your organization, it doesn't create new accounts. - Users experience no changes to their sign-in process. - Company and organization owners receive email notifications when new users are added. -- You may need to [manage seats](/manuals/subscription/manage-seats.md) to accommodate new users. +- You may need to [manage seats](/manuals/admin/organization/manage/manage-seats.md) to accommodate new users. ### Enable auto-provisioning Auto-provisioning is configured per domain. To enable it: 1. Sign in to [Docker Home](https://app.docker.com) and select -your company or organization. + your company or organization. 1. Select **Admin Console**, then **Domain management**. 1. Select the **Actions menu** next to the domain you want to enable -auto-provisioning for. + auto-provisioning for. 1. Select **Enable auto-provisioning**. 1. Optional. If enabling auto-provisioning at the company level, select an -organization. + organization. 1. Select **Enable** to confirm. The **Auto-provisioning** column will update to **Enabled** for the domain. @@ -43,8 +43,8 @@ The **Auto-provisioning** column will update to **Enabled** for the domain. To disable auto-provisioning for a user: 1. Sign in to [Docker Home](https://app.docker.com) and select -your organization. If your organization is part of a company, select the company -and configure the domain for the organization at the company level. + your organization. If your organization is part of a company, select the company + and configure the domain for the organization at the company level. 1. Select **Admin Console**, then **Domain management**. 1. Select the **Actions menu** next to your domain. 1. Select **Disable auto-provisioning**. diff --git a/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md b/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md index a184d5f7b3ff..5fe8304714b6 100644 --- a/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md +++ b/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md @@ -162,7 +162,7 @@ This error occurs when the organization has no available seats for the user when **Add more seats to the organization** -Purchase additional Docker Business subscription seats. For details, see [Manage subscription seats](/manuals/subscription/manage-seats.md). +Purchase additional Docker Business subscription seats. For details, see [Manage subscription seats](/manuals/admin/organization/manage/manage-seats.md). **Remove users or pending invitations** diff --git a/content/manuals/subscription/_index.md b/content/manuals/subscription/_index.md index 88ed55011872..de09f553bbae 100644 --- a/content/manuals/subscription/_index.md +++ b/content/manuals/subscription/_index.md @@ -7,37 +7,33 @@ params: sidebar: group: Platform grid_subscriptions: -- title: Compare Docker subscriptions - description: Visit the pricing page to see what's included in different Docker subscriptions. - link: "https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscription" - icon: magnifying-glass -- title: Set up your subscription - description: Get started setting up a personal or organization subscription. - link: /subscription/setup/ - icon: shopping-cart -- title: Scale your subscription - description: Scale your subscription to fit your needs. - link: /subscription/scale/ - icon: chart-bar -- title: Change your subscription - description: Learn how to upgrade or downgrade your subscription. - link: /subscription/change/ - icon: arrow-up-circle -- title: Manage seats - description: Learn how to add or remove seats from your subscription. - link: /subscription/manage-seats/ - icon: user-plus -- title: Docker Desktop license agreement - description: Review the terms of the Docker Subscription Service Agreement. - link: /subscription/desktop-license/ - icon: document-text -- title: Subscription FAQs - description: Find the answers you need and explore common questions. - link: /subscription/faq/ - icon: question-mark-circle + - title: Compare Docker subscriptions + description: Visit the pricing page to see what's included in different Docker subscriptions. + link: "https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscription" + icon: magnifying-glass + - title: Set up your subscription + description: Get started setting up a personal or organization subscription. + link: /subscription/setup/ + icon: shopping-cart + - title: Scale your subscription + description: Scale your subscription to fit your needs. + link: /subscription/scale/ + icon: chart-bar + - title: Change your subscription + description: Learn how to upgrade or downgrade your subscription. + link: /subscription/change/ + icon: arrow-up-circle + - title: Docker Desktop license agreement + description: Review the terms of the Docker Subscription Service Agreement. + link: /subscription/desktop-license/ + icon: document-text + - title: Subscription FAQs + description: Find the answers you need and explore common questions. + link: /subscription/faq/ + icon: question-mark-circle aliases: -- /docker-hub/billing/ -- /docker-hub/billing/faq/ + - /docker-hub/billing/ + - /docker-hub/billing/faq/ --- Docker subscriptions provide licensing for commercial use of Docker products including Docker Desktop, Docker Hub, Docker Build Cloud, Docker Scout, and Testcontainers Cloud. diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index e94b3a7bdf2d..d959ed643f2c 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -6,27 +6,51 @@ keywords: scale subscription, docker build cloud minutes, testcontainers cloud m 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. +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: -You can scale consumption for: +- 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 -- Docker Build Cloud build minutes -- Testcontainers Cloud runtime minutes -- Docker Hardened Images (DHI) repositories +## Add licenses -To understand your usage patterns, [view your consumption](../admin/organization/manage/manage-products.md#monitor-product-usage-for-your-organization) at any time. +Licenses add a layer to your Docker subscriptions, letting you assign products to select members of your +organization without consuming a Docker Core seat. You can purchase licenses for some Docker products: -> [!NOTE] -> -> Legacy Docker subscribers must upgrade to new Docker subscriptions to access scaling options. Legacy subscriptions apply to subscribers who last purchased or renewed before December 10, 2024. For details, see [Announcing Upgraded Docker Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/). +- AI Governance +- Docker Offload -## Usage considerations +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/). + +### 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 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 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 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. + +## Add minutes Minutes don't roll over. Base subscription minutes reset each billing period and don't accumulate. Additional purchased minutes expire at the end of your subscription period. For example, with an annual Docker Team subscription (500 included minutes), if you purchase 500 additional minutes, only the additional 500 minutes roll over until your annual renewal. -## Add Docker Build Cloud build minutes +### Docker Build Cloud build minutes Purchase additional build minutes through the Docker Build Cloud Dashboard: @@ -40,7 +64,7 @@ Purchase additional build minutes through the Docker Build Cloud Dashboard: Your additional minutes appear on the Build minutes page immediately. -## Add Docker Testcontainers Cloud runtime minutes +### Docker Testcontainers Cloud runtime minutes You can add Testcontainers Cloud runtime minutes in two ways: @@ -49,7 +73,7 @@ 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 +## Add DHI repositories to DHI Select To add more hardened repositories to your DHI Select plan: @@ -59,14 +83,16 @@ To add more hardened repositories to your DHI Select plan: 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. +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) +- [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) - [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) + + +