Skip to content

Commit bb457ff

Browse files
akristenakristen
committed
moved doc per tse sync
1 parent 2047366 commit bb457ff

8 files changed

Lines changed: 244 additions & 240 deletions

File tree

‎content/manuals/admin/company/_index.md‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,44 @@ weight: 20
44
description: Learn how to manage multiple organizations using companies, including managing users, owners, and security.
55
keywords: company, multiple organizations, manage companies, admin console, Docker Business settings
66
grid:
7-
- title: Create a company
8-
description: Get started by learning how to create a company.
9-
icon: apartment
10-
link: /admin/company/new-company/
11-
- title: Manage organizations
12-
description: Learn how to add and manage organizations as well as seats within your
13-
company.
14-
icon: store
15-
link: /admin/company/organizations/
16-
- title: Manage company owners
17-
description: Find out more about company owners and how to manage them.
18-
icon: supervised_user_circle
19-
link: /admin/company/owners/
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
25-
description: Discover how to configure SSO for your entire company.
26-
icon: key
27-
link: /security/for-admins/single-sign-on/
28-
- title: Set up SCIM
29-
description: Set up SCIM to automatically provision and deprovision users in your
30-
company.
31-
icon: checklist
32-
link: /security/for-admins/provisioning/scim/
33-
- title: Domain management
34-
description: Add and verify your company's domains.
35-
icon: domain_verification
36-
link: /security/for-admins/domain-management/
37-
- title: FAQs
38-
description: Explore frequently asked questions about companies.
39-
link: /faq/admin/company-faqs/
40-
icon: help
7+
- title: Create a company
8+
description: Get started by learning how to create a company.
9+
icon: apartment
10+
link: /admin/company/new-company/
11+
- title: Manage organizations
12+
description:
13+
Learn how to add and manage organizations as well as seats within your
14+
company.
15+
icon: store
16+
link: /admin/company/organizations/
17+
- title: Manage company owners
18+
description: Find out more about company owners and how to manage them.
19+
icon: supervised_user_circle
20+
link: /admin/company/owners/
21+
- title: Manage users
22+
description: Explore how to manage users in all organizations.
23+
icon: group_add
24+
link: /admin/company/users/
25+
- title: Configure single sign-on
26+
description: Discover how to configure SSO for your entire company.
27+
icon: key
28+
link: /security/for-admins/single-sign-on/
29+
- title: Set up SCIM
30+
description:
31+
Set up SCIM to automatically provision and deprovision users in your
32+
company.
33+
icon: checklist
34+
link: /security/for-admins/provisioning/scim/
35+
- title: Domain management
36+
description: Add and verify your company's domains.
37+
icon: domain_verification
38+
link: /enterprise/security/domain-management/
39+
- title: FAQs
40+
description: Explore frequently asked questions about companies.
41+
link: /faq/admin/company-faqs/
42+
icon: help
4143
aliases:
42-
- /docker-hub/creating-companies/
44+
- /docker-hub/creating-companies/
4345
---
4446

4547
{{< summary-bar feature_name="Company" >}}

‎content/manuals/admin/organization/_index.md‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@ weight: 10
55
description: Learn how to manage your Docker organization, including teams, members, permissions, and settings.
66
keywords: organizations, admin, overview, manage teams, roles
77
grid:
8-
- title: Onboard your organization
9-
description: Learn how to onboard and secure your organization.
10-
icon: explore
11-
link: /admin/organization/onboard
12-
- title: Manage members
13-
description: Explore how to manage members.
14-
icon: group_add
15-
link: /admin/organization/members/
16-
- title: Activity logs
17-
description: Learn how to audit the activities of your members.
18-
icon: text_snippet
19-
link: /admin/organization/activity-logs/
20-
- title: Image Access Management
21-
description: Control which types of images your developers can pull.
22-
icon: photo_library
23-
link: /admin/organization/image-access/
24-
- title: Registry Access Management
25-
description: Define which registries your developers can access.
26-
icon: home_storage
27-
link: /admin/organization/registry-access/
28-
- title: Organization settings
29-
description: Configure information for your organization and manage settings.
30-
icon: settings
31-
link: /admin/organization/general-settings/
32-
- title: SSO and SCIM
33-
description: 'Set up [Single Sign-On](/security/for-admins/single-sign-on/)
34-
and [SCIM](/security/for-admins/provisioning/scim/) for your organization.'
35-
icon: key
36-
- title: Domain management
37-
description: Add, verify, and audit your domains.
38-
link: /enterprise/security/provisioning/domain-management/
39-
icon: domain_verification
40-
- title: FAQs
41-
description: Explore common organization FAQs.
42-
link: /faq/admin/organization-faqs/
43-
icon: help
8+
- title: Onboard your organization
9+
description: Learn how to onboard and secure your organization.
10+
icon: explore
11+
link: /admin/organization/onboard
12+
- title: Manage members
13+
description: Explore how to manage members.
14+
icon: group_add
15+
link: /admin/organization/members/
16+
- title: Activity logs
17+
description: Learn how to audit the activities of your members.
18+
icon: text_snippet
19+
link: /admin/organization/activity-logs/
20+
- title: Image Access Management
21+
description: Control which types of images your developers can pull.
22+
icon: photo_library
23+
link: /admin/organization/image-access/
24+
- title: Registry Access Management
25+
description: Define which registries your developers can access.
26+
icon: home_storage
27+
link: /admin/organization/registry-access/
28+
- title: Organization settings
29+
description: Configure information for your organization and manage settings.
30+
icon: settings
31+
link: /admin/organization/general-settings/
32+
- title: SSO and SCIM
33+
description: "Set up [Single Sign-On](/security/for-admins/single-sign-on/)
34+
and [SCIM](/security/for-admins/provisioning/scim/) for your organization."
35+
icon: key
36+
- title: Domain management
37+
description: Add, verify, and audit your domains.
38+
link: /enterprise/security/domain-management/
39+
icon: domain_verification
40+
- title: FAQs
41+
description: Explore common organization FAQs.
42+
link: /faq/admin/organization-faqs/
43+
icon: help
4444
---
4545

