Skip to content

Commit 197da0c

Browse files
admin: company freshness (#23061)
## Description - Clean version of my company freshness, lint was picking up issues from other branches? ## Reviews - [ ] Editorial review
1 parent 38b01b6 commit 197da0c

File tree

8 files changed

+350
-213
lines changed

8 files changed

+350
-213
lines changed

content/includes/admin-company-overview.md

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: Company administration
2+
title: Company administration overview
33
weight: 20
44
description: Learn how to manage multiple organizations using companies, including managing users, owners, and security.
5-
keywords: company, multiple organizations, manage companies
5+
keywords: company, multiple organizations, manage companies, admin console, Docker Business settings
66
grid:
77
- title: Create a company
88
description: Get started by learning how to create a company.
@@ -13,15 +13,15 @@ grid:
1313
company.
1414
icon: store
1515
link: /admin/company/organizations/
16-
- title: Manage users
17-
description: Explore how to manage users in all organizations.
18-
icon: group_add
19-
link: /admin/company/users/
2016
- title: Manage company owners
2117
description: Find out more about company owners and how to manage them.
2218
icon: supervised_user_circle
2319
link: /admin/company/owners/
24-
- title: Configure Single Sign-On
20+
- title: Manage users
21+
description: Explore how to manage users in all organizations.
22+
icon: group_add
23+
link: /admin/company/users/
24+
- title: Configure single sign-on
2525
description: Discover how to configure SSO for your entire company.
2626
icon: key
2727
link: /security/for-admins/single-sign-on/
@@ -31,11 +31,11 @@ grid:
3131
icon: checklist
3232
link: /security/for-admins/provisioning/scim/
3333
- title: Domain management
34-
description: Add and verify your domains.
34+
description: Add and verify your company's domains.
3535
icon: domain_verification
3636
link: /security/for-admins/domain-management/
3737
- title: FAQs
38-
description: Explore common company FAQs.
38+
description: Explore frequently asked questions about companies.
3939
link: /faq/admin/company-faqs/
4040
icon: help
4141
aliases:
@@ -44,8 +44,30 @@ aliases:
4444

4545
{{< summary-bar feature_name="Company" >}}
4646

47-
{{% include "admin-company-overview.md" %}}
47+
A company provides a single point of visibility across multiple organizations,
48+
simplifying organization and settings management.
49+
50+
Organization owners with a Docker Business subscription can create a company
51+
and manage it through the [Docker Admin Console](https://app.docker.com/admin).
52+
53+
The following diagram shows how a company relates to its associated
54+
organizations.
55+
56+
![Diagram showing how companies relate to Docker organizations](/admin/images/docker-admin-structure.webp)
57+
58+
## Key features
59+
60+
With a company, administrators can:
61+
62+
- View and manage all nested organizations
63+
- Configure company and organization settings centrally
64+
- Control access to the company
65+
- Have up to ten unique users assigned to the company owner role
66+
- Configure SSO and SCIM for all nested organizations
67+
- Enforce SSO for all users in the company
68+
69+
## Create and manage your company
4870

49-
Learn how to administer a company in the following sections.
71+
Learn how to create and manage a company in the following sections.
5072

5173
{{< grid >}}

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
---
22
title: Create a company
33
description: Learn how to create a company to centrally manage multiple organizations.
4-
keywords: company, hub, organization, company owner, Admin Console, company management
4+
keywords: company, hub, organization, company owner, Admin Console, company management, Docker Business, create company, Docker Admin Console
55
aliases:
66
- /docker-hub/new-company/
77
---
88

99
{{< summary-bar feature_name="Company" >}}
1010

11-
You can create a new company in the Docker Admin Console. Before you begin, you must:
11+
Learn how to create a new company in the Docker Admin Console, a centralized
12+
dashboard for managing organizations.
13+
14+
## Prerequisites
15+
16+
Before you begin, you must:
17+
1218
- Be the owner of the organization you want to add to your company
1319
- Have a Docker Business subscription
1420

@@ -24,12 +30,13 @@ organization.
2430

2531
> [!TIP]
2632
>
27-
> The name for your company can't be the same as an existing user, organization, or company namespace.
28-
29-
1. Review the company migration details and then select **Create company**.
33+
> The name for your company can't be the same as an existing user,
34+
organization, or company namespace.
3035

31-
For more information on how you can add organizations to your company, see [Add organizations to a company](./organizations.md#add-organizations-to-a-company).
36+
1. Review the migration details and then select **Create company**.
3237

38+
For more information on how you can add organizations to your company,
39+
see [Add organizations to a company](./organizations.md#add-organizations-to-a-company).
3340

3441
## Next steps
3542

content/manuals/admin/company/organizations.md

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
description: Learn how to manage organizations in a company.
3-
keywords: company, multiple organizations, manage organizations
42
title: Manage company organizations
3+
description: Learn how to manage organizations in a company.
4+
keywords: company, multiple organizations, manage organizations, Docker Admin Console, organization settings, add organization, company management
55
---
66

77
{{< summary-bar feature_name="Company" >}}
88

9-
You can manage the organizations in a company in the Docker Admin Console.
9+
Learn to manage the organizations in a company using the Docker Admin Console.
1010

1111
## View all organizations
1212

@@ -18,17 +18,27 @@ The **Organizations** view displays all organizations under your company.
1818

1919
## Add seats to an organization
2020

21-
When you have a [self-serve](../../subscription/details.md#self-serve) subscription that has no pending subscription changes, you can add seats using the following steps. If you have a sales-assisted subscription, you can contact Docker support or sales to add seats.
21+
If you have a [self-serve](../../subscription/details.md#self-serve)
22+
subscription that has no pending subscription changes, you can add seats using
23+
Docker Home. For more information about adding seats,
24+
see [Manage seats](/manuals/subscription/manage-seats.md#add-seats).
2225

23-
For more information about adding seats, see [Manage seats](/manuals/subscription/manage-seats.md#add-seats).
26+
If you have a sales-assisted subscription, you must contact Docker support or
27+
sales to add seats.
2428

2529
## Add organizations to a company
2630

27-
You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you want to add. There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.
31+
To add an organization to a company, ensure the following:
32+
33+
- You are a company owner.
34+
- You are an organization owner of the organization you want to add.
35+
- The organization has a Docker Business subscription.
36+
- There’s no limit to how many organizations can exist under a company.
2837

2938
> [!IMPORTANT]
3039
>
31-
> Once you add an organization to a company, you can't remove it from the company.
40+
> Once you add an organization to a company, you can't remove it from the
41+
company.
3242

3343
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
3444
1. Select **Admin Console**, then **Organizations**.
@@ -42,7 +52,8 @@ You must be a company owner to add an organization to a company. You must also b
4252
1. Select **Admin Console**, then **Organizations**.
4353
1. Select the organization you want to manage.
4454

45-
For more details about managing an organization, see [Organization administration](../organization/_index.md).
55+
For more details about managing an organization, see
56+
[Organization administration](../organization/_index.md).
4657

4758
## More resources
4859

content/manuals/admin/company/owners.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
---
2-
description: Learn how to add and remove company owners.
3-
keywords: company, owners
42
title: Manage company owners
3+
description: Learn how to add and remove company owners.
4+
keywords: company, owners, add company owner, remove company owner, company manageemnt, company owner permissions
55
aliases:
66
- /docker-hub/company-owner/
77
---
88

99
{{< summary-bar feature_name="Company" >}}
1010

11-
A company can have multiple owners. Company owners have company-wide
12-
observability and can manage company-wide settings that apply to all associated
13-
organizations. In addition, company owners have the same access as organization
14-
owners for all associated organizations. Unlike organization owners, company
15-
owners don't need to be member of an organization.
11+
A company can have multiple owners. Company owners have visibility across the
12+
entire company and can manage settings that apply to all organizations under
13+
that company. They also have the same access rights as organization owners but
14+
don’t need to be members of any individual organization.
1615

17-
> [!NOTE]
16+
> [!IMPORTANT]
1817
>
1918
> Company owners do not occupy a seat unless one of the following is true:
2019
>
Lines changed: 135 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,145 @@
11
---
2+
title: Manage company members
23
description: Learn how to manage company users in the Docker Admin Console.
3-
keywords: company, company users, users, admin, Admin Console
4-
title: Manage company users
4+
keywords: company, company users, users, admin, Admin Console, memeber management, organization management, company management, bulk invite, resend invites
55
---
66

77
{{< summary-bar feature_name="Company" >}}
88

9-
You can manage users at the company-level in the Docker Admin Console.
9+
Company owners can invite new members to an organization via Docker ID,
10+
email address, or in bulk with a CSV file containing email
11+
addresses.
1012

11-
{{% admin-users product="admin" layer="company" %}}
13+
If an invitee does not have a Docker account, they must create an account and
14+
verify their email address before they can accept an invitation to join the
15+
organization. Pending invitations occupy seats for the organization
16+
the user is invited to.
17+
18+
## Invite members via Docker ID or email address
19+
20+
Use the following steps to invite members to your organization via Docker ID or
21+
email address.
22+
23+
1. Sign in to [Docker Home](https://app.docker.com) and select
24+
your company.
25+
1. On the **Organizations** page, select the organization you want
26+
to invite members to.
27+
1. Select **Members**, then **Invite**.
28+
1. Select **Emails or usernames**.
29+
1. Follow the on-screen instructions to invite members.
30+
Invite a maximum of 1000 members and separate multiple entries by comma,
31+
semicolon, or space.
32+
33+
> [!NOTE]
34+
>
35+
> When you invite members, you assign them a role.
36+
> See [Roles and permissions](/security/for-admins/roles-and-permissions/)
37+
> for details about the access permissions for each role.
38+
39+
Pending invitations appear on the Members page. The invitees receive an
40+
email with a link to Docker Hub where they can accept or decline the
41+
invitation.
42+
43+
## Invite members via CSV file
44+
45+
To invite multiple members to an organization via a CSV file containing email
46+
addresses:
47+
48+
1. Sign in to [Docker Home](https://app.docker.com) and select
49+
your company.
50+
1. On the **Organizations** page, select the organization you want
51+
to invite members to.
52+
1. Select **Members**, then **Invite**.
53+
1. Select **CSV upload**.
54+
1. Select **Download the template CSV file** to optionally download an example
55+
CSV file. The following is an example of the contents of a valid CSV file.
56+
57+
```text
58+
email
59+
docker.user-0@example.com
60+
docker.user-1@example.com
61+
```
62+
63+
CSV file requirements:
64+
65+
- The file must contain a header row with at least one heading named `email`.
66+
Additional columns are allowed and are ignored in the import.
67+
- The file must contain a maximum of 1000 email addresses (rows). To invite
68+
more than 1000 users, create multiple CSV files and perform all steps in
69+
this task for each file.
70+
71+
1. Create a new CSV file or export a CSV file from another application.
72+
73+
- To export a CSV file from another application, see the application’s
74+
documentation.
75+
- To create a new CSV file, open a new file in a text editor, type `email`
76+
on the first line, type the user email addresses one per line on the
77+
following lines, and then save the file with a .csv extension.
78+
79+
1. Select **Browse files** and then select your CSV file, or drag and drop the
80+
CSV file into the **Select a CSV file to upload** box. You can only select
81+
one CSV file at a time.
82+
83+
> [!NOTE]
84+
>
85+
> If the amount of email addresses in your CSV file exceeds the number of
86+
available seats in your organization, you cannot continue to invite members.
87+
To invite members, you can purchase more seats, or remove some email
88+
addresses from the CSV file and re-select the new file. To purchase more
89+
seats, see [Add seats to your subscription](/subscription/add-seats/) or
90+
[Contact sales](https://www.docker.com/pricing/contact-sales/).
91+
92+
1. After the CSV file has been uploaded, select **Review**.
93+
94+
Valid email addresses and any email addresses that have issues will appear.
95+
Email addresses may have the following issues:
96+
97+
- Invalid email: The email address is not a valid address. The email address
98+
will be ignored if you send invites. You can correct the email address in
99+
the CSV file and re-import the file.
100+
- Already invited: The user has already been sent an invite email and another
101+
invite email will not be sent.
102+
- Member: The user is already a member of your organization and an invite
103+
email will not be sent.
104+
- Duplicate: The CSV file has multiple occurrences of the same email address.
105+
The user will be sent only one invite email.
106+
107+
1. Follow the on-screen instructions to invite members.
108+
109+
> [!NOTE]
110+
>
111+
> When you invite members, you assign them a role.
112+
> See [Roles and permissions](/security/for-admins/roles-and-permissions/)
113+
> for details about the access permissions for each role.
114+
115+
Pending invitations appear on the Members page. The invitees receive an email
116+
with a link to Docker Hub where they can accept or decline the invitation.
117+
118+
## Resend invitations to users
119+
120+
You can resend individual invitations, or bulk invitations from the Admin Console.
121+
122+
### Resend individual invitations
123+
124+
1. In [Docker Home](https://app.docker.com/), select your company.
125+
2. Select **Admin Console**, then **Users**.
126+
3. Select the **action menu** next to the invitee and select **Resend**.
127+
4. Select **Invite** to confirm.
128+
129+
### Bulk resend invitation
130+
131+
1. In [Docker Home](https://app.docker.com/), select your company.
132+
2. Select **Admin Console**, then **Users**.
133+
3. Use the **checkboxes** next to **Usernames** to bulk select users.
134+
4. Select **Resend invites**.
135+
5. Select **Resend** to confirm.
136+
137+
## Invite members via API
138+
139+
You can bulk invite members using the Docker Hub API. For more information,
140+
see the [Bulk create invites](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1bulk/post) API endpoint.
12141

13142
## Manage members on a team
14143

15-
Use Docker Hub to add a member to a team or remove a member from a team. For more details, see [Manage members](../organization/members.md#manage-members-on-a-team).
144+
Use Docker Hub to add a member to a team or remove a member from a team. For
145+
more details, see [Manage members](../organization/members.md#manage-members-on-a-team).

0 commit comments

Comments
 (0)