Skip to content
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5a49d2a
initial commit
akristen Apr 1, 2026
a8b9c55
update
akristen Apr 1, 2026
aceebb0
this was awful; redirect nightmare
akristen Apr 1, 2026
5f762aa
remove random troubleshooting folder and put sso and scim troubleshoo…
akristen Apr 1, 2026
c03ffc8
reorganized provisioning; split domain management into two topics sin…
akristen Apr 1, 2026
55bc3b1
Merge branch 'main' of https://github.com/akristen/docs into scim-jit…
akristen Apr 8, 2026
2047366
update
akristen Apr 9, 2026
bb457ff
moved doc per tse sync
akristen Apr 9, 2026
d19a6d0
testing something
akristen Apr 9, 2026
fb29bb8
fix aliases , fix typo
akristen Apr 9, 2026
5bb8143
fix url issues; does not add /manuaal/ yet
akristen Apr 9, 2026
c8e453a
docs: fix internal /manuals/ links in Platform admin section
akristen Apr 13, 2026
fde8efe
docs: fix internal /manuals/ links in Platform billing pages
akristen Apr 13, 2026
22b7d97
docs: fix internal /manuals/ link on accounts general FAQs
akristen Apr 13, 2026
4cf811c
docs: fix Company overview link in enterprise core roles
akristen Apr 13, 2026
22ec428
docs: fix internal links in enterprise SCIM provisioning pages
akristen Apr 13, 2026
d7c2302
docs: fix internal links in enterprise SSO pages
akristen Apr 13, 2026
c6cda48
docs: fix internal links in enterprise Settings Management pages
akristen Apr 13, 2026
e512695
Merge branch 'main' into scim-jit-edits
akristen Apr 13, 2026
254fc89
docs: fix SCIM internal link targets
akristen Apr 13, 2026
551d0ae
branch divergence
akristen Apr 13, 2026
f29bdff
vale edits
akristen Apr 13, 2026
f55558b
add alias, fix troubleshoot sso toc
akristen Apr 16, 2026
aebd312
tech writer feedback to add next steps, update summary.yaml, add alia…
akristen Apr 17, 2026
7a42d6b
silly error
akristen Apr 17, 2026
d5d4513
last
akristen Apr 17, 2026
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 content/guides/admin-set-up/finalize-plans-and-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ providers (IdPs) to access Docker. SSO is available for a whole company and all
Business subscription. For more information, see the
[documentation](/manuals/enterprise/security/single-sign-on/_index.md).

You can also enable [SCIM](/manuals/enterprise/security/provisioning/scim.md)
You can also enable [SCIM](/manuals/enterprise/security/provisioning/scim/_index.md)
for further automation of provisioning and deprovisioning of users.