4646
A Docker organization is a collection of teams and repositories with centralized
@@ -65,4 +65,4 @@ and simplify permission management.
6565

6666
Learn how to create and manage your organization in the following sections.
6767

68-
{{< grid >}}
68+
{{< grid >}}

‎content/manuals/admin/organization/general-settings.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ After configuring your organization information, you can:
3131

3232
- [Configure single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/connect.md)
3333
- [Set up SCIM provisioning](/manuals/enterprise/security/provisioning/scim.md)
34-
- [Manage domains](/enterprise/security/provisioning/domain-management)
34+
- [Manage domains](/enterprise/security/domain-management)
3535
- [Create a company](/manuals/admin/company/new-company.md)

‎content/manuals/admin/organization/onboard.md‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ keywords: business, team, organizations, get started, onboarding, Admin Console,
66
toc_min: 1
77
toc_max: 3
88
aliases:
9-
- /docker-hub/onboard/
10-
- /docker-hub/onboard-team/
11-
- /docker-hub/onboard-business/
9+
- /docker-hub/onboard/
10+
- /docker-hub/onboard-team/
11+
- /docker-hub/onboard-business/
1212
---
1313

1414
{{< summary-bar feature_name="Admin orgs" >}}
@@ -31,17 +31,17 @@ limits and other benefits when they are signed in.
3131
Before you start onboarding your organization, ensure you:
3232

3333
- Have a Docker Team or Business subscription. For more details, see
34-
[Docker subscriptions and features](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminOnboard).
34+
[Docker subscriptions and features](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminOnboard).
3535

3636
> [!NOTE]
3737
>
3838
> When purchasing a self-serve subscription, the on-screen instructions
39-
guide you through creating an organization. If you have purchased a
40-
subscription through Docker Sales and you have not yet created an
41-
organization, see [Create an organization](/manuals/admin/organization/orgs.md).
39+
> guide you through creating an organization. If you have purchased a
40+
> subscription through Docker Sales and you have not yet created an
41+
> organization, see [Create an organization](/manuals/admin/organization/orgs.md).
4242
4343
- Familiarize yourself with Docker concepts and terminology in
44-
the [administration overview](../_index.md).
44+
the [administration overview](../_index.md).
4545

4646
## Onboard with guided setup
4747

@@ -58,9 +58,9 @@ The guided setup walks you through the following onboarding steps:
5858

5959
- **Invite your team**: Invite owners and members.
6060
- **Manage user access**: Add and verify a domain, manage users with SSO, and
61-
enforce Docker Desktop sign-in.
61+
enforce Docker Desktop sign-in.
6262
- **Docker Desktop security**: Configure image access management, registry
63-
access management, and settings management.
63+
access management, and settings management.
6464

6565
## Recommended onboarding steps
6666

@@ -71,28 +71,28 @@ receive your Docker subscription benefits.
7171

