diff --git a/COMPONENTS.md b/COMPONENTS.md index 69eeef375181..8a35a66a5918 100644 --- a/COMPONENTS.md +++ b/COMPONENTS.md @@ -296,7 +296,7 @@ features: | subscription | Subscription tier required | All, Personal, Pro, Team, Business | | availability | Product development stage | Experimental, Beta, Early Access, GA, Retired | | requires | Minimum version requirement | String describing version (link to release notes) | -| for | Indicates administrator-only features | Administrators | +| for | Audience for the feature | Administrators, Individuals | ### Buttons diff --git a/content/guides/admin-set-up.md b/content/guides/admin-set-up.md index d1676f550dc7..99f7e6db7b0a 100644 --- a/content/guides/admin-set-up.md +++ b/content/guides/admin-set-up.md @@ -186,7 +186,7 @@ settings, along with your chosen method for [enforcing sign-in](/manuals/enterpr If you have more than one organization, consider either [consolidating them into one organization](/manuals/accounts/organization/setup/orgs.md) or creating a -[Docker company](/manuals/accounts/organization/company/_index.md) to manage multiple +[Docker company](/manuals/accounts/company/_index.md) to manage multiple organizations. ### Begin setup diff --git a/content/manuals/_index.md b/content/manuals/_index.md index 1c3cda8dd285..51b69b2d9239 100644 --- a/content/manuals/_index.md +++ b/content/manuals/_index.md @@ -95,6 +95,14 @@ params: description: Frequently asked questions about Docker accounts, organizations, companies, subscriptions, billing, and security. icon: question-mark-circle link: /faqs/ + - title: Support + description: Support options for paid subscriptions and community resources. + icon: chat-bubble-left + link: /support/ + - title: Release notes + description: Features, bug fixes, and breaking changes for Docker Home, billing, security, and subscriptions. + icon: document-plus + link: /platform-release-notes/ enterprise: - title: Deploy Docker Desktop description: Deploy Docker Desktop at scale within your company diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index c7aa6999d4c4..0c8bebc8369b 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -15,14 +15,41 @@ grid: icon: user-circle link: /accounts/individual/ - title: Organization accounts - description: Manage organizations, companies, members, and teams. + description: Manage members, teams, and organization settings. icon: building-storefront link: /accounts/organization/ + - title: Company accounts + description: Group multiple organizations for centralized administration. + icon: building-office-2 + link: /accounts/company/ + - title: Security + description: Authentication, tokens, and roles for accounts and organizations. + icon: lock-closed + link: /security/ + - title: Subscription and billing + description: Plans, payments, and invoices for your account or organization. + icon: credit-card + link: /subscription-billing/ + - title: FAQs + description: Common questions about accounts, billing, and security. + icon: question-mark-circle + link: /faqs/ --- -A Docker account identifies you and lets you access Docker products. Use an -individual account for your Docker ID and personal settings. Use an -organization account to manage members, teams, and company-wide settings. +A Docker account identifies you and lets you access Docker products. You +manage it in [Docker Home](https://app.docker.com/). Docker has two +primary account types: individual and organization. A company groups +multiple organizations. + +| Account type | What it is | Who it's for | +| --- | --- | --- | +| Individual | A Docker ID with personal settings, Hub repositories, and sign-in methods | A person | +| Organization | A shared workspace for members, teams, and repositories | Teams on Docker Team or Business | +| Company | Multiple organizations under centralized administration | Docker Business subscribers | + +You always sign in with your individual account, then work in the +organizations you own or belong to. Those organizations sit under a +company when you administer more than one. ## Next steps diff --git a/content/manuals/accounts/organization/company/_index.md b/content/manuals/accounts/company/_index.md similarity index 68% rename from content/manuals/accounts/organization/company/_index.md rename to content/manuals/accounts/company/_index.md index dd1349de3d08..e55aaf076e05 100644 --- a/content/manuals/accounts/organization/company/_index.md +++ b/content/manuals/accounts/company/_index.md @@ -1,18 +1,18 @@ --- title: Company overview -linkTitle: Companies -weight: 30 +linkTitle: Company +weight: 20 description: Learn how to manage multiple organizations using companies, including managing users, owners, and security. keywords: company, multiple organizations, manage companies, Docker Home, Docker Business settings grid: - title: Create a company description: Get started by learning how to create a company. icon: building-office-2 - link: /accounts/organization/company/new-company/ + link: /accounts/company/new-company/ - title: Manage your company description: Add organizations, manage company owners, and invite members. icon: building-storefront - link: /accounts/organization/company/manage/ + link: /accounts/company/manage/ - title: Configure SSO and SCIM description: Set up single sign-on and SCIM provisioning for your company. icon: key @@ -39,13 +39,21 @@ and manage it through Docker Home. ## Company structure -The following diagram shows how a company relates to its associated -organizations. +A company sits at the top of the hierarchy and groups multiple Docker +organizations for centralized configuration. Companies are only available +for Docker Business subscribers. -![Diagram showing how companies relate to Docker organizations](/accounts/organization/images/docker-admin-structure.webp) +![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](../organization/images/docker-admin-structure.webp) -For the full administration hierarchy, see -[Company and organization hierarchy](/manuals/accounts/organization/_index.md#company-and-organization-hierarchy). +An organization sits below the company. You group teams and members there +and assign access to repositories. Every Docker Team and Business +subscriber has at least one organization. + +For organization structure, including teams and members, see +[Organization accounts](/manuals/accounts/organization/_index.md). + +[Upgrading to a Docker Business plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdmin) +grants you the company owner role so you can manage multiple organizations. ## Company roles @@ -63,7 +71,7 @@ organization owners. automatically adds them as an organization member. To add or remove company owners, see -[Manage your company](/manuals/accounts/organization/company/manage.md#company-owners). +[Manage your company](/manuals/accounts/company/manage.md#company-owners). ## Next steps diff --git a/content/manuals/accounts/organization/company/manage.md b/content/manuals/accounts/company/manage.md similarity index 98% rename from content/manuals/accounts/organization/company/manage.md rename to content/manuals/accounts/company/manage.md index d7a1d3898eb4..a7b466825003 100644 --- a/content/manuals/accounts/organization/company/manage.md +++ b/content/manuals/accounts/company/manage.md @@ -47,7 +47,7 @@ longer manage it through the company, and its owner must manage it separately. A company can have multiple owners who manage the company and all of its organizations. For details about the company owner role and how it affects -seats, see [Company roles](/manuals/accounts/organization/company/_index.md#company-roles). +seats, see [Company roles](/manuals/accounts/company/_index.md#company-roles). ### Add a company owner diff --git a/content/manuals/accounts/organization/company/new-company.md b/content/manuals/accounts/company/new-company.md similarity index 100% rename from content/manuals/accounts/organization/company/new-company.md rename to content/manuals/accounts/company/new-company.md diff --git a/content/manuals/accounts/individual/_index.md b/content/manuals/accounts/individual/_index.md index 68295c2a0cfd..ad0cf10392c1 100644 --- a/content/manuals/accounts/individual/_index.md +++ b/content/manuals/accounts/individual/_index.md @@ -9,7 +9,7 @@ keywords: accounts, docker ID, username, email, Google, GitHub, sign-in, organization account, account types, Docker Hub, SSO, deactivate account weight: 10 grid: - - title: Create an account + - title: Set up your account description: Get started with Docker and create an account. icon: finger-print link: /accounts/individual/create-account/ @@ -38,9 +38,9 @@ grid: A Docker account is how Docker identifies you. Use it to access products like Docker Hub and Docker Desktop, manage settings, and join organizations. -Docker has two primary account types: individual and organization. You create -and administer organizations with your individual account. For organization -accounts, including companies, see +For how individual, organization, and company accounts compare, see +[Accounts](/manuals/accounts/_index.md). For organization accounts, including +companies, see [Organization accounts](/manuals/accounts/organization/_index.md). ## Docker ID, email, and sign-in diff --git a/content/manuals/accounts/individual/create-account.md b/content/manuals/accounts/individual/create-account.md index 6147e8d9d162..3db92002274e 100644 --- a/content/manuals/accounts/individual/create-account.md +++ b/content/manuals/accounts/individual/create-account.md @@ -1,6 +1,6 @@ --- title: Create a Docker account -linkTitle: Create +linkTitle: Setup weight: 10 description: Create a Docker ID with email, Google, or GitHub, then verify your account diff --git a/content/manuals/accounts/organization/_index.md b/content/manuals/accounts/organization/_index.md index 39b501a7ae8b..f270382e28ab 100644 --- a/content/manuals/accounts/organization/_index.md +++ b/content/manuals/accounts/organization/_index.md @@ -16,10 +16,14 @@ grid: description: Manage members, teams, seats, and product access. icon: user-plus link: /accounts/organization/manage/ - - title: Company administration - description: Explore how to manage a company. - icon: building-office-2 - link: /accounts/organization/company/ + - title: Activity logs + description: Review member activity across your organization and repositories. + icon: clipboard-document-list + link: /accounts/organization/activity-logs/ + - title: Insights + description: See how people in your organization use Docker. + icon: chart-bar + link: /accounts/organization/insights/ - title: Security description: Explore security features for administrators. icon: shield-check @@ -48,19 +52,9 @@ As an organization or company owner, you can: - Set company-wide policies, including SCIM provisioning and security enforcement -## Individual and organization accounts - -Docker has two primary account types: - -- Individual accounts that are identified by a Docker ID. -- Organization accounts that are shared workspaces for teams and - repositories. - -Every organization is created and administered by one or more individual -accounts. You always sign in with your individual account, then work in the -organizations you own or belong to. Organization owners and members are -individual accounts that hold a role in that organization. For individual -accounts, see [Docker individual accounts](/manuals/accounts/individual/_index.md). +For how individual, organization, and company accounts compare, see +[Accounts](/manuals/accounts/_index.md). For individual accounts, see +[Docker individual accounts](/manuals/accounts/individual/_index.md). ## Organization structure @@ -70,40 +64,7 @@ The following diagram shows how organizations relate to teams and members. organization](./images/org-structure.webp) An organization includes owners, members, and optional teams. Organization -owners have full administrator access to manage members, roles, and teams. A -team is an optional grouping of members that share the same repository -permissions. - -For details about each role and its permissions, see -[Roles and -permissions](/manuals/security/roles-and-permissions/_index.md). - -## Company and organization hierarchy - -To provide centralized administration, Docker organizes companies and -organizations into the following hierarchy and roles. - -![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](./images/docker-admin-structure.webp) - -### Company - -A company groups multiple Docker organizations for centralized configuration. -Companies are only available for Docker Business subscribers. For company -structure, owners, and seats, see -[Company overview](/manuals/accounts/organization/company/_index.md). - -### Organization - -An organization sits below the company and is where you group teams and -members and assign access to repositories. Every Docker Team and Business -subscriber has at least one organization. - -Organization owners hold the organization owner administrator role and manage -organization settings, users, and access controls. Each owner occupies a -[seat](/manuals/faqs/accounts.md#what-is-the-difference-between-user-invitee-seat-and-member). - -[Upgrading to a Docker Business plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdmin) -grants you the company owner role so you can manage multiple organizations. +owners have full administrator access to manage members, roles, and teams. ### Team @@ -116,8 +77,15 @@ or functions. A member is any Docker user added to an organization. Organization and company owners can assign roles to members to define their level of access. +For details about each role and its permissions, see +[Roles and +permissions](/manuals/security/roles-and-permissions/_index.md). + +For how companies relate to organizations, see +[Company structure](/manuals/accounts/company/_index.md#company-structure). + ## Next steps -Learn how to manage companies and organizations in the following sections. +Learn how to manage organizations in the following sections. {{< grid >}} diff --git a/content/manuals/accounts/organization/manage/_index.md b/content/manuals/accounts/organization/manage/_index.md index 7427a0300a1f..8d4089572255 100644 --- a/content/manuals/accounts/organization/manage/_index.md +++ b/content/manuals/accounts/organization/manage/_index.md @@ -9,6 +9,18 @@ grid: description: Invite, manage, and assign roles to your organization members. icon: user-plus link: /accounts/organization/manage/members/ + - title: Teams + description: Create teams and manage repository access for groups of members. + icon: user-group + link: /accounts/organization/manage/manage-a-team/ + - title: Seats + description: Add or remove seats for Docker Team and Business subscriptions. + icon: user-circle + link: /accounts/organization/manage/manage-seats/ + - title: Licenses + description: Assign and revoke product licenses for organization members. + icon: key + link: /accounts/organization/manage/manage-licenses/ - title: Product access and usage description: Manage access and view usage for Docker products across your organization. icon: squares-2x2 diff --git a/content/manuals/accounts/organization/manage/general-settings.md b/content/manuals/accounts/organization/manage/general-settings.md index 0ffc3d317e65..f3560c801512 100644 --- a/content/manuals/accounts/organization/manage/general-settings.md +++ b/content/manuals/accounts/organization/manage/general-settings.md @@ -38,4 +38,4 @@ After configuring your organization information, you can: - [Configure single sign-on (SSO)](/manuals/security/authentication/single-sign-on/connect.md) - [Set up SCIM provisioning](/manuals/security/provisioning/scim/_index.md) - [Manage domains](/manuals/security/provisioning/domain-management.md) -- [Create a company](/manuals/accounts/organization/company/new-company.md) +- [Create a company](/manuals/accounts/company/new-company.md) diff --git a/content/manuals/faqs/_index.md b/content/manuals/faqs/_index.md index 74131629f730..79617019d3a5 100644 --- a/content/manuals/faqs/_index.md +++ b/content/manuals/faqs/_index.md @@ -30,7 +30,7 @@ grid: --- Answers to common questions about Docker accounts, organizations, companies, -subscriptions, billing, security, authentication, and related topics. +subscriptions, billing, and security. ## Next steps diff --git a/content/manuals/faqs/accounts.md b/content/manuals/faqs/accounts.md index df37bda90cc9..c6147b53b617 100644 --- a/content/manuals/faqs/accounts.md +++ b/content/manuals/faqs/accounts.md @@ -140,14 +140,14 @@ seat in each organization. #### Can I use a parent company if some of my organizations don’t have a Docker Business subscription? Yes, but you can only add organizations with a Docker Business subscription -to a company. For more details, see [Add more organizations](/manuals/accounts/organization/company/manage.md#add-more-organizations). +to a company. For more details, see [Add more organizations](/manuals/accounts/company/manage.md#add-more-organizations). #### What happens if one of my organizations downgrades from Docker Business, but I still need access as a company owner? To access and manage a nested organization, it must have a Docker Business subscription. If an organization downgrades from Docker Business, its owner must manage it outside of the company. For more details, see -[Add more organizations](/manuals/accounts/organization/company/manage.md#add-more-organizations). +[Add more organizations](/manuals/accounts/company/manage.md#add-more-organizations). #### Do company owners occupy a subscription seat? diff --git a/content/manuals/security/_index.md b/content/manuals/security/_index.md index 9e1355ad11fa..1723f70a97f5 100644 --- a/content/manuals/security/_index.md +++ b/content/manuals/security/_index.md @@ -1,8 +1,11 @@ --- -title: Security for developers +title: Security linkTitle: Security -description: Learn about developer-level security features like 2FA and access tokens -keywords: docker, docker hub, docker desktop, security, developer security, 2FA, access tokens +description: > + Secure Docker accounts, manage access, and control membership for + individuals and organizations in Docker Home. +keywords: docker, docker hub, security, 2FA, access tokens, SSO, OIDC, + provisioning, roles, Docker Home weight: 40 aliases: - /security/for-developers/ @@ -10,60 +13,60 @@ aliases: params: sidebar: group: Accounts and admin -grid_developers: -- title: Set up two-factor authentication - description: Add an extra layer of authentication to your Docker account. - link: /security/authentication/2fa/ - icon: device-phone-mobile -- title: Manage access tokens - description: Create personal access tokens as an alternative to your password. - icon: lock-closed - link: /security/access-tokens/personal-access-tokens/ -- title: Static vulnerability scanning - description: Automatically run a point-in-time scan on your Docker images for vulnerabilities. - icon: magnifying-glass - link: /docker-hub/repos/manage/vulnerability-scanning/ -- title: Docker Engine security - description: Understand how to keep Docker Engine secure. - icon: shield-check - link: /engine/security/ -- title: Secrets in Docker Compose - description: Learn how to use secrets in Docker Compose. - icon: shield-exclamation - link: /compose/how-tos/use-secrets/ -grid_resources: -- title: Security FAQs - description: Explore common security FAQs. - icon: question-mark-circle - link: /faqs/platform/ -- title: Security best practices - description: Understand the steps you can take to improve the security of your container. - icon: squares-2x2 - link: /develop/security-best-practices/ -- title: Suppress CVEs with VEX - description: Learn how to suppress non-applicable or fixed vulnerabilities found in your images. - icon: chart-bar - link: /scout/guides/vex/ -- title: Docker Hardened Images - description: Learn how to use Docker Hardened Images to enhance your software supply security. - icon: lock-closed - link: /dhi/ +grid: + - title: Authentication + description: Two-factor authentication, single sign-on, and OIDC connections. + icon: key + link: /security/authentication/ + - title: Access tokens + description: Personal and organization access tokens for the Docker CLI and automation. + icon: lock-closed + link: /security/access-tokens/ + - title: Provisioning + description: Add users with SCIM, JIT, auto-provisioning, and domain management. + icon: arrow-path + link: /security/provisioning/ + - title: Roles and permissions + description: Assign core or custom roles to control access in your organization. + icon: shield-check + link: /security/roles-and-permissions/ --- -Docker helps you protect your local environments, infrastructure, and networks -with its developer-level security features. +Security helps individual users and organization owners secure their +accounts, manage access, and control membership. You configure these +settings in [Docker Home](https://app.docker.com/). -Use tools like two-factor authentication (2FA), personal access tokens, and -Docker Scout to manage access and detect vulnerabilities early in your workflow. -You can also integrate secrets securely into your development stack using Docker Compose, -or enhance your software supply security with Docker Hardened Images. +## Individual accounts -Explore the following sections to learn more. +You sign in with your individual account. -## For developers +- [Two-factor authentication](/manuals/security/authentication/2fa/_index.md) +(2FA) adds a time-based one-time password (TOTP) from an authenticator +app to your password. +- A [personal access token](/manuals/security/access-tokens/personal-access-tokens.md) +(PAT) authenticates the Docker CLI and tools without your password, and +is required for CLI sign-in when 2FA is on or single sign-on (SSO) is +enforced. -{{< grid items="grid_developers" >}} +## Organization accounts -## More resources +Organization and company owners set up how members sign in, add them to +the organization, configure automation, and control what members can do. -{{< grid items="grid_resources" >}} +- [Single sign-on](/manuals/security/authentication/single-sign-on/_index.md) +(SSO) federates sign-in through your identity provider, which can cover +one organization or every organization in a company. +- [Provisioning](/manuals/security/provisioning/_index.md) adds users with +System for Cross-domain Identity Management (SCIM), Just-in-Time (JIT) +provisioning, auto-provisioning, or domain matching. +- An [organization access token](/manuals/security/access-tokens/organization-access-tokens.md) +(OAT) stays with the organization when membership changes. +- [OIDC connections](/manuals/security/authentication/oidc-connections/_index.md) +use OpenID Connect to authenticate GitHub Actions with short-lived +tokens, as an alternative to a long-lived OAT. +- [Roles and permissions](/manuals/security/roles-and-permissions/_index.md) +control what members can do after they join. + +## Next steps + +{{< grid >}} diff --git a/content/manuals/security/access-tokens/_index.md b/content/manuals/security/access-tokens/_index.md index daa986403e80..eb933ede9584 100644 --- a/content/manuals/security/access-tokens/_index.md +++ b/content/manuals/security/access-tokens/_index.md @@ -1,6 +1,4 @@ --- -build: - render: never title: Access tokens linkTitle: Access tokens description: Create and manage personal and organization access tokens for Docker Hub authentication. @@ -8,4 +6,32 @@ keywords: access tokens, personal access tokens, organization access tokens, PAT weight: 10 aliases: - /platform/security/access-tokens/ +grid: + - title: Personal access tokens + description: Authenticate the Docker CLI and tools with a token tied to your account. + icon: lock-closed + link: /security/access-tokens/personal-access-tokens/ + - title: Organization access tokens + description: Grant org-owned Hub access to CI/CD and other automation. + icon: building-office-2 + link: /security/access-tokens/organization-access-tokens/ --- + +Access tokens let you authenticate to Docker Hub without using your password. +Use a token for the Docker CLI, automation, and any account that has +two-factor authentication (2FA) or enforced single sign-on (SSO), because +password sign-in to the CLI is not supported in those cases. + +## Choose a token type + +| Token | Ownership | Use when | Limitations | +| --- | --- | --- | --- | +| Personal access token (PAT) | Tied to an individual Docker account | CLI access, local tools, and automation that should run as you. Required for CLI sign-in when 2FA is on or SSO is enforced | Access ends if the account leaves the organization or the token is revoked | +| Organization access token (OAT) | Owned by the organization. Any organization owner can manage it | CI/CD and other automation that must keep working when membership changes | Incompatible with Docker Desktop and Image Access Management | + +For GitHub Actions, [OIDC connections](/manuals/security/authentication/oidc-connections/_index.md) +are an alternative to storing a long-lived organization access token. + +## Next steps + +{{< grid >}} diff --git a/content/manuals/security/access-tokens/personal-access-tokens.md b/content/manuals/security/access-tokens/personal-access-tokens.md index fe185b6f434a..76b8a5d7d7aa 100644 --- a/content/manuals/security/access-tokens/personal-access-tokens.md +++ b/content/manuals/security/access-tokens/personal-access-tokens.md @@ -12,6 +12,8 @@ aliases: - /platform/security/access-tokens/personal-access-tokens/ --- +{{< summary-bar feature_name="PATs" >}} + Personal access tokens (PATs) provide a secure alternative to passwords for Docker CLI authentication. Use PATs to authenticate automated systems, CI/CD pipelines, and development tools without exposing your Docker Hub password. ## Key benefits diff --git a/content/manuals/security/authentication/2fa/_index.md b/content/manuals/security/authentication/2fa/_index.md index 5dd4af329acb..842e9dd8290a 100644 --- a/content/manuals/security/authentication/2fa/_index.md +++ b/content/manuals/security/authentication/2fa/_index.md @@ -13,6 +13,8 @@ aliases: - /platform/security/authentication/2fa/ --- +{{< summary-bar feature_name="2FA" >}} + Two-factor authentication (2FA) adds an essential security layer to your Docker account by requiring a unique security code in addition to your password when signing in. This prevents unauthorized access even if your password is compromised. When you turn on two-factor authentication, Docker provides a unique recovery code specific to your account. Store this code securely as it lets you recover your account if you lose access to your authenticator app. diff --git a/content/manuals/security/authentication/2fa/recover-hub-account.md b/content/manuals/security/authentication/2fa/recover-hub-account.md index d549a2b4214d..9bcc06f9cfd9 100644 --- a/content/manuals/security/authentication/2fa/recover-hub-account.md +++ b/content/manuals/security/authentication/2fa/recover-hub-account.md @@ -10,6 +10,8 @@ aliases: weight: 20 --- +{{< summary-bar feature_name="2FA" >}} + This page explains how to recover your Docker account and manage recovery codes for two-factor authentication. ## Generate a new recovery code diff --git a/content/manuals/security/authentication/_index.md b/content/manuals/security/authentication/_index.md index f9fdf00c4217..8e8332286152 100644 --- a/content/manuals/security/authentication/_index.md +++ b/content/manuals/security/authentication/_index.md @@ -1,6 +1,4 @@ --- -build: - render: never title: Authentication linkTitle: Authentication description: Configure single sign-on, OIDC connections, and two-factor authentication. @@ -8,4 +6,43 @@ keywords: authentication, SSO, OIDC, two-factor authentication, 2FA, Docker secu weight: 20 aliases: - /platform/security/authentication/ +grid: + - title: Single sign-on + description: Authenticate users through your identity provider. + icon: key + link: /security/authentication/single-sign-on/ + - title: Two-factor authentication + description: Add a TOTP security code to an individual Docker account. + icon: device-phone-mobile + link: /security/authentication/2fa/ + - title: OIDC connections + description: Authenticate GitHub Actions with short-lived tokens. + icon: lock-closed + link: /security/authentication/oidc-connections/ --- + +Authentication in Docker Home is how users and workloads prove who they are +before they access Docker products. + +Two-factor authentication (2FA) protects an individual account. Single +sign-on (SSO) federates sign-in for an organization or company. OpenID +Connect (OIDC) connections authenticate CI workloads such as GitHub Actions. + +## Choose an authentication method + +| Method | Who it covers | Who configures it | How authentication works | +| --- | --- | --- | --- | +| Two-factor authentication (2FA) | An individual Docker account | The account holder | Password plus a time-based one-time password (TOTP) from an authenticator app | +| Single sign-on (SSO) | An organization or company | An organization or company owner | Users sign in through the organization's identity provider (IdP) | +| OIDC connections | GitHub Actions and similar workloads | An organization owner or editor | Docker exchanges short-lived tokens issued per workflow run | + +SSO requires a Docker Business subscription. OIDC connections require a +Docker Team or Business subscription. + +To require Docker Desktop users to sign in as organization members, see +[Enforce sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md). +Enforce sign-in is configured in Enterprise, not in this section. + +## Next steps + +{{< grid >}} diff --git a/content/manuals/security/authentication/oidc-connections/_index.md b/content/manuals/security/authentication/oidc-connections/_index.md index bca796dcf123..43b78274f313 100644 --- a/content/manuals/security/authentication/oidc-connections/_index.md +++ b/content/manuals/security/authentication/oidc-connections/_index.md @@ -35,19 +35,8 @@ GitHub follows these steps: All tokens created and exchanged during an OIDC workflow are short-lived and issued on a per-workflow basis. -## OIDC connections and OATs - -[Organization access tokens (OATs)](/manuals/security/access-tokens/organization-access-tokens.md) -provide programmatic access to your Docker resources at the organization -level. Unlike personal access tokens, OATs aren't tied to individual -members, so access continues when membership changes. - -OIDC connections don't replace OATs. OIDC connections authenticate a -workflow as if it were a user, then authorize access after authentication. - -While OATs govern access to your Docker resources through organization -membership, OIDC connections authenticate GitHub Actions workflows when -they request a change to your Docker resources. +For how OIDC connections compare to organization access tokens, see +[Access tokens](/manuals/security/access-tokens/_index.md). ## Next steps diff --git a/content/manuals/security/roles-and-permissions/core-roles.md b/content/manuals/security/roles-and-permissions/core-roles.md index 1054582dd501..9cce5c460480 100644 --- a/content/manuals/security/roles-and-permissions/core-roles.md +++ b/content/manuals/security/roles-and-permissions/core-roles.md @@ -37,7 +37,7 @@ Docker organizations have three core roles: A company owner has the same organization-management permissions as an organization owner. Content and registry permissions, such as repository pull and push, don't apply to company owners. For more information, see -[Company overview](/manuals/accounts/organization/company/_index.md). +[Company overview](/manuals/accounts/company/_index.md). ## Permissions reference @@ -135,5 +135,5 @@ _\* If not part of a company_ Create tailored permission sets on a Docker Business plan - [Manage organization members](/manuals/accounts/organization/manage/members.md): Invite users and assign roles -- [Company overview](/manuals/accounts/organization/company/_index.md): Understand company +- [Company overview](/manuals/accounts/company/_index.md): Understand company owner permissions versus organization owner permissions diff --git a/content/manuals/security/roles-and-permissions/custom-roles/_index.md b/content/manuals/security/roles-and-permissions/custom-roles/_index.md index 8ba69af1b31a..85e10d2b614a 100644 --- a/content/manuals/security/roles-and-permissions/custom-roles/_index.md +++ b/content/manuals/security/roles-and-permissions/custom-roles/_index.md @@ -25,16 +25,12 @@ aliases: {{< summary-bar feature_name="Custom roles" >}} -Custom roles are permission sets that you choose to grant access to users or teams based on specific use cases. Use custom roles when you need: +Custom roles are permission sets that you choose to grant access to users +or teams based on specific use cases. Use custom roles when you need +specialized roles, department-specific access, or least-privilege grants. -- Specialized roles such as billing administrators, security auditors, or - repository managers -- Department-specific access control -- Least-privilege access with precise permission grants - -If Docker's predefined -permission sets meet your needs, use -[core roles](/manuals/security/roles-and-permissions/core-roles.md) +If Docker's predefined permission sets meet your needs, use +[core roles](/manuals/security/roles-and-permissions/_index.md) instead. ## Prerequisites @@ -48,8 +44,6 @@ To create a custom role, you select permissions from organization management, Docker Hub, billing, AI Governance, Docker Hardened Images, and Docker Offload. You then assign custom roles you created to individual users or to teams. -Users and teams get either a core role or a custom role, but not both. - ## Next steps {{< grid >}} diff --git a/content/manuals/subscription-billing/_index.md b/content/manuals/subscription-billing/_index.md index fcbf0ef46fa4..f098754e56c6 100644 --- a/content/manuals/subscription-billing/_index.md +++ b/content/manuals/subscription-billing/_index.md @@ -13,119 +13,63 @@ aliases: - /docker-hub/billing/ - /docker-hub/billing/faq/ - /billing/docker-hub-pricing/ -grid_subscriptions: - - title: Compare Docker plans - description: Visit the pricing page to see what's included in different Docker plans. - link: "https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscription" - icon: magnifying-glass - - title: Manage plans - description: Add a new plan, upgrade an active plan, or cancel auto-renewal. - link: /subscription-billing/manage/plans/ - icon: shopping-cart +grid: - title: Explore plans description: Browse available Docker plans and add-ons for individuals, teams, and organizations. link: /subscription-billing/plans/ icon: chart-bar - - title: Docker Desktop license agreement - description: Review the terms of the Docker Subscription Service Agreement. - link: /subscription-billing/desktop-license/ - icon: document-text -grid_core: - - title: Add or update a payment method - description: Learn how to add or update a payment method for your personal account or organization. - link: /subscription-billing/manage/payment-method/ + - title: Manage billing + description: Manage payment methods, invoices, credits, and billing details in the billing portal. + link: /subscription-billing/manage/ icon: credit-card - - title: Update billing information - description: Learn how to update billing information for your personal account or organization. - link: /subscription-billing/manage/details/ - icon: pencil-square - - title: View billing history - description: Learn how to view billing history and download past invoices. - link: /subscription-billing/manage/history/ - icon: credit-card - - title: 3D Secure authentication - description: Learn how 3DS works and how to troubleshoot verification issues. - link: /subscription-billing/manage/3d-secure/ - icon: wallet - - title: Taxes - description: Learn how to submit a US tax exemption certificate or add a VAT number. - link: /subscription-billing/manage/tax-certificate/ - icon: document-text --- -You can subscribe to several Docker plans that range from free to paid plans. When you upgrade a plan, you expand your usage entitlements and feature sets for Docker products. You can also top up some plans, extending usage to more users without changing your plan type. +A Docker plan is a subscription tied to a personal account, an organization +account, or a specific product. When you upgrade a plan, you expand your +usage entitlements and feature sets. You can also top up some plans, +extending usage without changing your plan type. ## Docker plans -You can subscribe to plans for individual or organization accounts, or plans for specific products. The following table summarizes the available plans. +The following table summarizes the available plans. -| Plans | Billing model | Types | -| ---------------------------------------------------------------------- | --------------------------------------------------------- | --------------------------------------------------------- | -| [Docker](/manuals/subscription-billing/plans/docker.md) | Flat-rate plans for personal and organization accounts | Docker Personal, Docker Pro, Docker Team, Docker Business | -| [Docker Agentic Platform](/manuals/subscription-billing/plans/docker-agentic-platform.md) | Pay-as-you-go (PayGo) for cloud sandbox usage | Docker Agentic Platform | -| [Docker Hardened Images (DHI)](/manuals/subscription-billing/plans/dhi.md) | Graduated security features for hardened container images | DHI Community, DHI Select, DHI Enterprise | -| [Gordon](/manuals/subscription-billing/plans/gordon.md) | Prepaid usage for the Gordon AI agent | Gordon Plus, Gordon Max, Gordon Ultra | -| [AI Governance](/manuals/subscription-billing/plans/ai-governance.md) | Purchase set amount of licenses | AI Governance | -| [Docker Verified Publisher (DVP)](/manuals/subscription-billing/plans/docker-verified-publisher.md) | Annual plans based on consuming domains | DVP Starter, DVP Growth | +| Plans | Billing model | Types | +| --- | --- | --- | +| [Docker](/manuals/subscription-billing/plans/docker.md) | Flat-rate plans for personal and organization accounts | Docker Personal, Docker Pro, Docker Team, Docker Business | +| [Docker Hardened Images (DHI)](/manuals/subscription-billing/plans/dhi.md) | Graduated security features for hardened container images | DHI Community, DHI Select, DHI Enterprise | +| [Gordon](/manuals/subscription-billing/plans/gordon.md) | Prepaid usage for the Gordon AI agent | Gordon Plus, Gordon Max, Gordon Ultra | +| [AI Governance](/manuals/subscription-billing/plans/ai-governance.md) | Purchase set amount of licenses | AI Governance | +| [Docker Verified Publisher (DVP)](/manuals/subscription-billing/plans/docker-verified-publisher.md) | Annual plans based on consuming domains | DVP Starter, DVP Growth | -Docker plans that upgrade your account (Docker Pro or Docker Team and Business) can provide a foundation for most use cases. Some product plans may require an upgraded Docker account while other product plans let you subscribe without an upgraded account. To learn more, see [Docker plans](/manuals/subscription-billing/plans/_index.md). +Docker plans that upgrade your account (Docker Pro, Team, and Business) cover +most use cases. Some product plans require an upgraded Docker account. Others +let you subscribe without one. For details, see +[Plans](/manuals/subscription-billing/plans/_index.md). ## Top up your plan -Plans come with usage entitlements that can be extended without upgrading to a different plan. +Plans come with usage entitlements that can be extended without upgrading to +a different plan. -| Unit | Description | Examples | -| ----------------- | ------------------------------------------------------------------------------------- | ----------------------------- | -| Seats | Each seat extends entitlements to one more member. | Docker Team, Docker Business | -| Licenses | Access to specific products or features. | AI Governance, Docker Offload | -| Minutes | Cloud build capacity, sold in blocks and consumed within the billing period. | Docker Build Cloud | -| Repositories | Additional container repositories covered by security scanning and analysis features. | DHI | -| Consuming domains | Additional consuming domains tracked in publisher analytics, sold in blocks of 25. | DVP Starter, DVP Growth | +| Unit | Description | Examples | +| --- | --- | --- | +| Seats | Each seat extends entitlements to one more member. | Docker Team, Docker Business | +| Licenses | Access to specific products or features. | AI Governance, Docker Offload | +| Minutes | Cloud build capacity, sold in blocks and consumed within the billing period. | Docker Build Cloud | +| Repositories | Additional container repositories covered by security scanning and analysis features. | DHI | +| Consuming domains | Additional consuming domains tracked in publisher analytics, sold in blocks of 25. | DVP Starter, DVP Growth | ## Manage your plans -To subscribe to a new plan or upgrade an active plan, see [Manage plans](/manuals/subscription-billing/manage/plans.md). See [Docker plans](/manuals/subscription-billing/plans/docker.md) to learn about Docker Team, Business, and Pro. You can also contact sales. - -You can use the billing portal to manage your Docker subscriptions, such -as updating payment methods, reviewing billing details, and tracking -invoice history. - -## Billing - -You can manage your Docker plans from the billing portal: - -1. Sign in to [Docker Home](https://app.docker.com/), then choose your - account. -1. Go to **Billing** to view the **Overview** page. -1. Select the page you want to explore. - -### Usage - -The billing **Usage** page helps you compare usage-based charges across -billing periods. You can track usage by changing the period, product, -and how the product is metered. +To subscribe to a new plan or upgrade an active plan, see +[Manage plans](/manuals/subscription-billing/manage/plans.md). See +[Docker plans](/manuals/subscription-billing/plans/docker.md) to learn about +Docker Team, Business, and Pro. You can also +contact sales. -### Costs - -The billing **Costs** page aggregates all costs by billing period. It -breaks down charges by resource (the product accruing a charge), the -status of your billing period, and costs to date. - -### Credits - -The billing **Credits** page shows credits applied to your costs. If you -received a promotional credit, you can see how it applies to your bill -from this page. - -## Docker plans and billing cycle - -Your invoice history is a reference to the Docker plans you subscribe -to. For information about your billing cycle and renewal dates, see -[Billing cycle](/manuals/subscription-billing/manage/details.md#billing-cycle). To upgrade or add -a new plan, see [Subscription](/manuals/subscription-billing/_index.md). +To update payment methods, review usage and credits, or download invoices, see +[Manage billing](/manuals/subscription-billing/manage/_index.md). ## Next steps -{{< grid items="grid_subscriptions" >}} - -{{< grid items="grid_core" >}} +{{< grid >}} diff --git a/content/manuals/subscription-billing/manage/_index.md b/content/manuals/subscription-billing/manage/_index.md index 544dc81a316c..da9471e652de 100644 --- a/content/manuals/subscription-billing/manage/_index.md +++ b/content/manuals/subscription-billing/manage/_index.md @@ -1,9 +1,80 @@ --- -build: - render: never -title: Manage +title: Manage billing linkTitle: Manage description: Manage Docker plans, payment methods, billing details, invoices, and taxes. keywords: manage plans, billing, payment methods, invoices, taxes, docker subscription weight: 20 +grid: + - title: Manage plans + description: Add a new plan, upgrade an active plan, or cancel auto-renewal. + icon: shopping-cart + link: /subscription-billing/manage/plans/ + - title: Add or update a payment method + description: Add or update a payment method for your personal account or organization. + icon: credit-card + link: /subscription-billing/manage/payment-method/ + - title: Update billing information + description: Update billing information for your personal account or organization. + icon: pencil-square + link: /subscription-billing/manage/details/ + - title: View billing history + description: View billing history and download past invoices. + icon: credit-card + link: /subscription-billing/manage/history/ + - title: 3D Secure authentication + description: Learn how 3DS works and how to troubleshoot verification issues. + icon: wallet + link: /subscription-billing/manage/3d-secure/ + - title: Taxes + description: Submit a US tax exemption certificate or add a VAT number. + icon: document-text + link: /subscription-billing/manage/tax-certificate/ --- + +You manage Docker plans, payment methods, invoices, credits, and taxes from +Docker Home. Billing is scoped to the account you +select. To manage billing: + +1. Sign in to [Docker Home](https://app.docker.com/), then choose your + personal account or organization. +1. Select **Billing**. +1. Select the page you want in the sidebar, or stay on **Overview**. + +To add or upgrade a plan, see +[Manage plans](/manuals/subscription-billing/manage/plans.md). To compare +plan types, see [Plans](/manuals/subscription-billing/plans/_index.md). + +## Overview + +When you select **Billing**, you are taken to the **Overview** page, where you review active plans, payment +method, and subscription totals for that account. From there you add +self-serve products, manage a plan you already have, or open another +billing page in the sidebar. + +## Invoices + +The billing **Invoices** page lists invoices issued when a plan renews or +changes. You can open an invoice, check payment status, and download a +copy. + +## Usage + +The billing **Usage** page helps you compare usage-based charges across +billing periods. You can track usage by changing the period, product, +and how the product is metered. + +## Costs + +The billing **Costs** page aggregates all costs by billing period. It +breaks down charges by resource (the product accruing a charge), the +status of your billing period, and costs to date. + +## Credits + +The billing **Credits** page shows credits applied to your costs. If you +received a promotional credit, you can see how it applies to your bill +from this page. + +## Next steps + +{{< grid >}} diff --git a/content/manuals/subscription-billing/manage/plans.md b/content/manuals/subscription-billing/manage/plans.md index bcf6431059bf..1e0d2b021f7a 100644 --- a/content/manuals/subscription-billing/manage/plans.md +++ b/content/manuals/subscription-billing/manage/plans.md @@ -69,7 +69,7 @@ You can upgrade active plans from the billing Overview page. Docker displays available account credits in the billing portal. Credits offset eligible usage automatically before Docker charges your payment method. To review credit balance and applied credits, see -[Credits](/manuals/subscription-billing/_index.md#credits). +[Credits](/manuals/subscription-billing/manage/_index.md#credits). Credits apply to [Docker Agentic Platform](/manuals/subscription-billing/plans/docker-agentic-platform.md). diff --git a/content/manuals/subscription-billing/plans/_index.md b/content/manuals/subscription-billing/plans/_index.md index 37a1bac78e82..e2999cf023f7 100644 --- a/content/manuals/subscription-billing/plans/_index.md +++ b/content/manuals/subscription-billing/plans/_index.md @@ -6,7 +6,7 @@ description: organizations. keywords: docker products, docker subscriptions, docker core, ai governance, dhi select, - docker build cloud, gordon plans, docker agentic platform, product catalog + docker build cloud, gordon plans, product catalog weight: 10 aliases: - /subscription/plans/ @@ -43,11 +43,20 @@ grid: > Interested in pricing details? Check out the > pricing page to compare plans. -To subscribe to a plan, see [Manage plans](../manage.md) or [Docker plans](docker.md). Plans can be tied to personal or organization account types, and include options to extend usage limits. +Docker plans attach to a personal account, an organization, or a specific +product. Personal plans (Docker Personal and Docker Pro) upgrade an individual +account. Organization plans (Docker Team and Docker Business) upgrade an +organization. Product add-ons add usage or features without changing that +account's Docker plan type: Gordon increases usage on a personal account, and +DHI, AI Governance, and DVP add product features on an organization. -This section covers usage entitlements, billing cycle, and plan management options for each available plan. +Topping up extends a plan's entitlements, such as seats, licenses, or +minutes, without changing the plan type. For the units you can top up, see +[Top up your plan](/manuals/subscription-billing/_index.md#top-up-your-plan). -To manage your plans by adding a new plan or upgrading an active plan, see [Manage plans](/manuals/subscription-billing/manage/plans.md). +Each plan page covers usage entitlements, billing cycle, and management +options. To add or upgrade a plan, see +[Manage plans](/manuals/subscription-billing/manage/plans.md). ## Product catalog diff --git a/content/manuals/subscription-billing/plans/docker-agentic-platform.md b/content/manuals/subscription-billing/plans/docker-agentic-platform.md index 5391463183b2..fef6a45d5d23 100644 --- a/content/manuals/subscription-billing/plans/docker-agentic-platform.md +++ b/content/manuals/subscription-billing/plans/docker-agentic-platform.md @@ -18,7 +18,7 @@ aliases: > [!TIP] > Docker Agentic Platform signups receive a one-time promotional > credit toward cloud compute usage. To review your balance, see -> [Credits](/manuals/subscription-billing/_index.md#credits). +> [Credits](/manuals/subscription-billing/manage/_index.md#credits). [Docker Agentic Platform](https://agentic-platform.docker.com/) is a pay-as-you-go plan for running agent and tool workloads in isolated @@ -81,4 +81,4 @@ the plan period. - To add or cancel a plan, see [Manage plans](/manuals/subscription-billing/manage/plans.md) - To track usage across plans, see - [Usage](/manuals/subscription-billing/_index.md#usage) + [Usage](/manuals/subscription-billing/manage/_index.md#usage) diff --git a/data/summary.yaml b/data/summary.yaml index 3aa4b6c78eeb..8bd05925c54b 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -1,3 +1,6 @@ +2FA: + subscription: [Personal, Pro] + for: Individuals AI Governance Audit Logs: subscription: [AI Governance] requires: Docker Sandboxes [0.39.0](/manuals/ai/sandboxes/release-notes.md) or later @@ -261,6 +264,10 @@ MSI installer: for: Administrators OATs: subscription: [Team, Business] + for: Administrators +PATs: + subscription: [Personal, Pro] + for: Individuals Pay by invoice: subscription: [Team, Business] PKG installer: diff --git a/layouts/_shortcodes/summary-bar.html b/layouts/_shortcodes/summary-bar.html index 98f037117756..aa434c1dd17c 100644 --- a/layouts/_shortcodes/summary-bar.html +++ b/layouts/_shortcodes/summary-bar.html @@ -23,12 +23,13 @@ "Retired" "archive-box" }} {{ $requiresIcon := "arrow-down-circle" }} - {{ $forIcon := "shield-check" }} + {{ $forIcons := dict + "Administrators" "shield-check" + "Individuals" "user-circle" + }} -
+
{{ with $feature.subscription }}
Subscription: @@ -75,9 +76,9 @@
For: {{ . }} - {{ if eq . "Administrators" }} + {{ with index $forIcons . }} - {{ partialCached "icon" $forIcon $forIcon }} + {{ partialCached "icon" . . }} {{ end }}