diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index 0c8bebc836..0023effc29 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -45,11 +45,10 @@ multiple organizations. | --- | --- | --- | | 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 | +| Company | Shared sign-in and administration for organizations that keep their own members, repositories, and billing | 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. +organizations you own or belong to. ## Next steps diff --git a/content/manuals/accounts/company/_index.md b/content/manuals/accounts/company/_index.md index e55aaf076e..5c80ad5d0d 100644 --- a/content/manuals/accounts/company/_index.md +++ b/content/manuals/accounts/company/_index.md @@ -1,9 +1,11 @@ --- -title: Company overview +title: Company accounts 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 +description: Why a Docker company groups organizations, and what company + owners administer. +keywords: company, multiple organizations, Docker Home, Docker Business, + company owners, SSO, SCIM grid: - title: Create a company description: Get started by learning how to create a company. @@ -32,46 +34,58 @@ aliases: {{< summary-bar feature_name="Company" >}} -A company groups multiple Docker organizations for centralized configuration -and provides a single point of visibility across those organizations. -Organization owners with a Docker Business subscription can create a company -and manage it through Docker Home. +A company is where you configure sign-in and administration for multiple +Docker organizations. + +> [!TIP] +> +> Organization owners with a Docker Business subscription can +> [create a company](./new-company.md) in +> [Docker Home](https://app.docker.com/). ## Company structure -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. +A company sits above its organizations, giving company owners full +administrative access across every organization in the company. -![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](../organization/images/docker-admin-structure.webp) +The following diagram shows that 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. +```mermaid {title="Company structure" caption="Company owners manage a company that contains one or more organizations."} +flowchart TB + co(("Company owners")) -.->|"manage"| C + subgraph C["Company"] + direction TB + subgraph O1["Organization A"] + direction TB + m1(("Members")) + r1[("Repositories")] + end + subgraph O2["Organization B"] + direction TB + m2(("Members")) + r2[("Repositories")] + end + O1 ~~~ O2 + end + style C fill:#3b82f622,stroke:#3b82f6 +``` -For organization structure, including teams and members, see -[Organization accounts](/manuals/accounts/organization/_index.md). +## What a company lets you do -[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. +When you create a company, you can: -## Company roles +- Administer every organization in the company from one place. +- Configure single sign-on (SSO) and System for Cross-domain Identity + Management (SCIM) once for every organization in the company. +- Verify your domains once at the company level instead of in each + organization. When you turn on auto-provisioning for a domain, you + choose which organization new users join. +- View members and invitations from every organization in one list, and + export that list as a CSV. -A company includes one or more company owners. The creator of a company -becomes both a company owner and an organization owner, and occupies a seat -as organization owner. After creation, a company can have multiple owners, -and each owner has visibility across the entire company. They can manage -settings for every organization under it and have the same access rights as -organization owners. - -- A company can have up to ten unique company owners. -- Company owners don't occupy a seat unless one of the following applies: - - They're added as a member of an organization under the company. - - SSO is enabled and the company owner signs in through SSO, which - automatically adds them as an organization member. - -To add or remove company owners, see -[Manage your company](/manuals/accounts/company/manage.md#company-owners). +You can assign up to 10 company owners. Company owners occupy a purchased +seat only when they are also members of an organization. A company owner +who is not an organization member does not occupy a seat. ## Next steps diff --git a/content/manuals/accounts/company/manage.md b/content/manuals/accounts/company/manage.md index cbb2705bfb..543c9f371d 100644 --- a/content/manuals/accounts/company/manage.md +++ b/content/manuals/accounts/company/manage.md @@ -49,7 +49,8 @@ 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/company/_index.md#company-roles). +seats, see +[Company structure](/manuals/accounts/company/_index.md#company-structure). ### Add a company owner diff --git a/content/manuals/accounts/organization/_index.md b/content/manuals/accounts/organization/_index.md index 2924a9f615..5b1fdaa759 100644 --- a/content/manuals/accounts/organization/_index.md +++ b/content/manuals/accounts/organization/_index.md @@ -1,11 +1,11 @@ --- title: Organization accounts linkTitle: Organization -description: Overview of administration features and roles in Docker Home -keywords: admin, administration, company, organization, Docker Home, user - accounts, account management, organizations, manage teams, roles, members, - permissions, organization settings, organization account, individual account, - Docker ID, account types, owners, teams +description: How Docker organizations relate to members, teams, and + repositories. +keywords: admin, organization, Docker Home, user accounts, account management, + roles, members, permissions, organization settings, owners, teams, + repositories weight: 15 grid: - title: Set up your organization @@ -17,7 +17,8 @@ grid: icon: user-plus link: /accounts/organization/manage/ - title: Activity logs - description: Review member activity across your organization and repositories. + description: Review member activity across your organization and + repositories. icon: clipboard-document-list link: /accounts/organization/activity-logs/ - title: Insights @@ -35,43 +36,53 @@ aliases: - /accounts/organization/overview/ --- -A Docker organization is a collection of teams and repositories that you -manage in [Docker Home](https://app.docker.com/). Organization and company -owners manage members, assign access, and enforce security. - -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). -To create, convert, or onboard an organization, see -[Set up a Docker organization](/manuals/accounts/organization/setup/_index.md). +A Docker organization is a shared workspace for members and repositories +under one namespace. +Organization owners administer membership, access, and security. ## Organization structure -The following diagram shows how organizations relate to teams and members. +Organization owners manage organizations that contain members, +repositories, and teams, which group members within an +organization. -![Diagram showing how teams and members relate within a Docker -organization](./images/org-structure.webp) +The following diagram shows that hierarchy: -An organization includes owners, members, and optional teams. Organization -owners have full administrator access to manage members, roles, and teams. +```mermaid {title="Organization structure" caption="Organization owners manage an organization that contains members, repositories, and optional teams."} +flowchart TB + oo(("Organization owners")) -.->|"manage"| org + subgraph org["Organization"] + direction TB + m(("Members")) + subgraph t["Teams (optional)"] + tm(("Members")) + end + r[("Repositories")] + end + style org fill:#3b82f622,stroke:#3b82f6 + style t stroke-dasharray: 5 5 +``` -### Team +### Owners -Teams are optional and let you group members to assign repository permissions -collectively. Teams simplify permission management across projects -or functions. +Organization owners administer the organization. They invite members, assign +roles, and manage teams and repositories. -### Member +An organization can have multiple owners. All owners share the same +predefined permissions. For other roles and their permissions, see +[Roles and permissions](/manuals/security/roles-and-permissions/_index.md). -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. +### Members -For details about each role and its permissions, see -[Roles and -permissions](/manuals/security/roles-and-permissions/_index.md). +A member is a Docker user invited to the organization. Organization owners +assign a role to each member, and that role sets organization-wide access. -For how companies relate to organizations, see -[Company structure](/manuals/accounts/company/_index.md#company-structure). +### Teams + +Teams are optional. They group members so you can grant repository +access to many people at once. Use a team when several members need the +same repositories. Members can belong to the organization without joining +a team. ## Next steps diff --git a/content/manuals/accounts/organization/images/docker-admin-structure.webp b/content/manuals/accounts/organization/images/docker-admin-structure.webp deleted file mode 100644 index b3ab384d70..0000000000 Binary files a/content/manuals/accounts/organization/images/docker-admin-structure.webp and /dev/null differ diff --git a/content/manuals/accounts/organization/images/org-structure.webp b/content/manuals/accounts/organization/images/org-structure.webp deleted file mode 100644 index 1e810019ff..0000000000 Binary files a/content/manuals/accounts/organization/images/org-structure.webp and /dev/null differ diff --git a/layouts/_markup/render-codeblock-mermaid.html b/layouts/_markup/render-codeblock-mermaid.html index 25ddaa2bd0..fa3c10d597 100644 --- a/layouts/_markup/render-codeblock-mermaid.html +++ b/layouts/_markup/render-codeblock-mermaid.html @@ -1,5 +1,34 @@ {{- .Page.Store.Set "mermaid" true -}} -
{{- .Inner -}}
+{{- $title := .Attributes.title -}} +{{- $caption := .Attributes.caption -}} +{{- if or $title $caption -}} + {{- $id := printf "mermaid-%s-%d" .Page.File.UniqueID .Ordinal -}} +
+ {{- with $title }} +

+ {{ . }} +

+ {{- end }} + 
{{- $.Inner -}}
+ {{- with $caption }} +
+ {{ . }} +
+ {{- end }} +
+{{- else -}} + 
{{- .Inner -}}
+{{- end -}}