Skip to content

Commit 4597b3d

Browse files
Freshness work on /admin category (#25562)
## Summary Simplifies the `/admin` category by removing duplicated content and reframing it around Docker Home. Concepts now live on overview pages; procedures live on one management page per level. - **`admin/_index.md`**: Reframed around Docker Home (retired the Admin Console framing); trimmed the hierarchy section. - **`company/_index.md`**: Dropped duplicated "Key features," made it the canonical home for the company owner concept, and collapsed the Manage/SSO/SCIM grid cards. - **`company/manage.md`**: Merged the three `manage/` pages into one leaf page (aliases preserved) so all company procedures live in one place. - **`organization/_index.md`**: Streamlined members and consolidated the grid to four entry points; fixed broken/linkless cards. - **Cross-links & FAQ**: Added company/org cross-links, trimmed `company-faqs.md` to point at canonical concepts, and relabeled the create page to "Setup." ## To do - [x] **Validate seat avoidance for company owners** — the unverified "keep access without a seat" workaround was removed; confirm the real behavior and document or drop it. - [x] **Admin Console audit (separate PR)** — sweep `/admin` for stale navigation, `app.docker.com/admin` links, and menu labels now that it's not part of Docker Home. - [x] **Link "Docker Home" consistently** across overview pages. - [x] **Verify anchors/aliases** in the built site before merge. --------- Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent f1ab49f commit 4597b3d

11 files changed

Lines changed: 331 additions & 436 deletions

File tree

content/manuals/admin/_index.md

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Administration
3-
description: Overview of administration features and roles in the Docker Admin Console
4-
keywords: admin, administration, company, organization, Admin Console, user accounts, account management
3+
description: Overview of administration features and roles in Docker Home
4+
keywords: admin, administration, company, organization, Docker Home, user accounts, account management
55
weight: 10
66
params:
77
sidebar:
@@ -19,54 +19,56 @@ grid:
1919
description: Learn how to onboard and secure your organization.
2020
icon: magnifying-glass-plus
2121
link: /admin/organization/setup/onboard
22-
- title: Company FAQ
23-
description: Discover common questions and answers about companies.
24-
icon: question-mark-circle
25-
link: /faq/admin/company-faqs/
26-
- title: Organization FAQ
27-
description: Explore popular FAQ topics about organizations.
28-
icon: question-mark-circle
29-
link: /faq/admin/organization-faqs/
3022
- title: Security
3123
description: Explore security features for administrators.
3224
icon: shield-check
33-
link: /security/
25+
link: /enterprise/security/
3426
aliases:
3527
- /docker-hub/admin-overview
3628
---
3729

38-
Administrators can manage companies and organizations using the
39-
[Docker Admin Console](https://app.docker.com/admin). The Admin Console
40-
provides centralized observability, access management, and security controls
41-
across Docker environments.
30+
Organization and company owners can manage members, control access, and enforce
31+
security across their Docker environments. You perform these tasks in Docker
32+
Home, which provides centralized observability, access management, and security
33+
controls.
34+
35+
As an organization or company owner, you can:
36+
37+
- Create and manage companies and organizations
38+
- Assign roles and permissions to members
39+
- Group members into teams to manage access by project or role
40+
- Set company-wide policies, including SCIM provisioning and security
41+
enforcement
4242

4343
## Company and organization hierarchy
4444

45-
The [Docker Admin Console](https://app.docker.com/admin) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles.
45+
To provide centralized administration, Docker organizes companies and
46+
organizations into the following hierarchy and roles.
4647

4748
![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](./images/docker-admin-structure.webp)
4849

4950
### Company
5051

51-
A company groups multiple Docker organizations for centralized configuration. Companies have the company owner administrator role available.
52-
53-
The company owner:
54-
55-
- Can view and manage all organizations within the company
56-
- Has full access to company-wide settings and inherits the same permissions as organization owners
57-
- Does not occupy a seat
52+
A company groups multiple Docker organizations for centralized configuration. A
53+
company owner can view and manage every organization in the company and its
54+
company-wide settings, with the same access rights as an organization owner. For
55+
the company owner role and how it affects seats, see
56+
[Company roles](/manuals/admin/company/_index.md#company-roles).
5857

5958
Companies are only available for Docker Business subscribers.
6059

6160
### Organization
6261

63-
Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/manuals/admin/organization/organization-faqs.md#what-is-the-difference-between-user-invitee-seat-and-member).
62+
An organization sits below the company and is where you group teams and
63+
members and assign access to repositories. Every Docker Team and Business
64+
subscriber has at least one organization.
6465

65-
- An organization contains teams and repositories.
66-
- All Docker Team and Business subscribers must have at least one organization.
66+
Organization owners hold the organization owner administrator role and manage
67+
organization settings, users, and access controls. Each owner occupies a
68+
[seat](/manuals/admin/organization/organization-faqs.md#what-is-the-difference-between-user-invitee-seat-and-member).
6769

68-
> [!TIP]
69-
> [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.
70+
[Upgrading to a Docker Business plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdmin)
71+
grants you the company owner role so you can manage multiple organizations.
7072

7173
### Team
7274

@@ -79,17 +81,7 @@ or functions.
7981
A member is any Docker user added to an organization. Organization and company
8082
owners can assign roles to members to define their level of access.
8183

82-
## Admin Console features
83-
84-
Docker's [Admin Console](https://app.docker.com/admin) allows you to:
85-
86-
- Create and manage companies and organizations
87-
- Assign roles and permissions to members
88-
- Group members into teams to manage access by project or role
89-
- Set company-wide policies, including SCIM provisioning and security
90-
enforcement
91-
92-
## Manage companies and organizations
84+
## What's next
9385

9486
Learn how to manage companies and organizations in the following sections.
9587

content/manuals/admin/company/_index.md

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,20 @@ title: Company overview
33
linkTitle: Company
44
weight: 20
55
description: Learn how to manage multiple organizations using companies, including managing users, owners, and security.
6-
keywords: company, multiple organizations, manage companies, admin console, Docker Business settings
6+
keywords: company, multiple organizations, manage companies, Docker Home, Docker Business settings
77
grid:
88
- title: Create a company
99
description: Get started by learning how to create a company.
1010
icon: building-office-2
1111
link: /admin/company/new-company/
12-
- title: Manage organizations
13-
description:
14-
Learn how to add and manage organizations as well as seats within your
15-
company.
12+
- title: Manage your company
13+
description: Add organizations, manage company owners, and invite members.
1614
icon: building-storefront
17-
link: /admin/company/manage/organizations/
18-
- title: Manage company owners
19-
description: Find out more about company owners and how to manage them.
20-
icon: user-group
21-
link: /admin/company/manage/owners/
22-
- title: Manage users
23-
description: Explore how to manage users in all organizations.
24-
icon: user-plus
25-
link: /admin/company/manage/users/
26-
- title: Configure single sign-on
27-
description: Discover how to configure SSO for your entire company.
15+
link: /admin/company/manage/
16+
- title: Configure SSO and SCIM
17+
description: Set up single sign-on and SCIM provisioning for your company.
2818
icon: key
2919
link: /enterprise/security/single-sign-on/
30-
- title: Set up SCIM
31-
description:
32-
Set up SCIM to automatically provision and deprovision users in your
33-
company.
34-
icon: clipboard-document-check
35-
link: /enterprise/security/provisioning/scim/
3620
- title: Domain management
3721
description: Add and verify your company's domains.
3822
icon: check-badge
@@ -47,29 +31,40 @@ aliases:
4731

4832
{{< summary-bar feature_name="Company" >}}
4933

50-
A company provides a single point of visibility across multiple organizations,
51-
simplifying organization and settings management.
52-
34+
A company provides a single point of visibility across multiple
35+
organizations, for centralized organization and settings management.
5336
Organization owners with a Docker Business subscription can create a company
54-
and manage it through the [Docker Admin Console](https://app.docker.com/admin).
37+
and manage it through Docker Home.
38+
39+
## Company structure
5540

5641
The following diagram shows how a company relates to its associated
5742
organizations.
5843

5944
![Diagram showing how companies relate to Docker organizations](/admin/images/docker-admin-structure.webp)
6045

61-
## Key features
46+
For the full administration hierarchy, see the
47+
[administration overview](/manuals/admin/_index.md#company-and-organization-hierarchy).
48+
49+
## Company roles
50+
51+
A company includes one or more company owners. The creator of a company
52+
becomes both a company owner and an organization owner, and occupies a seat
53+
as organization owner. After creation, a company can have multiple owners,
54+
and each owner has visibility across the entire company. They can manage
55+
settings for every organization under it and have the same access rights as
56+
organization owners.
6257

63-
With a company, administrators can:
58+
- A company can have up to ten unique company owners.
59+
- Company owners don't occupy a seat unless one of the following applies:
60+
- They're added as a member of an organization under the company.
61+
- SSO is enabled and the company owner signs in through SSO, which
62+
automatically adds them as an organization member.
6463

65-
- View and manage all nested organizations
66-
- Configure company and organization settings centrally
67-
- Control access to the company
68-
- Have up to ten unique users assigned to the company owner role
69-
- Configure SSO and SCIM for all nested organizations
70-
- Enforce SSO for all users in the company
64+
To add or remove company owners, see
65+
[Manage your company](/manuals/admin/company/manage.md#company-owners).
7166

72-
## Create and manage your company
67+
## What's next
7368

7469
Learn how to create and manage a company in the following sections.
7570

content/manuals/admin/company/company-faqs.md

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Company FAQs
33
linkTitle: FAQs
44
weight: 30
5-
description: Company FAQs
5+
description: Frequently asked questions about Docker companies, including subscriptions, seats, company owners, and permissions.
66
keywords: Docker, Docker Hub, SSO FAQs, single sign-on, company, administration, company management
77
tags: [FAQ]
88
aliases:
@@ -14,37 +14,36 @@ aliases:
1414
### Some of my organizations don’t have a Docker Business subscription. Can I still use a parent company?
1515

1616
Yes, but you can only add organizations with a Docker Business subscription
17-
to a company.
17+
to a company. For more details, see [Add more organizations](/manuals/admin/company/manage.md#add-more-organizations).
1818

1919
### What happens if one of my organizations downgrades from Docker Business, but I still need access as a company owner?
2020

21-
To access and manage child organizations, the organization must have a
22-
Docker Business subscription. If the organization isn’t included in this
23-
subscription, the owner of the organization must manage the organization
24-
outside of the company.
21+
To access and manage a nested organization, it must have a Docker Business
22+
subscription. If an organization downgrades from Docker Business, its owner must
23+
manage it outside of the company. For more details, see
24+
[Add more organizations](/manuals/admin/company/manage.md#add-more-organizations).
2525

2626
### Do company owners occupy a subscription seat?
2727

28-
Company owners do not occupy a seat unless one of the following is true:
28+
Company owners don't occupy a seat unless one of the following is true:
2929

3030
- They are added as a member of an organization under your company
31-
- SSO is enabled and the company owner signs in via SSO, which automatically adds them as an organization member
32-
33-
Although company owners have the same access as organization owners across all
34-
organizations in the company, it's not necessary to add them to any
35-
organization. Doing so will cause them to occupy a seat.
31+
- SSO is enabled and the company owner signs in through SSO, which
32+
automatically adds them as an organization member
3633

3734
When you first create a company, your account is both a company owner and an
38-
organization owner. In that case, your account will occupy a seat as long as
39-
you remain an organization owner.
40-
41-
To avoid occupying a seat, [assign another user as the organization owner](/manuals/admin/organization/manage/members.md#update-a-member-role) and remove yourself from the organization.
42-
You'll retain full administrative access as a company owner without using a
43-
subscription seat.
35+
organization owner, so it occupies a seat as long as you remain an organization
36+
owner. To free up that seat,
37+
[assign another user as the organization owner](/manuals/admin/organization/manage/members.md#update-a-member-role)
38+
and remove yourself from the organization. You keep full administrative access
39+
as a company owner without using a subscription seat.
4440

4541
### What permissions does the company owner have in the associated/nested organizations?
4642

4743
Company owners can navigate to the **Organizations** page to view all their
48-
nested organizations in a single location. They can also view or edit organization members and change single sign-on (SSO) and System for Cross-domain Identity Management (SCIM) settings. Changes to company settings impact all users in each organization under the company.
44+
nested organizations in a single location. They can also view or edit
45+
organization members and change single sign-on (SSO) and System for
46+
Cross-domain Identity Management (SCIM) settings. Changes to company settings
47+
impact all users in each organization under the company.
4948

5049
For more information, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
---
2+
title: Manage your company
3+
linkTitle: Manage
4+
weight: 20
5+
description: Learn how to manage your company, including its organizations, owners, and members, using Docker Home.
6+
keywords: company, manage company, multiple organizations, company owners, company members, Docker Home, add organization, resend invites
7+
aliases:
8+
- /admin/company/manage/organizations/
9+
- /admin/company/manage/owners/
10+
- /admin/company/manage/users/
11+
- /admin/company/organizations/
12+
- /admin/company/owners/
13+
- /admin/company/users/
14+
- /docker-hub/company-owner/
15+
---
16+
17+
{{< summary-bar feature_name="Company" >}}
18+
19+
After creating a company, you can manage multiple organizations from Docker
20+
Home. Company owners can use the company portal to invite users to specific
21+
organizations, view seat availability across organizations, and add new
22+
company owners.
23+
24+
## Add more organizations
25+
26+
Company owners can add Docker organizations with a Docker Business plan to
27+
their company, so long as they're also the organization owners for that
28+
organization. There's no limit to the number of organizations you add to a
29+
company.
30+
31+
> [!IMPORTANT]
32+
>
33+
> Once you add an organization to a company, you can't remove it from the
34+
> company.
35+
36+
1. Sign in to [Docker Home](https://app.docker.com) and select
37+
your company.
38+
1. Select **Managed organizations**.
39+
1. Select **Add organization**, then choose an organization from the dropdown.
40+
41+
A nested organization must keep its Docker Business subscription to stay managed
42+
by the company. If an organization downgrades from Docker Business, you can no
43+
longer manage it through the company, and its owner must manage it separately.
44+
45+
## Company owners
46+
47+
A company can have multiple owners who manage the company and all of its
48+
organizations. For details about the company owner role and how it affects
49+
seats, see [Company roles](/manuals/admin/company/_index.md#company-roles).
50+
51+
### Add a company owner
52+
53+
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
54+
1. Select **Company owners**, then choose **Add owner**.
55+
1. Specify the user's Docker ID, then finish by selecting **Add company owner**.
56+
57+
### Remove a company owner
58+
59+
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
60+
1. Select **Company owners**.
61+
1. Find the company owner you want to remove and select the **Actions** menu,
62+
then choose **Remove as company owner**.
63+
64+
## Company invitations
65+
66+
You add a user to your company by inviting them to an organization within the
67+
company. Company owners can invite members to any organization in the company
68+
using a Docker ID, email address, or in bulk with a CSV file of email addresses.
69+
70+
Members and invitations belong to individual organizations, not to the company
71+
itself. A pending invitation occupies a seat in the organization the user is
72+
invited to.
73+
74+
### Invite members to an organization
75+
76+
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
77+
1. Select **Users**, then choose **Invite**.
78+
1. Choose how you want to invite members:
79+
- To invite individual users, select **Emails or usernames**.
80+
- To invite groups of users, select **CSV upload**.
81+
1. Add user(s) to an organization by choosing **Select an organization**.
82+
83+
Users receive invitations in their email with instructions to accept the
84+
invitation. After accepting the invitation, new members appear on the
85+
**Users** page. The table specifies how many organizations they're members of.
86+
87+
### Resend invitations
88+
89+
Company owners can resend invitations from the company-level **Users** page.
90+
To resend individual invitations:
91+
92+
1. Select your company from [Docker Home](https://app.docker.com/).
93+
1. Select **Users**, then locate the invitee from the users table.
94+
1. Select the **Actions** menu, then choose **Resend**.
95+
- Before resending, confirm you are resending the invitation to the correct
96+
invitee.
97+
- The resend invitation modal displays the date you originally invited the
98+
invitee.
99+
1. Choose **Invite** to confirm.
100+
101+
To bulk resend invitations:
102+
103+
1. From the users table, use the multi-select checkboxes next to the invitees
104+
you want to invite.
105+
1. Select **Resend invites**, then choose **Resend** to confirm.
106+
107+
## Add seats to an organization
108+
109+
If you have a self-serve subscription that has no pending subscription changes,
110+
you can add seats using Docker Home. For more information about adding seats,
111+
see [Manage seats](/manuals/admin/organization/manage/manage-seats.md#add-seats-to-your-subscription).
112+
113+
If you have a sales-assisted subscription, you must contact Docker support or
114+
sales to add seats.
115+
116+
## Manage teams
117+
118+
Teams exist at the organization level, not the company level. After inviting
119+
members to an organization, you can add them to teams within that organization.
120+
For more details, see
121+
[Manage members on a team](/manuals/admin/organization/manage/members.md#manage-members-on-a-team).

0 commit comments

Comments
 (0)