Skip to content

publish updates from main #22194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2025
Merged

publish updates from main #22194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbe3017
chore: cleanup includes w/ embedded shortcodes (#22191)
sarahsanders-docker Mar 7, 2025
fee0d8b
sso: add callout to certificate instructions (#22193)
sarahsanders-docker Mar 7, 2025
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
6 changes: 0 additions & 6 deletions content/includes/compose-bridge-experimental.md
View file
Open in desktop

This file was deleted.

14 changes: 13 additions & 1 deletion content/manuals/security/for-admins/single-sign-on/connect.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ After creating your connection in Docker and your IdP, you can cross-connect the
2. Copy the following values from the Okta SAML setup instruction page:
- **SAML Sign-in URL**
- **x509 Certificate**

> [!IMPORTANT]
>
> You must copy the entire contents of your **x509 Certificate**,
including the `----BEGIN CERTIFICATE----` and `----END CERTIFICATE----` lines.

3. Open Docker Hub or the Admin Console. Your SSO configuration page should still be open from Step one of this guide.
4. Select **Next** to open the **Update single-sign on connection** page.
5. Paste your Okta **SAML Sign-in URL** and **x509 Certificate** values in Docker.
Expand All @@ -158,7 +164,13 @@ After creating your connection in Docker and your IdP, you can cross-connect the
2. Open your downloaded **Certificate (Base64)** in a text editor.
3. Copy the following values:
- From Azure AD: **Login URL**
- Copy your the contents of your **Certificate (Base64)** file from your text editor
- Copy the contents of your **Certificate (Base64)** file from your text editor

> [!IMPORTANT]
>
> You must copy the entire contents of your **Certificate (base64)**,
including the `----BEGIN CERTIFICATE----` and `----END CERTIFICATE----` lines.

4. Open Docker Hub or the Admin Console. Your SSO configuration page should still be open from Step one of this guide.
5. Paste your **Login URL** and **Certificate (Base64)** values in Docker.
6. Select **Next**.
Expand Down