From 39fcfad4a7bf7547c13bbde2d794da8d276217c1 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 31 Jan 2025 09:39:28 -0800 Subject: [PATCH 1/6] Fix for Hugo includes rendering bug --- content/manuals/admin/company/new-company.md | 4 ++-- content/manuals/admin/company/organizations.md | 8 ++++++-- content/manuals/admin/company/owners.md | 6 ++++-- content/manuals/admin/company/users.md | 4 ++-- .../manuals/admin/organization/activity-logs.md | 4 ++-- .../admin/organization/general-settings.md | 2 +- content/manuals/admin/organization/insights.md | 2 +- .../manuals/admin/organization/manage-a-team.md | 8 ++++---- content/manuals/admin/organization/members.md | 12 ++++++------ content/manuals/admin/organization/onboard.md | 2 -- content/manuals/admin/organization/orgs.md | 8 ++++---- .../manuals/security/for-admins/domain-audit.md | 4 ++-- .../hardened-desktop/image-access-management.md | 4 ++-- .../registry-access-management.md | 4 ++-- .../security/for-admins/provisioning/scim.md | 6 +++--- .../for-admins/single-sign-on/configure.md | 6 +++--- .../for-admins/single-sign-on/connect.md | 4 ++-- .../security/for-admins/single-sign-on/manage.md | 12 ++++++------ data/summary.yaml | 2 ++ layouts/shortcodes/summary-bar.html | 16 ++++++++-------- 20 files changed, 62 insertions(+), 56 deletions(-) diff --git a/content/manuals/admin/company/new-company.md b/content/manuals/admin/company/new-company.md index 7d5965fe13d9..1ae1c293080d 100644 --- a/content/manuals/admin/company/new-company.md +++ b/content/manuals/admin/company/new-company.md @@ -12,10 +12,10 @@ You can create a new company in the Docker Admin Console. Before you begin, you - Be the owner of the organization you want to add to your company - Have a Docker Business subscription -{{% include "admin-early-access.md" %}} - ## Create a company +{{< summary-bar feature_name="Admin console early access" >}} + To create a new company: 1. Sign in to the [Admin Console](https://app.docker.com/admin). diff --git a/content/manuals/admin/company/organizations.md b/content/manuals/admin/company/organizations.md index 1db85a2e9aab..d7febc5df7a7 100644 --- a/content/manuals/admin/company/organizations.md +++ b/content/manuals/admin/company/organizations.md @@ -8,10 +8,10 @@ title: Manage company organizations You can manage the organizations in a company in the Docker Admin Console. -{{% include "admin-early-access.md" %}} - ## View all organizations +{{< summary-bar feature_name="Admin console early access" >}} + 1. Sign in to the [Admin Console](https://admin.docker.com). 2. Select your company on the **Choose profile** page. 3. Under **Organizations**, select **Overview**. @@ -26,6 +26,8 @@ For more information about adding seats, see [Manage seats](/manuals/subscriptio ## Add organizations to a company +{{< summary-bar feature_name="Admin console early access" >}} + You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you want to add. There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription. > [!IMPORTANT] @@ -41,6 +43,8 @@ You must be a company owner to add an organization to a company. You must also b ## Manage an organization +{{< summary-bar feature_name="Admin console early access" >}} + 1. Sign in to the [Admin Console](https://admin.docker.com). 2. Select your company on the **Choose profile** page. 3. Select the organization that you want to manage. diff --git a/content/manuals/admin/company/owners.md b/content/manuals/admin/company/owners.md index 0788b1d25630..c920ab796e84 100644 --- a/content/manuals/admin/company/owners.md +++ b/content/manuals/admin/company/owners.md @@ -15,10 +15,10 @@ owners for all associated organizations. Unlike organization owners, company owners don't need to be member of an organization. When company owners aren't a member in an organization, they don't occupy a seat. -{{% include "admin-early-access.md" %}} - ## Add a company owner +{{< summary-bar feature_name="Admin console early access" >}} + 1. Sign in to the [Admin Console](https://admin.docker.com). 2. Select your company on the **Choose profile** page. 3. Select **Company owners**. @@ -28,6 +28,8 @@ member in an organization, they don't occupy a seat. ## Remove a company owner +{{< summary-bar feature_name="Admin console early access" >}} + 1. Sign in to the [Admin Console](https://admin.docker.com). 2. Select your company on the **Choose profile** page. 3. Select **Company owners**. diff --git a/content/manuals/admin/company/users.md b/content/manuals/admin/company/users.md index 501ce153121e..475d7c531115 100644 --- a/content/manuals/admin/company/users.md +++ b/content/manuals/admin/company/users.md @@ -10,8 +10,8 @@ You can manage users at the company-level in the Docker Admin Console. {{% admin-users product="admin" layer="company" %}} -{{% include "admin-early-access.md" %}} - ## Manage members on a team +{{< summary-bar feature_name="Admin console early access" >}} + Use Docker Hub to add a member to a team or remove a member from a team. For more details, see [Manage members in Docker Hub](../organization/members.md#manage-members-on-a-team). diff --git a/content/manuals/admin/organization/activity-logs.md b/content/manuals/admin/organization/activity-logs.md index f75965170673..a3913480b596 100644 --- a/content/manuals/admin/organization/activity-logs.md +++ b/content/manuals/admin/organization/activity-logs.md @@ -22,6 +22,8 @@ Owners can also see the activity logs for their repository if the repository is ## Manage activity logs +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -30,8 +32,6 @@ Owners can also see the activity logs for their repository if the repository is {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-org-audit-log product="admin" %}} {{< /tab >}} diff --git a/content/manuals/admin/organization/general-settings.md b/content/manuals/admin/organization/general-settings.md index d9da00c11f7d..bd0762b6f71b 100644 --- a/content/manuals/admin/organization/general-settings.md +++ b/content/manuals/admin/organization/general-settings.md @@ -5,7 +5,7 @@ description: Learn how to manage settings for organizations using Docker Admin C keywords: organization, settings, Admin Console --- -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} This section describes how to manage organization settings in the Docker Admin Console. diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index 08a4b34cb469..9b52647145c7 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -30,7 +30,7 @@ Key benefits include: ## View Insights for organization users -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} To access Insights, you must contact your Customer Success Manager to have the feature enabled. Once the feature is enabled, access Insights using the following diff --git a/content/manuals/admin/organization/manage-a-team.md b/content/manuals/admin/organization/manage-a-team.md index 3e6131a4ea98..9794d6e9122e 100644 --- a/content/manuals/admin/organization/manage-a-team.md +++ b/content/manuals/admin/organization/manage-a-team.md @@ -34,6 +34,8 @@ The organization owner can also add additional organization owners to help them ## Create a team +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -46,8 +48,6 @@ The organization owner can also add additional organization owners to help them {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - 1. In Admin Console, select your organization. 2. In the **User management** section, select **Teams**. 3. Select **Create team**. @@ -117,6 +117,8 @@ To view a team's permissions across all repositories: ## Delete a team +{{< summary-bar feature_name="Admin console early access" >}} + 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 >}} @@ -133,8 +135,6 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - 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. diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index a8bc0216dfc9..4700562d97ad 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -19,7 +19,7 @@ Learn how to manage members for your organization in Docker Hub and the Docker A {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} {{% admin-users product="admin" %}} @@ -66,7 +66,7 @@ To resend an invitation from Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} To resend an invitation from the Admin Console: @@ -93,7 +93,7 @@ To remove a member's invitation from Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} To remove an invitation from the Admin Console: @@ -132,7 +132,7 @@ To add a member to a team with Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} To add a member to a team with the Admin Console: @@ -164,7 +164,7 @@ To remove a member from a specific team with Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} To remove a member from a specific team with the Admin Console: @@ -219,7 +219,7 @@ To export a CSV file of your members: {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} To export a CSV file of your members: diff --git a/content/manuals/admin/organization/onboard.md b/content/manuals/admin/organization/onboard.md index 9db4128de9cd..5128be290981 100644 --- a/content/manuals/admin/organization/onboard.md +++ b/content/manuals/admin/organization/onboard.md @@ -13,8 +13,6 @@ aliases: {{< summary-bar feature_name="Admin orgs" >}} -{{% include "admin-early-access.md" %}} - Learn how to onboard your organization using Docker Hub or the Docker Admin Console. Onboarding your organization lets administrators gain visibility into user activity and enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits. For more details, see [Docker subscriptions and features](../../subscription/details.md). diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index ca8cf35feca8..be1b24677409 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -17,6 +17,8 @@ This section describes how to create an organization. Before you begin: ## Create an organization +{{< summary-bar feature_name="Admin console early access" >}} + There are multiple ways to create an organization. You can either: - Create a new organization using the **Create Organization** option in Docker Hub - Convert an existing user account to an organization @@ -53,8 +55,6 @@ You've now created an organization. {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - To create an organization: 1. Sign in to [Docker Home](https://app.docker.com/). @@ -85,6 +85,8 @@ You've now created an organization. ## View an organization +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -138,8 +140,6 @@ configure your organization. {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - To view an organization in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com). diff --git a/content/manuals/security/for-admins/domain-audit.md b/content/manuals/security/for-admins/domain-audit.md index 54b2ae449524..c6920d84790c 100644 --- a/content/manuals/security/for-admins/domain-audit.md +++ b/content/manuals/security/for-admins/domain-audit.md @@ -44,6 +44,8 @@ Before you audit your domains, review the following required prerequisites: ## Audit your domains for uncaptured users +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -52,8 +54,6 @@ Before you audit your domains, review the following required prerequisites: {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-domain-audit product="admin" %}} {{< /tab >}} 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 56b516082c65..4d601ebc1d4a 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 @@ -23,6 +23,8 @@ You first need to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in ## Configure +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -31,8 +33,6 @@ You first need to [enforce sign-in](/manuals/security/for-admins/enforce-sign-in {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-image-access product="admin" %}} {{< /tab >}} 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 fed531150161..701a31aa8f22 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 @@ -38,6 +38,8 @@ feature always takes effect. ## Configure Registry Access Management permissions +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -46,8 +48,6 @@ feature always takes effect. {{< /tab >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-registry-access product="admin" %}} {{< /tab >}} diff --git a/content/manuals/security/for-admins/provisioning/scim.md b/content/manuals/security/for-admins/provisioning/scim.md index 59134a3e1e73..9135abe38c49 100644 --- a/content/manuals/security/for-admins/provisioning/scim.md +++ b/content/manuals/security/for-admins/provisioning/scim.md @@ -48,13 +48,13 @@ For additional details about supported attributes and SCIM, see [Docker Hub API ## Enable SCIM in Docker +{{< summary-bar feature_name="Admin console early access" >}} + You must [configure SSO](../single-sign-on/configure/_index.md) before you enable SCIM. Enforcing SSO isn't required to use SCIM. {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-scim product="admin" %}} {{< /tab >}} @@ -245,7 +245,7 @@ If SCIM is disabled, any user provisioned through SCIM will remain in the organi {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} {{% admin-scim-disable product="admin" %}} 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 bab8edaebe85..4e31789f701f 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -18,11 +18,11 @@ Get started creating a single sign-on (SSO) connection for your organization or ## Step one: Add your domain +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - 1. Sign in to the [Admin Console](https://admin.docker.com/). 2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under **Security and access**, select **Domain management**. @@ -50,7 +50,7 @@ Verifying your domain ensures Docker knows you own it. Domain verification is do {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} +{{< summary-bar feature_name="Admin console early access" >}} 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 **Domain management** page of the Admin Console 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 ad74094ce2a4..30abdc9d8fac 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -23,6 +23,8 @@ Make sure you have completed the following before you begin: ## Step one: Create an SSO connection in Docker +{{< summary-bar feature_name="Admin console early access" >}} + >[!NOTE] > > Before creating an SSO connection in Docker, you must verify at least one domain. @@ -30,8 +32,6 @@ Make sure you have completed the following before you begin: {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - 1. Sign in to the [Admin Console](https://admin.docker.com/). 2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 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 e7e2904d3255..1f01617caccc 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -12,21 +12,21 @@ aliases: ## Manage organizations +{{< summary-bar feature_name="Admin console early access" >}} + > [!NOTE] > > You must have a [company](/admin/company/) to manage more than one organization. -{{% include "admin-early-access.md" %}} - {{% admin-sso-management-orgs product="admin" %}} ## Manage domains +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-sso-management product="admin" %}} {{< /tab >}} @@ -39,11 +39,11 @@ aliases: ## Manage SSO connections +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Admin Console" >}} -{{% include "admin-early-access.md" %}} - {{% admin-sso-management-connections product="admin" %}} {{< /tab >}} diff --git a/data/summary.yaml b/data/summary.yaml index 89c8243ea274..e87bd8468d95 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -5,6 +5,8 @@ Admin Console: subscription: [Business] availability: Early access for: Administrators +Admin console early access: + availability: The Admin Console is in Early access Admin orgs: subscription: [Team, Business] for: Administrators diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index d0c774aac69e..428cf75379a1 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -40,19 +40,19 @@ {{ end }} {{ with $feature.availability }} + {{ $availabilityText := . }}
Availability: - {{ . }} - - {{ $icon := index $availabilityIcons . }} - {{ if $icon }} - {{ partial "icon" $icon }} - {{ else }} - {{ partial "icon" "default_icon" }} + + {{ $availabilityText }} + {{ range $key, $icon := $availabilityIcons }} + {{ if in $availabilityText $key }} + {{ partial "icon" $icon }} + {{ end }} {{ end }}
- {{ end }} +{{ end }} {{ with $feature.requires }}
From b25b0a79d34b697d4a35b0eb61be1a1fa0212728 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 31 Jan 2025 09:41:47 -0800 Subject: [PATCH 2/6] Remove include --- content/includes/admin-early-access.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 content/includes/admin-early-access.md diff --git a/content/includes/admin-early-access.md b/content/includes/admin-early-access.md deleted file mode 100644 index 4a11e6107dd8..000000000000 --- a/content/includes/admin-early-access.md +++ /dev/null @@ -1,8 +0,0 @@ ---- ---- - -{{% restricted title="Early Access" %}} -The Docker Admin Console is an [early access](/release-lifecycle#early-access-ea) product. - -It's available to all company owners and organization owners. You can still manage organizations in Docker Hub, but the Admin Console includes company-level management and enhanced features for organization management. -{{% /restricted %}} From b7f974c7f737ade098db85b2d4edccf8975b92e4 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 31 Jan 2025 09:58:40 -0800 Subject: [PATCH 3/6] Fixes --- content/manuals/admin/organization/members.md | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 4700562d97ad..26075a106cf4 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -11,6 +11,8 @@ Learn how to manage members for your organization in Docker Hub and the Docker A ## Invite members +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -19,8 +21,6 @@ Learn how to manage members for your organization in Docker Hub and the Docker A {{< /tab >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - {{% admin-users product="admin" %}} {{< /tab >}} @@ -52,6 +52,8 @@ After inviting members, you can resend or remove invitations as needed. ### Resend an invitation +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -66,8 +68,6 @@ To resend an invitation from Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - To resend an invitation from the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. @@ -80,6 +80,8 @@ To resend an invitation from the Admin Console: ### Remove an invitation +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -93,8 +95,6 @@ To remove a member's invitation from Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - To remove an invitation from the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. @@ -111,6 +111,8 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization ### Add a member to a team +{{< summary-bar feature_name="Admin console early access" >}} + {{< tabs >}} {{< tab name="Docker Hub" >}} @@ -132,8 +134,6 @@ To add a member to a team with Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - To add a member to a team with the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. @@ -149,6 +149,8 @@ To add a member to a team with the Admin Console: ### Remove a member from a team +{{< summary-bar feature_name="Admin console early access" >}} + 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 >}} @@ -164,8 +166,6 @@ To remove a member from a specific team with Docker Hub: {{< /tab >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - To remove a member from a specific team with the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. @@ -219,8 +219,6 @@ To export a CSV file of your members: {{< /tab >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - To export a CSV file of your members: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. From 53e8f6f35f6c92b6a2ef168af07c5868e7e8ce2f Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 31 Jan 2025 10:07:26 -0800 Subject: [PATCH 4/6] More fixes --- content/manuals/admin/deactivate-account.md | 2 ++ content/manuals/security/for-admins/provisioning/scim.md | 4 ++-- .../manuals/security/for-admins/single-sign-on/configure.md | 4 ++-- content/manuals/security/for-admins/single-sign-on/manage.md | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/content/manuals/admin/deactivate-account.md b/content/manuals/admin/deactivate-account.md index e23437a7b20b..16ab9bd7201e 100644 --- a/content/manuals/admin/deactivate-account.md +++ b/content/manuals/admin/deactivate-account.md @@ -31,6 +31,8 @@ Before deactivating an organization, complete the following: ## Deactivate +{{< summary-bar feature_name="Admin console early access" >}} + Once you have completed all the previous steps, you can deactivate your organization. > [!WARNING] diff --git a/content/manuals/security/for-admins/provisioning/scim.md b/content/manuals/security/for-admins/provisioning/scim.md index 9135abe38c49..148a27a53196 100644 --- a/content/manuals/security/for-admins/provisioning/scim.md +++ b/content/manuals/security/for-admins/provisioning/scim.md @@ -240,13 +240,13 @@ See the documentation for your IdP for additional details: ## Disable SCIM +{{< summary-bar feature_name="Admin console early access" >}} + If SCIM is disabled, any user provisioned through SCIM will remain in the organization. Future changes for your users will not sync from your IdP. User de-provisioning is only possible when manually removing the user from the organization. {{< tabs >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - {{% admin-scim-disable product="admin" %}} {{< /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 4e31789f701f..54d5a8246d94 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -45,13 +45,13 @@ Get started creating a single sign-on (SSO) connection for your organization or ## Step two: Verify your domain +{{< summary-bar feature_name="Admin console early access" >}} + Verifying your domain ensures Docker knows you own it. Domain verification is done by adding your Docker TXT Record Value to your domain host. The TXT Record Value proves ownership, which signals the Domain Name System (DNS) to add this record. It can take up to 72 hours for DNS to recognize the change. When the change is reflected in DNS, Docker will automatically check the record to confirm your ownership. {{< tabs >}} {{< tab name="Admin Console" >}} -{{< summary-bar feature_name="Admin console early access" >}} - 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 **Domain management** page of the Admin Console and select **Verify** next to your domain name. 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 1f01617caccc..215c983728d6 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -70,6 +70,8 @@ aliases: ### Add guest users when SSO is enabled +{{< summary-bar feature_name="Admin console early access" >}} + To add a guest that isn't verified through your IdP: 1. Sign in to the [Admin Console](https://app.docker.com/admin). @@ -79,6 +81,8 @@ To add a guest that isn't verified through your IdP: ### Remove users from the SSO company +{{< summary-bar feature_name="Admin console early access" >}} + To remove a user: 1. Sign in to [Admin Console](https://app.docker.com/admin). From 4851d766f27d1cd7a5bcec9b2496a26e141907bb Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 31 Jan 2025 10:45:21 -0800 Subject: [PATCH 5/6] Title case for Availability --- data/summary.yaml | 7 +++---- layouts/shortcodes/summary-bar.html | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/data/summary.yaml b/data/summary.yaml index e87bd8468d95..a339aa254014 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -3,10 +3,10 @@ Activity logs: for: Administrators Admin Console: subscription: [Business] - availability: Early access + availability: Early Access for: Administrators Admin console early access: - availability: The Admin Console is in Early access + availability: The Admin Console is in Early Access Admin orgs: subscription: [Team, Business] for: Administrators @@ -122,9 +122,8 @@ Docker Desktop CLI: requires: Docker Desktop [4.37](/manuals/desktop/release-notes.md#4370) and later Docker Desktop CLI update: requires: Docker Desktop 4.38 and later - requires: Docker GitHub Copilot: - availability: Early access + availability: Early Access Docker Scout exceptions: availability: Experimental requires: Docker Scout CLI [1.15.0](/manuals/scout/release-notes/cli.md#1150) and later diff --git a/layouts/shortcodes/summary-bar.html b/layouts/shortcodes/summary-bar.html index 428cf75379a1..930eee5c883b 100644 --- a/layouts/shortcodes/summary-bar.html +++ b/layouts/shortcodes/summary-bar.html @@ -14,7 +14,7 @@ {{ $availabilityIcons := dict "Experimental" "science" "Beta" "bolt" - "Early access" "rocket_launch" + "Early Access" "rocket_launch" "GA" "check_circle" "Retired" "package_2" }} From 6d0578607ec3e3338eca2e7d8adb4fd03ef7bf20 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Fri, 31 Jan 2025 11:14:37 -0800 Subject: [PATCH 6/6] Remove admin tag from heading that doesn't need it --- content/manuals/admin/company/users.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/manuals/admin/company/users.md b/content/manuals/admin/company/users.md index 475d7c531115..653bc71375de 100644 --- a/content/manuals/admin/company/users.md +++ b/content/manuals/admin/company/users.md @@ -12,6 +12,4 @@ You can manage users at the company-level in the Docker Admin Console. ## Manage members on a team -{{< summary-bar feature_name="Admin console early access" >}} - Use Docker Hub to add a member to a team or remove a member from a team. For more details, see [Manage members in Docker Hub](../organization/members.md#manage-members-on-a-team).