From 0e68682bacba7b1c549f9fbd870fe45d2da89557 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Tue, 8 Apr 2025 10:52:59 -0400 Subject: [PATCH 1/2] Add deprecation alerts to hub org management docs --- content/includes/hub-org-management.md | 6 + content/manuals/admin/_index.md | 4 +- .../admin/organization/activity-logs.md | 10 +- .../admin/organization/convert-account.md | 2 +- .../admin/organization/deactivate-account.md | 2 + .../admin/organization/manage-a-team.md | 38 ++--- content/manuals/admin/organization/members.md | 143 +++++++++++------- content/manuals/admin/organization/orgs.md | 105 ++++++------- content/manuals/security/faqs/general.md | 6 +- .../faqs/single-sign-on/domain-faqs.md | 2 +- .../faqs/single-sign-on/enforcement-faqs.md | 2 +- .../security/faqs/single-sign-on/idp-faqs.md | 2 +- .../faqs/single-sign-on/users-faqs.md | 2 +- .../security/for-admins/domain-audit.md | 10 +- .../image-access-management.md | 10 +- .../registry-access-management.md | 10 +- .../security/for-admins/provisioning/scim.md | 4 + .../for-admins/single-sign-on/configure.md | 4 + .../for-admins/single-sign-on/connect.md | 2 + .../for-admins/single-sign-on/manage.md | 4 + hugo_stats.json | 4 - 21 files changed, 220 insertions(+), 152 deletions(-) create mode 100644 content/includes/hub-org-management.md diff --git a/content/includes/hub-org-management.md b/content/includes/hub-org-management.md new file mode 100644 index 000000000000..217020493c39 --- /dev/null +++ b/content/includes/hub-org-management.md @@ -0,0 +1,6 @@ +> [!WARNING] +> +> Organization management is moving to the Admin Console. +> +> Manage members, team, settings, and activity logs in the Docker Admin Console. +> Access to these features in Docker Hub will end soon. Explore the [Admin Console](https://app.docker.com/admin). \ No newline at end of file diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index 1b57bac28d27..cf5274bfd919 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -35,9 +35,9 @@ aliases: - /docker-hub/admin-overview --- -Administrators can manage companies and organizations using the Docker Admin Console, or manage organizations in Docker Hub. +Administrators can manage companies and organizations using the Docker Admin Console. -The Docker Admin Console is available for customers with a Docker Business subscription. The [Docker Admin Console](https://admin.docker.com) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles. +The [Docker Admin Console](https://admin.docker.com) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles. ![Docker hierarchy](./images/docker-admin-structure.webp) diff --git a/content/manuals/admin/organization/activity-logs.md b/content/manuals/admin/organization/activity-logs.md index 75ad5712c0d8..18c9b5a14085 100644 --- a/content/manuals/admin/organization/activity-logs.md +++ b/content/manuals/admin/organization/activity-logs.md @@ -23,14 +23,16 @@ Owners can also see the activity logs for their repository if the repository is ## Manage activity logs {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -{{% admin-org-audit-log product="hub" %}} +{{% admin-org-audit-log product="admin" %}} {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -{{% admin-org-audit-log product="admin" %}} +{{% include "hub-org-management.md" %}} + +{{% admin-org-audit-log product="hub" %}} {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/admin/organization/convert-account.md b/content/manuals/admin/organization/convert-account.md index 5b1aa3547f2e..efa46dd09fda 100644 --- a/content/manuals/admin/organization/convert-account.md +++ b/content/manuals/admin/organization/convert-account.md @@ -54,7 +54,7 @@ Consider the following effects of converting your account: 1. Ensure you have removed your user account from any company or teams or organizations. Also make sure that you have a new Docker ID before you convert an account. See the [Prerequisites](#prerequisites) section for details. -2. Sign in to your [Docker account](https://app.docker.com/login). +2. Sign in to your [Docker Home](https://app.docker.com/login). 3. In Docker Home, select your avatar in the top-right corner to open the drop-down. diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md index 9f82fbe267f8..b0ad4ab3525e 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -49,6 +49,8 @@ Once you have completed all the previous steps, you can deactivate your organiza {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + 1. On Docker Hub, select **My Hub**. 2. Choose the organization you want to deactivate. 3. In **Settings**, select the **Deactivate org** and then **Deactivate organization**. diff --git a/content/manuals/admin/organization/manage-a-team.md b/content/manuals/admin/organization/manage-a-team.md index 5a12db5e995a..1491f77edea7 100644 --- a/content/manuals/admin/organization/manage-a-team.md +++ b/content/manuals/admin/organization/manage-a-team.md @@ -35,20 +35,22 @@ The organization owner can also add additional organization owners to help them ## Create a team {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select the **Teams** and then select **Create Team**. +1. In Admin Console, select your organization. +2. In the **User management** section, select **Teams**. +3. Select **Create team**. 4. Fill out your team's information and select **Create**. 5. [Add members to your team](members.md#add-a-member-to-a-team). {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -1. In Admin Console, select your organization. -2. In the **User management** section, select **Teams**. -3. Select **Create team**. +{{% include "hub-org-management.md" %}} + +1. Sign in to [Docker Hub](https://hub.docker.com). +2. Select **My Hub** and choose your organization. +3. Select the **Teams** and then select **Create Team**. 4. Fill out your team's information and select **Create**. 5. [Add members to your team](members.md#add-a-member-to-a-team). @@ -118,8 +120,19 @@ To view a team's permissions across all repositories: Organization owners can delete a team in Docker Hub or Admin Console. When you remove a team from your organization, this action revokes the members' access to the team's permitted resources. It won't remove users from other teams that they belong to, nor will it delete any resources. {{< tabs >}} +{{< tab name="Admin Console" >}} + +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. In the **User management** section, select **Teams**. +3. Select the **Actions** icon next to the name of the team you want to delete. +4. Select **Delete team**. +5. Review the confirmation message, then select **Delete**. + +{{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + 1. Sign in to [Docker Hub](https://hub.docker.com). 2. Select **My Hub** and choose your organization. 3. Select **Teams**. @@ -128,15 +141,6 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r 6. Select **Delete Team**. 7. Review the confirmation message, then select **Delete**. -{{< /tab >}} -{{< tab name="Admin Console" >}} - -1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. In the **User management** section, select **Teams**. -3. Select the **Actions** icon next to the name of the team you want to delete. -4. Select **Delete team**. -5. Review the confirmation message, then select **Delete**. - {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index dba13af4b787..536de693e38b 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -12,14 +12,16 @@ Learn how to manage members for your organization in Docker Hub and the Docker A ## Invite members {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -{{% admin-users product="hub" %}} +{{% admin-users product="admin" %}} {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -{{% admin-users product="admin" %}} +{{% include "hub-org-management.md" %}} + +{{% admin-users product="hub" %}} {{< /tab >}} {{< /tabs >}} @@ -59,8 +61,20 @@ After inviting members, you can resend or remove invitations as needed. ### Resend an invitation {{< tabs >}} +{{< tab name="Admin Console" >}} + +To resend an invitation from the Admin Console: + +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. Select **Members**. +3. Select the **action menu** next to the invitee and select **Resend invitation**. +4. Select **Invite** to confirm. + +{{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + To resend an invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). @@ -73,23 +87,25 @@ You can also resend an invitation using the Docker Hub API. For more information see the [Resend an invite](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1%7Bid%7D~1resend/patch) API endpoint. {{< /tab >}} +{{< /tabs >}} + +### Remove an invitation + +{{< tabs >}} {{< tab name="Admin Console" >}} -To resend an invitation from the Admin Console: +To remove an invitation from the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. 2. Select **Members**. -3. Select the **action menu** next to the invitee and select **Resend invitation**. -4. Select **Invite** to confirm. +3. Select the **action menu** next to the invitee and select **Remove invitee**. +4. Select **Remove** to confirm. {{< /tab >}} -{{< /tabs >}} - -### Remove an invitation - -{{< tabs >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + To remove a member's invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). @@ -100,16 +116,6 @@ To remove a member's invitation from Docker Hub: You can also remove an invitation using the Docker Hub API. For more information, see the [Cancel an invite](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1%7Bid%7D/delete) API endpoint. -{{< /tab >}} -{{< tab name="Admin Console" >}} - -To remove an invitation from the Admin Console: - -1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **Members**. -3. Select the **action menu** next to the invitee and select **Remove invitee**. -4. Select **Remove** to confirm. - {{< /tab >}} {{< /tabs >}} @@ -120,8 +126,23 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization ### Add a member to a team {{< tabs >}} +{{< tab name="Admin Console" >}} + +To add a member to a team with the Admin Console: + +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. Select the team name. +3. Select **Add member**. You can add the member by searching for their email address or username. + + > [!NOTE] + > + > An invitee must first accept the invitation to join the organization before being added to the team. + +{{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + To add a member to a team with Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). @@ -137,19 +158,6 @@ To add a member to a team with Docker Hub: > > An invitee must first accept the invitation to join the organization before being added to the team. -{{< /tab >}} -{{< tab name="Admin Console" >}} - -To add a member to a team with the Admin Console: - -1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select the team name. -3. Select **Add member**. You can add the member by searching for their email address or username. - - > [!NOTE] - > - > An invitee must first accept the invitation to join the organization before being added to the team. - {{< /tab >}} {{< /tabs >}} @@ -162,16 +170,6 @@ To add a member to a team with the Admin Console: Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources. {{< tabs >}} -{{< tab name="Docker Hub" >}} - -To remove a member from a specific team with Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub**, your organization, **Teams**, and then the team. -3. Select the **X** next to the user’s name to remove them from the team. -4. When prompted, select **Remove** to confirm. - -{{< /tab >}} {{< tab name="Admin Console" >}} To remove a member from a specific team with the Admin Console: @@ -181,6 +179,18 @@ To remove a member from a specific team with the Admin Console: 3. Select the **X** next to the user's name to remove them from the team. 4. When prompted, select **Remove** to confirm. +{{< /tab >}} +{{< tab name="Docker Hub" >}} + +{{% include "hub-org-management.md" %}} + +To remove a member from a specific team with Docker Hub: + +1. Sign in to [Docker Hub](https://hub.docker.com). +2. Select **My Hub**, your organization, **Teams**, and then the team. +3. Select the **X** next to the user’s name to remove them from the team. +4. When prompted, select **Remove** to confirm. + {{< /tab >}} {{< /tabs >}} @@ -190,12 +200,27 @@ Organization owners can manage [roles](/security/for-admins/roles-and-permission within an organization. If an organization is part of a company, the company owner can also manage that organization's roles. If you have SSO enabled, you can use [SCIM for role mapping](/security/for-admins/provisioning/scim/). +{{< tabs >}} +{{< tab name="Admin Console" >}} + +To update a member role in the Admin Console: + +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. Select the **Members** tab. +3. Find the username of the member whose role you want to edit. Select the +**Actions menu**, then **Edit role**. + > [!NOTE] > > If you're the only owner of an organization, > you need to assign a new owner before you can edit your role. -To update a member role: +{{< /tab >}} +{{< tab name="Docker Hub" >}} + +{{% include "hub-org-management.md" %}} + +To update a member role in Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). 2. Select **My Hub**, your organization, and then **Members**. @@ -203,6 +228,14 @@ To update a member role: 4. Select **Edit role**. 5. Select their organization, select the role you want to assign, and then select **Save**. +> [!NOTE] +> +> If you're the only owner of an organization, +> you need to assign a new owner before you can edit your role. + +{{< /tab >}} +{{< /tabs >}} + ## Export members CSV file {{< summary-bar feature_name="Admin orgs" >}} @@ -216,22 +249,24 @@ Owners can export a CSV file containing all members. The CSV file for a company - Account Created: The time and date when the user account was created {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} To export a CSV file of your members: -1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub**, your organization, and then **Members**. -3. Select the **Action** icon and then select **Export users as CSV**. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. Select **Members**. +3. Select the **download** icon to export a CSV file of all members. {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} + +{{% include "hub-org-management.md" %}} To export a CSV file of your members: -1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **Members**. -3. Select the **download** icon to export a CSV file of all members. +1. Sign in to [Docker Hub](https://hub.docker.com). +2. Select **My Hub**, your organization, and then **Members**. +3. Select the **Action** icon and then select **Export users as CSV**. {{< /tab >}} {{< /tabs >}} \ No newline at end of file diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 8e4e602fa09a..ef048a8a0c9c 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -26,13 +26,16 @@ detailed instructions on converting an existing user account to an organization, [Convert an account into an organization](/manuals/admin/organization/convert-account.md). {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -1. Sign in to [Docker Hub](https://hub.docker.com/) using your Docker ID, your email address, or your social provider. -2. Select **My Hub**, select the account drop-down, and then **Create Organization** to create a new organization. -3. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan. -4. Select **Continue to profile**. -5. Enter an **Organization namespace**. This is the official, unique name for +To create an organization: + +1. Sign in to [Docker Home](https://app.docker.com/). +2. Under Settings and administration, select **Go to Admin Console**. +3. Select the **Organization** drop-down in the left-hand navigation and then **Create Organization**. +4. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan. +5. Select **Continue to profile**. +6. Enter an **Organization namespace**. This is the official, unique name for your organization in Docker Hub. It's not possible to change the name of the organization after you've created it. @@ -40,27 +43,26 @@ organization after you've created it. > > You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/admin/organization/convert-account.md). -6. Enter your **Company name**. This is the full name of your company. Docker +7. Enter your **Company name**. This is the full name of your company. Docker displays the company name on your organization page and in the details of any public images you publish. You can update the company name anytime by navigating to your organization's **Settings** page. -7. Select **Continue to billing** to continue. -8. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. -9. Provide your card details and select **Purchase**. +8. Select **Continue to billing** to continue. +9. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. +10. Provide your card details and select **Purchase**. You've now created an organization. {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -To create an organization: +{{% include "hub-org-management.md" %}} -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Go to Admin Console**. -3. Select the **Organization** drop-down in the left-hand navigation and then **Create Organization**. -4. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan. -5. Select **Continue to profile**. -6. Enter an **Organization namespace**. This is the official, unique name for +1. Sign in to [Docker Hub](https://hub.docker.com/) using your Docker ID, your email address, or your social provider. +2. Select **My Hub**, select the account drop-down, and then **Create Organization** to create a new organization. +3. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan. +4. Select **Continue to profile**. +5. Enter an **Organization namespace**. This is the official, unique name for your organization in Docker Hub. It's not possible to change the name of the organization after you've created it. @@ -68,13 +70,13 @@ organization after you've created it. > > You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/admin/organization/convert-account.md). -7. Enter your **Company name**. This is the full name of your company. Docker +6. Enter your **Company name**. This is the full name of your company. Docker displays the company name on your organization page and in the details of any public images you publish. You can update the company name anytime by navigating to your organization's **Settings** page. -8. Select **Continue to billing** to continue. -9. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. -10. Provide your card details and select **Purchase**. +7. Select **Continue to billing** to continue. +8. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. +9. Provide your card details and select **Purchase**. You've now created an organization. @@ -84,12 +86,40 @@ You've now created an organization. ## View an organization {{< tabs >}} +{{< tab name="Admin Console" >}} + +To view an organization in the Admin Console: + +1. Sign in to [Docker Home](https://app.docker.com). +2. Under Settings and administration, select **Go to Admin Console**. +3. Select your organization from the **Organization** drop-down in the left-hand navigation. + +The Admin Console displays various options that let you to +configure your organization. + +- **Members**: Displays a list of team members. You + can invite new members using the **Invite members** button. See [Manage members](./members.md) for details. + +- **Teams**: Displays a list of existing teams and the number of + members in each team. See [Create a team](./manage-a-team.md) for details. + +- **Activity** Displays the audit logs, a chronological list of activities that + occur at organization and repository levels. It provides the org owners a + report of all their team member activities. See [Audit logs](./activity-logs.md) for + details. + +- **Security and access**: Manage security settings. For more information, see [Security](/manuals/security/_index.md). + +- **Organization settings**: Update general settings, manage your company settings, or [deactivate your organization](/manuals/admin/organization/deactivate-account.md). + +{{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + To view an organization: -1. Sign in to [Docker Hub](https://hub.docker.com) with a user account that is a member of any team in the - organization. +1. Sign in to [Docker Hub](https://hub.docker.com) with a user account that is a member of any team in the organization. > [!NOTE] > @@ -133,33 +163,6 @@ configure your organization. - **Billing**: Displays information about your existing [Docker subscription (plan)](../../subscription/_index.md), including the number of seats and next payment due date. For how to access the billing history and payment methods for your organization, see [View billing history](../../billing/history.md). -{{< /tab >}} -{{< tab name="Admin Console" >}} - -To view an organization in the Admin Console: - -1. Sign in to [Docker Home](https://app.docker.com). -2. Under Settings and administration, select **Go to Admin Console**. -3. Select your organization from the **Organization** drop-down in the left-hand navigation. - -The Admin Console displays various options that let you to -configure your organization. - -- **Members**: Displays a list of team members. You - can invite new members using the **Invite members** button. See [Manage members](./members.md) for details. - -- **Teams**: Displays a list of existing teams and the number of - members in each team. See [Create a team](./manage-a-team.md) for details. - -- **Activity** Displays the audit logs, a chronological list of activities that - occur at organization and repository levels. It provides the org owners a - report of all their team member activities. See [Audit logs](./activity-logs.md) for - details. - -- **Security and access**: Manage security settings. For more information, see [Security](/manuals/security/_index.md). - -- **Organization settings**: Update general settings, manage your company settings, or [deactivate your organization](/manuals/admin/organization/deactivate-account.md). - {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/security/faqs/general.md b/content/manuals/security/faqs/general.md index 1a9ad087e8cf..341c76c2a714 100644 --- a/content/manuals/security/faqs/general.md +++ b/content/manuals/security/faqs/general.md @@ -52,9 +52,9 @@ Some users authenticate by signing in to Docker Desktop and joining their domain Organizations set up in Docker use verified domains and any team member with an email domain other than what's verified is noted as a "Guest" in that organization. -### How long are Docker Hub logs available? +### How long are activity logs available? -Docker provides various types of audit logs and log retention varies. For example, Docker Hub Activity logs are available for 90 days. You are responsible for exporting logs or setting up drivers to their own internal systems. +Docker provides various types of audit logs and log retention varies. For example, Docker activity logs are available for 90 days. You are responsible for exporting logs or setting up drivers to their own internal systems. ### Can I export a list of all users with their assigned roles and privileges and if so, in what format? @@ -84,4 +84,4 @@ Extensions are not covered as part of Docker’s Third-Party Risk Management Pro ### Can I disable private repos in my organization via a setting to make sure nobody is pushing images into Docker Hub? -No. With [Registry Access Management](/manuals/security/for-admins/hardened-desktop/registry-access-management.md) (RAM), administrators can ensure that their developers using Docker Desktop only access allowed registries. This is done through the Registry Access Management dashboard on Docker Hub. +No. With [Registry Access Management](/manuals/security/for-admins/hardened-desktop/registry-access-management.md) (RAM), administrators can ensure that their developers using Docker Desktop only access allowed registries. This is done through the Registry Access Management dashboard in the Admin Console. diff --git a/content/manuals/security/faqs/single-sign-on/domain-faqs.md b/content/manuals/security/faqs/single-sign-on/domain-faqs.md index 805a45be66d7..ae40b75bf7f8 100644 --- a/content/manuals/security/faqs/single-sign-on/domain-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/domain-faqs.md @@ -1,7 +1,7 @@ --- description: Single sign-on domain FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, domains, domain verification, domain management -title: FAQS on SSO and domains +title: Domains tags: [FAQ] aliases: - /single-sign-on/domain-faqs/ diff --git a/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md b/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md index 90ea423a1577..ef4ac6fc185e 100644 --- a/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md @@ -1,7 +1,7 @@ --- description: Single sign-on enforcement FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, enforce SSO, SSO enforcement -title: FAQs on SSO and enforcement +title: Enforcement tags: [FAQ] aliases: - /single-sign-on/enforcement-faqs/ diff --git a/content/manuals/security/faqs/single-sign-on/idp-faqs.md b/content/manuals/security/faqs/single-sign-on/idp-faqs.md index 01aff89b9b17..d67ccab424bd 100644 --- a/content/manuals/security/faqs/single-sign-on/idp-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/idp-faqs.md @@ -1,7 +1,7 @@ --- description: Single sign-on IdP FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, IdP -title: FAQs on SSO and identity providers +title: Identity providers tags: [FAQ] aliases: - /single-sign-on/idp-faqs/ diff --git a/content/manuals/security/faqs/single-sign-on/users-faqs.md b/content/manuals/security/faqs/single-sign-on/users-faqs.md index 5488e1fa4485..6313ef282c6e 100644 --- a/content/manuals/security/faqs/single-sign-on/users-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/users-faqs.md @@ -1,7 +1,7 @@ --- description: Single sign-on user management FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on -title: FAQs on SSO and managing users +title: Managing users tags: [FAQ] aliases: - /single-sign-on/users-faqs/ diff --git a/content/manuals/security/for-admins/domain-audit.md b/content/manuals/security/for-admins/domain-audit.md index 57ae7edabfa6..ac9f13b920d5 100644 --- a/content/manuals/security/for-admins/domain-audit.md +++ b/content/manuals/security/for-admins/domain-audit.md @@ -45,14 +45,16 @@ Before you audit your domains, review the following required prerequisites: ## Audit your domains for uncaptured users {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -{{% admin-domain-audit product="hub" %}} +{{% admin-domain-audit product="admin" %}} {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -{{% admin-domain-audit product="admin" %}} +{{% include "hub-org-management.md" %}} + +{{% admin-domain-audit product="hub" %}} {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/security/for-admins/hardened-desktop/image-access-management.md b/content/manuals/security/for-admins/hardened-desktop/image-access-management.md index 18c5a8132a68..8dfaaddf22a1 100644 --- a/content/manuals/security/for-admins/hardened-desktop/image-access-management.md +++ b/content/manuals/security/for-admins/hardened-desktop/image-access-management.md @@ -24,14 +24,16 @@ You first need to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in ## Configure {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -{{% admin-image-access product="hub" %}} +{{% admin-image-access product="admin" %}} {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -{{% admin-image-access product="admin" %}} +{{% include "hub-org-management.md" %}} + +{{% admin-image-access product="hub" %}} {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md b/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md index f2b3ac55b82a..0ee60ecd0bad 100644 --- a/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md +++ b/content/manuals/security/for-admins/hardened-desktop/registry-access-management.md @@ -46,14 +46,16 @@ feature always takes effect. ## Configure Registry Access Management permissions {{< tabs >}} -{{< tab name="Docker Hub" >}} +{{< tab name="Admin Console" >}} -{{% admin-registry-access product="hub" %}} +{{% admin-registry-access product="admin" %}} {{< /tab >}} -{{< tab name="Admin Console" >}} +{{< tab name="Docker Hub" >}} -{{% admin-registry-access product="admin" %}} +{{% include "hub-org-management.md" %}} + +{{% admin-registry-access product="hub" %}} {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/security/for-admins/provisioning/scim.md b/content/manuals/security/for-admins/provisioning/scim.md index 2e68d80ef13d..a76de476b39a 100644 --- a/content/manuals/security/for-admins/provisioning/scim.md +++ b/content/manuals/security/for-admins/provisioning/scim.md @@ -58,6 +58,8 @@ You must [configure SSO](../single-sign-on/configure/_index.md) before you enabl {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + {{% admin-scim %}} {{< /tab >}} @@ -248,6 +250,8 @@ If SCIM is disabled, any user provisioned through SCIM will remain in the organi {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + {{% admin-scim-disable %}} {{< /tab >}} diff --git a/content/manuals/security/for-admins/single-sign-on/configure.md b/content/manuals/security/for-admins/single-sign-on/configure.md index df1b0a88a1d9..7e2984612e8d 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -31,6 +31,8 @@ Get started creating a single sign-on (SSO) connection for your organization or {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + 1. Sign in to [Docker Hub](https://hub.docker.com/). 2. Select **My Hub** and then your organization from the list. 3. On your organization page, select **Settings** and then **Security**. @@ -54,6 +56,8 @@ Verifying your domain ensures Docker knows you own it. Domain verification is do {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + 1. Navigate to your domain host, create a new TXT record, and paste the **TXT Record Value** from Docker. 2. TXT Record Verification can take 72 hours. Once you have waited for TXT record verification, return to the **Security** page of Docker Hub and select **Verify** next to your domain name. diff --git a/content/manuals/security/for-admins/single-sign-on/connect.md b/content/manuals/security/for-admins/single-sign-on/connect.md index 68d8e0133567..a5aaf812f76e 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -43,6 +43,8 @@ Make sure you have completed the following before you begin: {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + 1. Sign in to Docker Hub. 2. Select **My Hub** and then your organization from the list. 3. On your organization page, select **Settings** and then **Security**. diff --git a/content/manuals/security/for-admins/single-sign-on/manage.md b/content/manuals/security/for-admins/single-sign-on/manage.md index a3d320261a2e..4c188a3e5ea8 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -28,6 +28,8 @@ aliases: {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + {{% admin-sso-management product="hub" %}} {{< /tab >}} @@ -43,6 +45,8 @@ aliases: {{< /tab >}} {{< tab name="Docker Hub" >}} +{{% include "hub-org-management.md" %}} + {{% admin-sso-management-connections product="hub" %}} {{< /tab >}} diff --git a/hugo_stats.json b/hugo_stats.json index 36588423e141..a01b564ea82f 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -109,10 +109,6 @@ "Using-the-CLI", "Using-the-GUI", "VS-Code", - "Version-4.15-4.17", - "Version-4.17-and-earlier", - "Version-4.18-and-later", - "Versions-prior-to-4.15", "Vue", "WSL-2-backend-Arm-Beta", "WSL-2-backend-x86_64", From a7ee0f523cfceb126e10e55bdc78c8f876f9d0b9 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Thu, 10 Apr 2025 13:01:17 -0400 Subject: [PATCH 2/2] Add linkTitles and fix nits --- content/includes/hub-org-management.md | 2 +- content/manuals/admin/organization/convert-account.md | 2 +- content/manuals/security/faqs/single-sign-on/domain-faqs.md | 3 ++- .../manuals/security/faqs/single-sign-on/enforcement-faqs.md | 3 ++- content/manuals/security/faqs/single-sign-on/idp-faqs.md | 3 ++- content/manuals/security/faqs/single-sign-on/users-faqs.md | 3 ++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/content/includes/hub-org-management.md b/content/includes/hub-org-management.md index 217020493c39..b75bb77bf96d 100644 --- a/content/includes/hub-org-management.md +++ b/content/includes/hub-org-management.md @@ -1,4 +1,4 @@ -> [!WARNING] +> [!IMPORTANT] > > Organization management is moving to the Admin Console. > diff --git a/content/manuals/admin/organization/convert-account.md b/content/manuals/admin/organization/convert-account.md index efa46dd09fda..00db9570d89f 100644 --- a/content/manuals/admin/organization/convert-account.md +++ b/content/manuals/admin/organization/convert-account.md @@ -54,7 +54,7 @@ Consider the following effects of converting your account: 1. Ensure you have removed your user account from any company or teams or organizations. Also make sure that you have a new Docker ID before you convert an account. See the [Prerequisites](#prerequisites) section for details. -2. Sign in to your [Docker Home](https://app.docker.com/login). +2. Sign in to [Docker Home](https://app.docker.com/login). 3. In Docker Home, select your avatar in the top-right corner to open the drop-down. diff --git a/content/manuals/security/faqs/single-sign-on/domain-faqs.md b/content/manuals/security/faqs/single-sign-on/domain-faqs.md index ae40b75bf7f8..642e54006ada 100644 --- a/content/manuals/security/faqs/single-sign-on/domain-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/domain-faqs.md @@ -1,7 +1,8 @@ --- description: Single sign-on domain FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, domains, domain verification, domain management -title: Domains +title: FAQs for SSO and domains +linkTitle: Domains tags: [FAQ] aliases: - /single-sign-on/domain-faqs/ diff --git a/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md b/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md index ef4ac6fc185e..f77b93ac6152 100644 --- a/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/enforcement-faqs.md @@ -1,7 +1,8 @@ --- description: Single sign-on enforcement FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, enforce SSO, SSO enforcement -title: Enforcement +title: FAQs for SSO and enforcement +linkTitle: Enforcement tags: [FAQ] aliases: - /single-sign-on/enforcement-faqs/ diff --git a/content/manuals/security/faqs/single-sign-on/idp-faqs.md b/content/manuals/security/faqs/single-sign-on/idp-faqs.md index d67ccab424bd..2b456e005540 100644 --- a/content/manuals/security/faqs/single-sign-on/idp-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/idp-faqs.md @@ -1,7 +1,8 @@ --- description: Single sign-on IdP FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, IdP -title: Identity providers +title: FAQs for SSO and identity providers +linkTitle: Identity providers tags: [FAQ] aliases: - /single-sign-on/idp-faqs/ diff --git a/content/manuals/security/faqs/single-sign-on/users-faqs.md b/content/manuals/security/faqs/single-sign-on/users-faqs.md index 6313ef282c6e..8deb9adb440e 100644 --- a/content/manuals/security/faqs/single-sign-on/users-faqs.md +++ b/content/manuals/security/faqs/single-sign-on/users-faqs.md @@ -1,7 +1,8 @@ --- description: Single sign-on user management FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on -title: Managing users +title: FAQs for SSO and user management +linkTitle: User management tags: [FAQ] aliases: - /single-sign-on/users-faqs/