### Set up Docker product entitlements included in the subscription
Expand Down
4 changes: 2 additions & 2 deletions content/guides/admin-user-management/onboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ For more information, see the [SSO documentation](/manuals/enterprise/security/s

### Automate onboarding with SCIM and JIT provisioning

Streamline user provisioning and role management with [SCIM](/manuals/enterprise/security/provisioning/scim.md) and [Just-in-Time (JIT) provisioning](/manuals/enterprise/security/provisioning/just-in-time.md).
Streamline user provisioning and role management with [SCIM](/manuals/enterprise/security/provisioning/scim/_index.md) and [Just-in-Time (JIT) provisioning](/manuals/enterprise/security/provisioning/just-in-time.md).

With SCIM you can:

Expand All @@ -67,4 +67,4 @@ It also:
- Ensures consistent access control policies.
- Help you scale permissions as teams grow or change.

For more information on how it works, see [Group mapping](/manuals/enterprise/security/provisioning/group-mapping.md).
For more information on how it works, see [Group mapping](/manuals/enterprise/security/provisioning/scim/group-mapping.md).
10 changes: 5 additions & 5 deletions content/manuals/accounts/general-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ description: Frequently asked questions about Docker accounts
keywords: onboarding, docker, teams, orgs, user accounts, organization accounts
tags: [FAQ]
aliases:
- /docker-hub/general-faqs/
- /docker-hub/onboarding-faqs/
- /faq/admin/general-faqs/
- /admin/faqs/general-faqs/
- /docker-hub/general-faqs/
- /docker-hub/onboarding-faqs/
- /faq/admin/general-faqs/
- /admin/faqs/general-faqs/
---

### What is a Docker ID?
Expand All @@ -24,7 +24,7 @@ products. To create a Docker ID you need one of the following:
Your Docker ID must be between 4 and 30 characters long, and can only contain
numbers and lowercase letters. You can't use any special characters or spaces.

For more information, see [Create a Docker ID](/accounts/create-account/).
For more information, see [Create a Docker ID](/manuals/accounts/create-account.md).

### Can I change my Docker ID?

Expand Down
61 changes: 30 additions & 31 deletions content/manuals/admin/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ params:
sidebar:
group: Enterprise
grid:
- title: Company administration
description: Explore how to manage a company.
icon: apartment
link: /admin/company/
- title: Organization administration
description: Learn about organization administration.
icon: store
link: /admin/organization/
- title: Onboard your organization
description: Learn how to onboard and secure your organization.
icon: explore
link: /admin/organization/onboard
- title: Company FAQ
description: Discover common questions and answers about companies.
icon: help
link: /faq/admin/company-faqs/
- title: Organization FAQ
description: Explore popular FAQ topics about organizations.
icon: help
link: /faq/admin/organization-faqs/
- title: Security
description: Explore security features for administrators.
icon: shield_locked
link: /security/
- title: Company administration
description: Explore how to manage a company.
icon: apartment
link: /admin/company/
- title: Organization administration
description: Learn about organization administration.
icon: store
link: /admin/organization/
- title: Onboard your organization
description: Learn how to onboard and secure your organization.
icon: explore
link: /admin/organization/onboard
- title: Company FAQ
description: Discover common questions and answers about companies.
icon: help
link: /faq/admin/company-faqs/
- title: Organization FAQ
description: Explore popular FAQ topics about organizations.
icon: help
link: /faq/admin/organization-faqs/
- title: Security
description: Explore security features for administrators.
icon: shield_locked
link: /security/
aliases:
- /docker-hub/admin-overview
- /docker-hub/admin-overview
---

Administrators can manage companies and organizations using the
Expand All @@ -48,9 +48,9 @@ The [Docker Admin Console](https://app.docker.com/admin) provides administrators

### Company

A company groups multiple Docker organizations for centralized configuration. Companies have the company owner administrator role available.
A company groups multiple Docker organizations for centralized configuration. Companies have the company owner administrator role available.

The company owner:
The company owner:

- Can view and manage all organizations within the company
- Has full access to company-wide settings and inherits the same permissions as organization owners
Expand All @@ -60,12 +60,11 @@ Companies are only available for Docker Business subscribers.

### Organization

Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/admin/faqs/organization-faqs/#what-is-the-difference-between-user-invitee-seat-and-member).
Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/manuals/admin/faqs/organization-faqs.md#what-is-the-difference-between-user-invitee-seat-and-member).

- An organization contains teams and repositories.
- An organization contains teams and repositories.
- All Docker Team and Business subscribers must have at least one organization.


> [!TIP]
> [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.

Expand All @@ -88,7 +87,7 @@ Docker's [Admin Console](https://app.docker.com/admin) allows you to:
- Assign roles and permissions to members
- Group members into teams to manage access by project or role
- Set company-wide policies, including SCIM provisioning and security
enforcement
enforcement

## Manage companies and organizations

Expand Down
72 changes: 37 additions & 35 deletions content/manuals/admin/company/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,44 @@ weight: 20
description: Learn how to manage multiple organizations using companies, including managing users, owners, and security.
keywords: company, multiple organizations, manage companies, admin console, Docker Business settings
grid:
- title: Create a company
description: Get started by learning how to create a company.
icon: apartment
link: /admin/company/new-company/
- title: Manage organizations
description: Learn how to add and manage organizations as well as seats within your
company.
icon: store
link: /admin/company/organizations/
- title: Manage company owners
description: Find out more about company owners and how to manage them.
icon: supervised_user_circle
link: /admin/company/owners/
- title: Manage users
description: Explore how to manage users in all organizations.
icon: group_add
link: /admin/company/users/
- title: Configure single sign-on
description: Discover how to configure SSO for your entire company.
icon: key
link: /security/for-admins/single-sign-on/
- title: Set up SCIM
description: Set up SCIM to automatically provision and deprovision users in your
company.
icon: checklist
link: /security/for-admins/provisioning/scim/
- title: Domain management
description: Add and verify your company's domains.
icon: domain_verification
link: /security/for-admins/domain-management/
- title: FAQs
description: Explore frequently asked questions about companies.
link: /faq/admin/company-faqs/
icon: help
- title: Create a company
description: Get started by learning how to create a company.
icon: apartment
link: /admin/company/new-company/
- title: Manage organizations
description:
Learn how to add and manage organizations as well as seats within your
company.
icon: store
link: /admin/company/organizations/
- title: Manage company owners
description: Find out more about company owners and how to manage them.
icon: supervised_user_circle
link: /admin/company/owners/
- title: Manage users
description: Explore how to manage users in all organizations.
icon: group_add
link: /admin/company/users/
- title: Configure single sign-on
description: Discover how to configure SSO for your entire company.
icon: key
link: /enterprise/security/single-sign-on/
- title: Set up SCIM
description:
Set up SCIM to automatically provision and deprovision users in your
company.
icon: checklist
link: /enterprise/security/provisioning/scim/
- title: Domain management
description: Add and verify your company's domains.
icon: domain_verification
link: /enterprise/security/domain-management/
- title: FAQs
description: Explore frequently asked questions about companies.
link: /faq/admin/company-faqs/
icon: help
aliases:
- /docker-hub/creating-companies/
- /docker-hub/creating-companies/
---

{{< summary-bar feature_name="Company" >}}
Expand Down
57 changes: 27 additions & 30 deletions content/manuals/admin/company/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Use the following steps to invite members to your organization via Docker ID or
email address.

1. Sign in to [Docker Home](https://app.docker.com) and select
your company.
your company.
1. On the **Organizations** page, select the organization you want
to invite members to.
to invite members to.
1. Select **Members**, then **Invite**.
1. Select **Emails or usernames**.
1. Follow the on-screen instructions to invite members.
Expand All @@ -33,7 +33,7 @@ to invite members to.
> [!NOTE]
>
> When you invite members, you assign them a role.
> See [Roles and permissions](/security/for-admins/roles-and-permissions/)
> See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions/core-roles.md)
Comment thread
akristen marked this conversation as resolved.
> for details about the access permissions for each role.

Pending invitations appear on the Members page. The invitees receive an
Expand All @@ -46,13 +46,13 @@ To invite multiple members to an organization via a CSV file containing email
addresses:

1. Sign in to [Docker Home](https://app.docker.com) and select
your company.
your company.
1. On the **Organizations** page, select the organization you want
to invite members to.
to invite members to.
1. Select **Members**, then **Invite**.
1. Select **CSV upload**.
1. Select **Download the template CSV file** to optionally download an example
CSV file. The following is an example of the contents of a valid CSV file.
CSV file. The following is an example of the contents of a valid CSV file.

```text
email
Expand All @@ -61,55 +61,52 @@ CSV file. The following is an example of the contents of a valid CSV file.
```

CSV file requirements:

- The file must contain a header row with at least one heading named `email`.
Additional columns are allowed and are ignored in the import.
Additional columns are allowed and are ignored in the import.
- The file must contain a maximum of 1000 email addresses (rows). To invite
more than 1000 users, create multiple CSV files and perform all steps in
this task for each file.
more than 1000 users, create multiple CSV files and perform all steps in
this task for each file.

1. Create a new CSV file or export a CSV file from another application.

- To export a CSV file from another application, see the application’s
documentation.
documentation.
- To create a new CSV file, open a new file in a text editor, type `email`
on the first line, type the user email addresses one per line on the
following lines, and then save the file with a .csv extension.
on the first line, type the user email addresses one per line on the
following lines, and then save the file with a .csv extension.

1. Select **Browse files** and then select your CSV file, or drag and drop the
CSV file into the **Select a CSV file to upload** box. You can only select
one CSV file at a time.
CSV file into the **Select a CSV file to upload** box. You can only select
one CSV file at a time.

> [!NOTE]
>
> If the amount of email addresses in your CSV file exceeds the number of
available seats in your organization, you cannot continue to invite members.
To invite members, you can purchase more seats, or remove some email
addresses from the CSV file and re-select the new file. To purchase more
seats, see [Add seats to your subscription](/subscription/add-seats/) or
[Contact sales](https://www.docker.com/pricing/contact-sales/).
> available seats in your organization, you cannot continue to invite members.
> To invite members, you can purchase more seats, or remove some email
> addresses from the CSV file and re-select the new file. To purchase more
> seats, see [Add seats to your subscription](/manuals/subscription/manage-seats.md#add-seats-to-your-subscription) or
> [Contact sales](https://www.docker.com/pricing/contact-sales/).

1. After the CSV file has been uploaded, select **Review**.

Valid email addresses and any email addresses that have issues will appear.
Email addresses may have the following issues:

- Invalid email: The email address is not a valid address. The email address
will be ignored if you send invites. You can correct the email address in
the CSV file and re-import the file.
will be ignored if you send invites. You can correct the email address in
the CSV file and re-import the file.
- Already invited: The user has already been sent an invite email and another
invite email will not be sent.
invite email will not be sent.
- Member: The user is already a member of your organization and an invite
email will not be sent.
email will not be sent.
- Duplicate: The CSV file has multiple occurrences of the same email address.
The user will be sent only one invite email.
The user will be sent only one invite email.

1. Follow the on-screen instructions to invite members.

> [!NOTE]
>
> When you invite members, you assign them a role.
> See [Roles and permissions](/security/for-admins/roles-and-permissions/)
> See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions/_index.md)
> for details about the access permissions for each role.

Pending invitations appear on the Members page. The invitees receive an email
Expand All @@ -122,15 +119,15 @@ You can resend individual invitations, or bulk invitations from the Admin Consol
### Resend individual invitations

1. In [Docker Home](https://app.docker.com/), select your company from
the top-left account drop-down.
the top-left account drop-down.
2. Select **Admin Console**, then **Users**.
3. Select the **action menu** next to the invitee and select **Resend**.
4. Select **Invite** to confirm.

### Bulk resend invitation

1. In [Docker Home](https://app.docker.com/), select your company from
the top-left account drop-down.
the top-left account drop-down.
2. Select **Admin Console**, then **Users**.
3. Use the **checkboxes** next to **Usernames** to bulk select users.
4. Select **Resend invites**.
Expand Down
Loading
Loading