Skip to content

Commit acf5b30

Browse files
aevesdockersarahsanders-dockerlorenrh
authored
publish updates from main (#22391)
Automated pull request for publishing docs updates. --------- Co-authored-by: Sarah Sanders <[email protected]> Co-authored-by: Lorena Rangel <[email protected]>
2 parents 6d8ce4a + b295031 commit acf5b30

File tree

2 files changed

+49
-16
lines changed

2 files changed

+49
-16
lines changed

content/manuals/admin/organization/onboard.md

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ weight: 20
44
description: Get started onboarding your Docker Team or Business organization.
55
keywords: business, team, organizations, get started, onboarding
66
toc_min: 1
7-
toc_max: 2
7+
toc_max: 3
88
aliases:
99
- /docker-hub/onboard/
1010
- /docker-hub/onboard-team/
@@ -26,7 +26,7 @@ In this guide, you'll learn how to do the following:
2626

2727
## Prerequisites
2828

29-
Before you start to onboard your organization, ensure that you:
29+
Before you start onboarding your organization, ensure that you:
3030

3131
- Have a Docker Team or Business subscription. See [Docker Pricing](https://www.docker.com/pricing/) for details.
3232

@@ -36,51 +36,74 @@ Before you start to onboard your organization, ensure that you:
3636
3737
- Familiarize yourself with Docker concepts and terminology in the [administration overview](../_index.md) and [FAQs](/faq/admin/general-faqs/).
3838

39-
## Step 1: Identify your Docker users
39+
## Onboard with guided setup
4040

41-
Identifying your users will ensure that you allocate your subscription seats efficiently and that all your Docker users receive the benefits of your subscription.
41+
The Admin Console has a guided setup to help you easily
42+
onboard your organization. The guided setup steps consist of basic onboarding
43+
tasks. If you want to onboard outside of the guided setup,
44+
see [Recommended onboarding steps](/manuals/admin/organization/onboard.md#recommended-onboarding-steps).
45+
46+
To onboard using the guided setup,
47+
navigate to the [Admin Console](https://app.docker.com) and
48+
select **Guided setup** in the left-hand navigation.
49+
50+
The guided setup walks you through the following onboarding steps:
51+
52+
- **Invite your team**: Invite owners and members.
53+
- **Manage user access**: Add and verify a domain, manage users with SSO, and
54+
enforce Docker Desktop sign-in.
55+
- **Docker Desktop security**: Configure image access management, registry access
56+
management, and settings management.
57+
58+
## Recommended onboarding steps
59+
60+
### Step one: Identify your Docker users
61+
62+
Identifying your users helps you allocate seats efficiently and ensures they
63+
receive your Docker subscription benefits.
4264

4365
1. Identify the Docker users in your organization.
44-
- If your organization uses device management software, like MDM or Jamf, you may use the device management software to help identify Docker users. See your device management software's documentation for details. You can identify Docker users by checking if Docker Desktop is installed at the following location on each user's machine:
66+
- If your organization uses device management software, like MDM or Jamf, you can use the device management software to help identify Docker users. See your device management software's documentation for details. You can identify Docker users by checking if Docker Desktop is installed at the following location on each user's machine:
4567
- Mac: `/Applications/Docker.app`
4668
- Windows: `C:\Program Files\Docker\Docker`
4769
- Linux: `/opt/docker-desktop`
48-
- If your organization doesn't use device management software or your users haven't installed Docker Desktop yet, you may survey your users.
49-
2. Instruct all your organization's Docker users to update their existing Docker account's email address to an address that's in your organization's domain, or to create a new account using an email address in your organization's domain.
70+
- If your organization doesn't use device management software or your users haven't installed Docker Desktop yet, you can survey your users.
71+
2. Ask users to update their Docker account email to one in your organizations domain, or create a new account with that email.
5072
- To update an account's email address, instruct your users to sign in to [Docker Hub](https://hub.docker.com), and update the email address to their email address in your organization's domain.
5173
- To create a new account, instruct your users to go [sign up](https://hub.docker.com/signup) using their email address in your organization's domain.
5274
3. Ask your Docker sales representative or [contact sales](https://www.docker.com/pricing/contact-sales/) to get a list of Docker accounts that use an email address in your organization's domain.
5375

54-
## Step 2: Invite owners
76+
### Step two: Invite owners
5577

5678
When you create an organization, you are the only owner. It is optional to add additional owners. Owners can help you onboard and manage your organization.
5779

5880
To add an owner, invite a user and assign them the owner role. For more details, see [Invite members](/admin/organization/members/).
5981

60-
## Step 3: Invite members
82+
### Step three: Invite members
6183

6284
When you add users to your organization, you gain visibility into their activity and you can enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits.
6385

6486
To add a member, invite a user and assign them the member role. For more details, see [Invite members](/admin/organization/members/).
6587

66-
## Step 4: Manage members with SSO and SCIM
88+
### Step four: Manage user access with SSO and SCIM
6789

6890
Configuring SSO and SCIM is optional and only available to Docker Business subscribers. To upgrade a Docker Team subscription to a Docker Business subscription, see [Upgrade your subscription](/subscription/upgrade/).
6991

70-
You can manage your members in your identity provider and automatically provision them to your Docker organization with SSO and SCIM. See the following for more details.
92+
Use your identity provider (IdP) to manage members and provision them to Docker
93+
automatically via SSO and SCIM. See the following for more details:
94+
7195
- [Configure SSO](/manuals/security/for-admins/single-sign-on/configure.md) to authenticate and add members when they sign in to Docker through your identity provider.
7296
- Optional. [Enforce SSO](/manuals/security/for-admins/single-sign-on/connect.md) to ensure that when users sign in to Docker, they must use SSO.
7397

7498
> [!NOTE]
7599
>
76-
> Enforcing single sign-on (SSO) and [Step 5: Enforce sign-in for Docker
77-
> Desktop](#step-5-enforce-sign-in-for-docker-desktop) are different
78-
> features. For more details, see
100+
> Enforcing single sign-on (SSO) and enforcing Docker Desktop sign in
101+
are different features. For more details, see
79102
> [Enforcing sign-in versus enforcing single sign-on (SSO)](/security/for-admins/enforce-sign-in/#enforcing-sign-in-versus-enforcing-single-sign-on-sso).
80103
81104
- [Configure SCIM](/security/for-admins/provisioning/scim/) to automatically provision, add, and de-provision members to Docker through your identity provider.
82105

83-
## Step 5: Enforce sign-in for Docker Desktop
106+
### Step five: Enforce sign-in for Docker Desktop
84107

85108
By default, members of your organization can use Docker Desktop without signing
86109
in. When users don’t sign in as a member of your organization, they don’t
@@ -91,10 +114,19 @@ There are multiple ways you can enforce sign-in, depending on your company's set
91114
- [`.plist` method (Mac only)](/security/for-admins/enforce-sign-in/methods/#plist-method-mac-only)
92115
- [`registry.json` method (All)](/security/for-admins/enforce-sign-in/methods/#registryjson-method-all)
93116

117+
### Step six: Manage Docker Desktop security
118+
119+
Docker offers the following security features to manage your organization's
120+
security posture:
121+
122+
- [Image Access Management](/manuals/security/for-admins/hardened-desktop/image-access-management.md): Control which types of images your developers can pull from Docker Hub.
123+
- [Registry Access Management](/manuals/security/for-admins/hardened-desktop/registry-access-management.md): Define which registries your developers can access.
124+
- [Settings management](/manuals/security/for-admins/hardened-desktop/settings-management.md): Set and control Docker Desktop settings for your users.
125+
94126
## What's next
95127

96128
- [Manage Docker products](./manage-products.md) to configure access and view usage.
97129
- Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development.
98130
- [Audit your domains](/docker-hub/domain-audit/) to ensure that all Docker users in your domain are part of your organization.
99131

100-
Your Docker subscription provides many more additional features. To learn more, see [Docker subscriptions and features](/subscription/details/).
132+
Your Docker subscription provides many more additional features. To learn more, see [Docker subscriptions and features](/subscription/details/).

content/manuals/desktop/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ For more frequently asked questions, see the [FAQs](/manuals/desktop/troubleshoo
7676
#### For Windows
7777

7878
- Switching to Windows Containers while the privileged helper error message is displayed could cause inconsistent state. As a workaround, quit Docker Desktop, change `UseWindowsContainers` to `false` in `settings-store.json` and restart Docker Desktop.
79+
- After installation, `Docker Desktop.exe` does not contain the latest version information.
7980

8081
## 4.39.0
8182

0 commit comments

Comments
 (0)