Skip to content

Commit 9b93eb9

Browse files
iam: multiple-idp (#21675)
## Description - Updated SSO configuration/management docs for multiple IdP support - Updated FAQs to clarify that Docker now supports it - Fixed some typos ## Related issues or tickets [ENGDOCS-2358](https://docker.atlassian.net/browse/ENGDOCS-2358) ## Reviews - [ ] Technical review @gurleensethi-docker @ivan-californias @technicallyjosh - [ ] Editorial review - [ ] Product review [ENGDOCS-2358]: https://docker.atlassian.net/browse/ENGDOCS-2358?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
1 parent 71109d5 commit 9b93eb9

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Additionally, you can't reuse a Docker ID in the future if you deactivate your a
2727

2828
### What if my Docker ID is taken?
2929

30-
All Docker IDs are first-come, first-served except for companies that have a US Trademark on a username. If you have a trademark for your namespace, [Docker Support](https://hub.docker.com/support/contact/) can retrieve the Docker ID for you.
30+
All Docker IDs are first-come, first-served except for companies that have a U.S. Trademark on a username. If you have a trademark for your namespace, [Docker Support](https://hub.docker.com/support/contact/) can retrieve the Docker ID for you.
3131

3232
### What’s an organization?
3333

@@ -66,7 +66,7 @@ The organization owner can also add additional owners to help them manage users,
6666

6767
### Can I configure multiple SSO identity providers (IdPs) to authenticate users to a single org?
6868

69-
Docker SSO allows only one IdP configuration per organization. For more
69+
Yes. Docker SSO supports multiple IdP configurations. For more
7070
information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../../security/faqs/single-sign-on/faqs.md).
7171

7272
### What is a service account?

content/manuals/security/faqs/single-sign-on/idp-faqs.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ aliases:
1111

1212
### Is it possible to use more than one IdP with Docker SSO?
1313

14-
No. You can only configure Docker SSO to work with a single IdP. A domain can only be associated with a single IdP. Docker supports Entra ID (formerly Azure AD) and identity providers that support SAML 2.0.
14+
Yes. Docker supports multiple IdP configurations. A domain can be associated with multiple IdPs. Docker supports Entra ID (formerly Azure AD) and identity providers that support SAML 2.0.
1515

1616
### Is it possible to change my identity provider after configuring SSO?
1717

@@ -57,4 +57,4 @@ Yes, Entra ID (formerly Azure AD) is supported with SSO for Docker Business, bot
5757

5858
### My SSO connection with Entra ID isn't working and I receive an error that the application is misconfigured. How can I troubleshoot this?
5959

60-
Confirm that you've configured the necessary API permissions in Entra ID (formerly Azure AD) for your SSO connection. You need to grant admin consent within your Entra ID (formerly Azure AD) tenant. See [Entra ID (formerly Azure AD) documentation](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/grant-admin-consent?pivots=portal#grant-admin-consent-in-app-registrations).
60+
Confirm that you've configured the necessary API permissions in Entra ID (formerly Azure AD) for your SSO connection. You need to grant administrator consent within your Entra ID (formerly Azure AD) tenant. See [Entra ID (formerly Azure AD) documentation](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/grant-admin-consent?pivots=portal#grant-admin-consent-in-app-registrations).

content/manuals/security/for-admins/single-sign-on/configure.md

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Get started creating a single sign-on (SSO) connection for your organization or
1818

1919
## Step one: Add your domain
2020

21+
> [!NOTE]
22+
>
23+
> Docker supports multiple identity provider (IdP) configurations. With a multiple IdP configuration, one domain can be associated with more than one SSO identity provider.
24+
2125
{{< tabs >}}
2226
{{< tab name="Admin Console" >}}
2327

content/manuals/security/for-admins/single-sign-on/connect.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,20 @@ After you've completed the SSO connection process in Docker, we recommend testin
202202

203203
1. Open an incognito browser.
204204
2. Sign in to the Admin Console using your **domain email address**.
205-
3. The browser will redirect to your IdP's login page to authenticate.
205+
3. The browser will redirect to your identity provider's sign in page to authenticate. If you have [multiple IdPs](#optional-configure-multiple-idps), choose the sign sign-in option **Continue with SSO**.
206206
4. Authenticate through your domain email instead of using your Docker ID.
207207

208208
You can also test your SSO connection through the command-line interface (CLI). If you want to test through the CLI, your users must have a personal access token (PAT).
209209

210+
## Optional: Configure multiple IdPs
211+
212+
Docker supports multiple IdP configurations. With multiple IdPs configured, one domain can be associated with multiple SSO identity providers. To configure multiple IdPs, repeat steps 1-4 in this guide for each IdP. Ensure each IdP configuration uses the same domain.
213+
214+
When a user signs in to a Docker organization that has multiple IdPs, on the sign-in page, they must choose the option **Continue with SSO**. This prompts them to choose their identity provider and authenticate through their domain email.
210215

211216
## Optional: Enforce SSO
212217

213-
>[!IMPORTANT]
218+
> [!IMPORTANT]
214219
>
215220
> If SSO isn't enforced, users can choose to sign in with either their Docker username and password or SSO.
216221

layouts/shortcodes/admin-sso-management.md

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
### Remove a domain from an SSO connection
1010

11+
> [!IMPORTANT]
12+
>
13+
> Docker supports multiple IdP configurations, where a single domain is used for multiple SSO identity providers. If you want to remove a domain from multiple SSO connections, you must remove it from each connection individually.
14+
1115
1. Sign in to {{ $product_link }}.
1216
2. {{ $sso_navigation }}
1317
3. In the SSO connections table, select the **Action** icon and then **Edit connection**.

0 commit comments

Comments
 (0)