7272
1. Identify the Docker users in your organization.
7373
- If your organization uses device management software, like MDM or Jamf,
74-
you can use the device management software to help identify Docker users.
75-
See your device management software's documentation for details. You can
76-
identify Docker users by checking if Docker Desktop is installed at the
77-
following location on each user's machine:
78-
- Mac: `/Applications/Docker.app`
79-
- Windows: `C:\Program Files\Docker\Docker`
80-
- Linux: `/opt/docker-desktop`
74+
you can use the device management software to help identify Docker users.
75+
See your device management software's documentation for details. You can
76+
identify Docker users by checking if Docker Desktop is installed at the
77+
following location on each user's machine:
78+
- Mac: `/Applications/Docker.app`
79+
- Windows: `C:\Program Files\Docker\Docker`
80+
- Linux: `/opt/docker-desktop`
8181
- If your organization doesn't use device management software or your
82-
users haven't installed Docker Desktop yet, you can survey your users to
83-
identify who is using Docker Desktop.
82+
users haven't installed Docker Desktop yet, you can survey your users to
83+
identify who is using Docker Desktop.
8484
1. Ask users to update their Docker account's email address to one associated
85-
with your organization's domain, or create a new account with that email.
85+
with your organization's domain, or create a new account with that email.
8686
- To update an account's email address, instruct your users to sign in
87-
to [Docker Hub](https://hub.docker.com), and update the email address to
88-
their email address in your organization's domain.
87+
to [Docker Hub](https://hub.docker.com), and update the email address to
88+
their email address in your organization's domain.
8989
- To create a new account, instruct your users to
90-
[sign up](https://hub.docker.com/signup) using their email address associated
91-
with your organization's domain. Ensure your users verify their email address.
90+
[sign up](https://hub.docker.com/signup) using their email address associated
91+
with your organization's domain. Ensure your users verify their email address.
9292
1. Identify Docker accounts associated with your organization's domain:
9393
- Ask your Docker sales representative or
94-
[contact sales](https://www.docker.com/pricing/contact-sales/) to get a list
95-
of Docker accounts that use an email address in your organization's domain.
94+
[contact sales](https://www.docker.com/pricing/contact-sales/) to get a list
95+
of Docker accounts that use an email address in your organization's domain.
9696

9797
### Step two: Invite owners
9898

@@ -125,22 +125,22 @@ subscription, see [Change your subscription](/manuals/subscription/change.md).
125125
Use your identity provider (IdP) to manage members and provision them to Docker
126126
automatically via SSO and SCIM. See the following for more details:
127127

128-
- [Configure SSO](/manuals/enterprise/security/single-sign-on/connect.md)
129-
to authenticate and add members when they sign in to Docker through your
130-
identity provider.
131-
- Optional.
132-
[Enforce SSO](/manuals/enterprise/security/single-sign-on/connect.md) to
133-
ensure that when users sign in to Docker, they must use SSO.
128+
- [Configure SSO](/manuals/enterprise/security/single-sign-on/connect.md)
129+
to authenticate and add members when they sign in to Docker through your
130+
identity provider.
131+
- Optional.
132+
[Enforce SSO](/manuals/enterprise/security/single-sign-on/connect.md) to
133+
ensure that when users sign in to Docker, they must use SSO.
134134

135-
> [!NOTE]
136-
>
137-
> Enforcing single sign-on (SSO) and enforcing Docker Desktop sign in
138-
are different features. For more details, see
139-
> [Enforcing sign-in versus enforcing single sign-on (SSO)](/manuals/enterprise/security/enforce-sign-in/_index.md#enforcing-sign-in-versus-enforcing-single-sign-on-sso).
135+
> [!NOTE]
136+
>
137+
> Enforcing single sign-on (SSO) and enforcing Docker Desktop sign in
138+
> are different features. For more details, see
139+
> [Enforcing sign-in versus enforcing single sign-on (SSO)](/manuals/enterprise/security/enforce-sign-in/_index.md#enforcing-sign-in-versus-enforcing-single-sign-on-sso).
140140
141-
- [Configure SCIM](/manuals/enterprise/security/provisioning/scim.md) to
142-
automatically provision, add, and de-provision members to Docker through
143-
your identity provider.
141+
- [Configure SCIM](/manuals/enterprise/security/provisioning/scim.md) to
142+
automatically provision, add, and de-provision members to Docker through
143+
your identity provider.
144144

145145
### Step five: Enforce sign-in for Docker Desktop
146146

@@ -152,6 +152,7 @@ and they can circumvent [Docker’s security features](/manuals/enterprise/secur
152152

153153
There are multiple ways you can enforce sign-in, depending on your organization's
154154
Docker configuration:
155+
155156
- [Registry key method (Windows only)](/manuals/enterprise/security/enforce-sign-in/methods.md#registry-key-method-windows-only)
156157
- [`.plist` method (Mac only)](/manuals/enterprise/security/enforce-sign-in/methods.md#plist-method-mac-only)
157158
- [`registry.json` method (All)](/manuals/enterprise/security/enforce-sign-in/methods.md#registryjson-method-all)
@@ -169,7 +170,7 @@ security posture:
169170

170171
- [Manage Docker products](./manage-products.md) to configure access and view usage.
171172
- Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development.
172-
- [Manage your domains](/enterprise/security/provisioning/domain-management) to ensure that all Docker users in your domain are part of your organization.
173+
- [Manage your domains](/enterprise/security/domain-management) to ensure that all Docker users in your domain are part of your organization.
173174

174175
Your Docker subscription provides many more additional features. To learn more,
175176
see [Docker subscriptions and features](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminOnboard).

0 commit comments

Comments
 (0)