Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion COMPONENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion content/guides/admin-set-up.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions content/manuals/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 31 additions & 4 deletions content/manuals/accounts/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions content/manuals/accounts/individual/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/accounts/individual/create-account.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
72 changes: 20 additions & 52 deletions content/manuals/accounts/organization/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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 >}}
12 changes: 12 additions & 0 deletions content/manuals/accounts/organization/manage/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion content/manuals/faqs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions content/manuals/faqs/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
Loading
Loading