From 7b1e50d0cd72573220c9ff59cc91f7fc1e24ffbc Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:13:35 +0100 Subject: [PATCH 1/2] Compose: networking clarity (#22983) ## Description ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/compose/how-tos/networking.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/manuals/compose/how-tos/networking.md b/content/manuals/compose/how-tos/networking.md index bea3c4004d7a..7045237d0635 100644 --- a/content/manuals/compose/how-tos/networking.md +++ b/content/manuals/compose/how-tos/networking.md @@ -164,7 +164,9 @@ networks: driver: custom-driver-1 ``` -## Use a pre-existing network +## Use an existing network + +If you've manually created a bridge network outside of Compose using the `docker network create` command, you can connect your Compose services to it by marking the network as `external`. If you want your containers to join a pre-existing network, use the [`external` option](/reference/compose-file/networks.md#external) ```yaml From 683bd2268b7cfc308332c7007c74c106d2c013f7 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 2 Jul 2025 16:18:30 -0400 Subject: [PATCH 2/2] Merge pull request #22947 from sarahsanders-docker/sidenav-release cx: update docs for new sidenav --- .../accounts/deactivate-user-account.md | 18 +- content/manuals/accounts/manage-account.md | 4 +- content/manuals/admin/_index.md | 2 +- content/manuals/admin/company/_index.md | 2 +- content/manuals/admin/company/new-company.md | 12 +- .../manuals/admin/company/organizations.md | 25 ++- content/manuals/admin/company/owners.md | 20 +-- content/manuals/admin/faqs/company-faqs.md | 2 +- content/manuals/admin/faqs/general-faqs.md | 4 +- content/manuals/admin/organization/_index.md | 2 +- .../admin/organization/convert-account.md | 26 ++- .../admin/organization/deactivate-account.md | 21 ++- .../admin/organization/general-settings.md | 9 +- .../manuals/admin/organization/insights.md | 9 +- .../admin/organization/manage-a-team.md | 56 ++++--- .../admin/organization/manage-products.md | 2 +- content/manuals/admin/organization/members.md | 110 ++++++------ content/manuals/admin/organization/onboard.md | 2 +- content/manuals/admin/organization/orgs.md | 73 +++----- content/manuals/billing/cycle.md | 71 ++++---- content/manuals/billing/details.md | 94 +++++------ content/manuals/billing/history.md | 67 ++++---- content/manuals/billing/payment-method.md | 88 +++++----- .../msi-install-and-configure.md | 7 +- .../pkg-install-and-configure.md | 10 +- content/manuals/platform-release-notes.md | 4 +- content/manuals/security/_index.md | 4 +- .../security/for-admins/access-tokens.md | 48 ++---- .../security/for-admins/domain-audit.md | 61 ------- .../security/for-admins/domain-management.md | 60 +++---- .../compliance-reporting.md | 25 ++- .../configure-admin-console.md | 14 +- .../for-admins/provisioning/just-in-time.md | 8 +- .../for-admins/single-sign-on/configure.md | 33 ++-- .../for-admins/single-sign-on/connect.md | 157 +++++++++--------- .../for-admins/single-sign-on/manage.md | 18 +- .../security/for-developers/access-tokens.md | 37 ++--- .../troubleshoot/troubleshoot-provisioning.md | 4 +- .../security/troubleshoot/troubleshoot-sso.md | 30 ++-- content/manuals/subscription/change.md | 40 ++--- content/manuals/subscription/manage-seats.md | 44 ++--- content/manuals/subscription/scale.md | 15 +- data/summary.yaml | 3 - layouts/shortcodes/admin-domain-audit.md | 29 ---- layouts/shortcodes/admin-domains.html | 4 +- layouts/shortcodes/admin-image-access.html | 4 +- layouts/shortcodes/admin-org-audit-log.html | 5 +- layouts/shortcodes/admin-registry-access.html | 5 +- layouts/shortcodes/admin-scim-disable.html | 4 +- layouts/shortcodes/admin-scim.html | 4 +- layouts/shortcodes/admin-sso-config.md | 4 +- layouts/shortcodes/admin-sso-connect.md | 4 +- .../admin-sso-management-connections.md | 4 +- .../shortcodes/admin-sso-management-orgs.md | 5 +- layouts/shortcodes/admin-sso-management.md | 4 +- layouts/shortcodes/admin-users.html | 12 +- 56 files changed, 658 insertions(+), 771 deletions(-) delete mode 100644 content/manuals/security/for-admins/domain-audit.md delete mode 100644 layouts/shortcodes/admin-domain-audit.md diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index 21788c607b31..604b0f253bf5 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -17,10 +17,10 @@ Before deactivating your Docker account, ensure you meet the following requireme - For owners, you must leave your organization or company before deactivating your Docker account. To do this: - 1. Sign in to the [Docker Admin Console](https://app.docker.com/admin). - 2. Select the organization you need to leave from the **Choose profile** page. - 3. Find your username in the **Members** tab. - 4. Select the **More options** menu and then select **Leave organization**. + 1. Sign in to [Docker Home](https://app.docker.com/admin) and choose + your organization. + 1. Select **Members** and find your username. + 1. Select the **Actions** menu and then select **Leave organization**. - If you are the sole owner of an organization, you must assign the owner role to another member of the organization and then remove yourself from the organization, or deactivate the organization. Similarly, if you are the sole owner of a company, either add someone else as a company owner and then remove yourself, or deactivate the company. @@ -39,8 +39,8 @@ Once you have completed all the previous steps, you can deactivate your account. > This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it. 1. Sign in to [Docker Home](https://app.docker.com/login). -2. Select your avatar to open the drop-down menu. -3. Select **Account settings**. -4. Select **Deactivate**. -5. Select **Deactivate account**. -6. To confirm, select **Deactivate account**. +1. Select your avatar to open the drop-down menu. +1. Select **Account settings**. +1. Select **Deactivate**. +1. Select **Deactivate account**. +1. To confirm, select **Deactivate account**. diff --git a/content/manuals/accounts/manage-account.md b/content/manuals/accounts/manage-account.md index 02684e50f77b..c8d55d011cf7 100644 --- a/content/manuals/accounts/manage-account.md +++ b/content/manuals/accounts/manage-account.md @@ -18,9 +18,7 @@ account security. ## Update general settings 1. Sign in to your [Docker account](https://app.docker.com/login). -2. In Docker Home, select your avatar in the top-right corner to open the -drop-down. -3. Select **Account settings**. +2. Select your avatar in the top-right corner and select **Account settings**. From the Account settings page, you can take any of the following actions. diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index cf5274bfd919..2e1c733521ab 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -37,7 +37,7 @@ aliases: Administrators can manage companies and organizations using the Docker Admin Console. -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://app.docker.com/admin) 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/company/_index.md b/content/manuals/admin/company/_index.md index 72d5b33439b0..6a21abaf011d 100644 --- a/content/manuals/admin/company/_index.md +++ b/content/manuals/admin/company/_index.md @@ -33,7 +33,7 @@ grid: - title: Domain management description: Add and verify your domains. icon: domain_verification - link: /admin/company/settings/domains/ + link: /security/for-admins/domain-management/ - title: FAQs description: Explore common company FAQs. link: /faq/admin/company-faqs/ diff --git a/content/manuals/admin/company/new-company.md b/content/manuals/admin/company/new-company.md index af6cb560a38d..7ef1e3eb4332 100644 --- a/content/manuals/admin/company/new-company.md +++ b/content/manuals/admin/company/new-company.md @@ -16,17 +16,17 @@ You can create a new company in the Docker Admin Console. Before you begin, you To create a new company: -1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select your organization you want to add to your company from the **Choose profile** page. -3. Under **Organization settings**, select **Company management**. -4. Select **Create a company**. -5. Enter a unique name for your company, then select **Continue**. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Admin Console**, then **Company management**. +1. Select **Create a company**. +1. Enter a unique name for your company, then select **Continue**. > [!TIP] > > The name for your company can't be the same as an existing user, organization, or company namespace. -6. Review the company migration details and then select **Create company**. +1. Review the company migration details and then select **Create company**. For more information on how you can add organizations to your company, see [Add organizations to a company](./organizations.md#add-organizations-to-a-company). diff --git a/content/manuals/admin/company/organizations.md b/content/manuals/admin/company/organizations.md index aa1907682bd7..74fc09649117 100644 --- a/content/manuals/admin/company/organizations.md +++ b/content/manuals/admin/company/organizations.md @@ -10,11 +10,11 @@ You can manage the organizations in a company in the Docker Admin Console. ## View all organizations -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**. +1. Sign in to the [Docker Home](https://app.docker.com) and choose +your company. +1. Select **Admin Console**, then **Organizations**. -The organization overview page displays all organizations under your company. +The **Organizations** view displays all organizations under your company. ## Add seats to an organization @@ -30,18 +30,17 @@ You must be a company owner to add an organization to a company. You must also b > > Once you add an organization to a company, you can't remove it from the company. -1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the **Choose profile** page. -3. Select **Organizations**, then **Overview**. -4. Select **Add organization**. -5. Choose the organization you want to add from the drop-down menu. -6. Select **Add organization** to confirm. +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Admin Console**, then **Organizations**. +1. Select **Add organization**. +1. Choose the organization you want to add from the drop-down menu. +1. Select **Add organization** to confirm. ## Manage an organization -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. +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Admin Console**, then **Organizations**. +1. Select the organization you want to manage. For more details about managing an organization, see [Organization administration](../organization/_index.md). diff --git a/content/manuals/admin/company/owners.md b/content/manuals/admin/company/owners.md index 6ce17576fb19..f383acf971cf 100644 --- a/content/manuals/admin/company/owners.md +++ b/content/manuals/admin/company/owners.md @@ -23,17 +23,15 @@ owners don't need to be member of an organization. ## Add a company owner -1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the **Choose profile** page. -3. Select **Company owners**. -4. Select **Add owner**. -5. Specify the user's Docker ID to search for the user. -6. After you find the user, select **Add company owner**. +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Admin Console**, then **Company owners**. +1. Select **Add owner**. +1. Specify the user's Docker ID to search for the user. +1. After you find the user, select **Add company owner**. ## Remove a company owner -1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the **Choose profile** page. -3. Select **Company owners**. -4. Select the **Action** icon in the row of the company owner that your want to remove. -5. Select **Remove as company owner**. +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Admin Console**, then **Company owners**. +1. Locate the company owner you want to remove and select the **Actions** menu. +1. Select **Remove as company owner**. diff --git a/content/manuals/admin/faqs/company-faqs.md b/content/manuals/admin/faqs/company-faqs.md index 33e0fb425e2f..674b9934fd8a 100644 --- a/content/manuals/admin/faqs/company-faqs.md +++ b/content/manuals/admin/faqs/company-faqs.md @@ -62,7 +62,7 @@ You can manage domain verification, SSO, and SCIM at the company level. The foll - User management - Billing -To view and manage users across all the organizations under your company, you can [manage users at the company level](../../admin/company/users.md) when you use the [Admin Console](https://admin.docker.com). +To view and manage users across all the organizations under your company, you can [manage users at the company level](../../admin/company/users.md) when you use the [Admin Console](https://app.docker.com/admin). Domain audit isn't supported for companies or organizations within a company. diff --git a/content/manuals/admin/faqs/general-faqs.md b/content/manuals/admin/faqs/general-faqs.md index d225027c44bd..f7ab1affb7c7 100644 --- a/content/manuals/admin/faqs/general-faqs.md +++ b/content/manuals/admin/faqs/general-faqs.md @@ -85,7 +85,9 @@ If the user is a member of your organization, you can remove the user from your ### How do I manage settings for a user account? -You can manage your account settings anytime when you sign in to your [Docker account](https://app.docker.com/login). In Docker Home, select your avatar in the top-right navigation, then select **My Account**. You can also access this menu from any Docker web applications when you're signed in to your account. See [Manage your Docker account](/accounts/manage-account). If your account is associated with an organization that uses SSO, you may have limited access to the settings that you can control. +You can manage your account settings anytime when you sign in to your [Docker account](https://app.docker.com/login). Select your avatar in the top-right navigation, then select **My Account**. + +You can also access this menu from any Docker web applications when you're signed in to your account. See [Manage your Docker account](/accounts/manage-account). If your account is associated with an organization that uses SSO, you may have limited access to the settings that you can control. ### How do I add an avatar to my Docker account? diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md index 0cbef4d6d0bb..c1a05fe7e556 100644 --- a/content/manuals/admin/organization/_index.md +++ b/content/manuals/admin/organization/_index.md @@ -37,7 +37,7 @@ grid: icon: key - title: Domain management description: Add, verify, and audit your domains. - link: /admin/organization/security-settings/domains/ + link: /security/for-admins/domain-management/ icon: domain_verification - title: FAQs description: Explore common organization FAQs. diff --git a/content/manuals/admin/organization/convert-account.md b/content/manuals/admin/organization/convert-account.md index ef77881f9341..337ff846617d 100644 --- a/content/manuals/admin/organization/convert-account.md +++ b/content/manuals/admin/organization/convert-account.md @@ -25,8 +25,8 @@ Before you convert a user account to an organization, ensure that you meet the f To do this: 1. Navigate to **My Hub** and then select the organization you need to leave. - 2. Find your username in the **Members** tab. - 3. Select the **More options** menu and then select **Leave organization**. + 1. Find your username in the **Members** tab. + 1. Select the **More options** menu and then select **Leave organization**. If the user account is the sole owner of any organization or company, assign another user the owner role and then remove yourself from the organization or company. @@ -58,18 +58,16 @@ associated with an organization, not a single user account. ## Convert an account into an organization -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. +Before you convert an account into an organization ensure you have: -2. Sign in to [Docker Home](https://app.docker.com/login). +- Removed your user account from any company or teams or organizations +- Created a new Docker ID before you convert an account -3. In Docker Home, select your avatar in the top-right corner to open the drop-down. +See the [Prerequisites](#prerequisites) section for details. -4. Select **Account settings**. - -5. Select **Convert**. - -6. Review the warning displayed about converting a user account. This action cannot be undone and has considerable implications for your assets and the account. - -7. Enter a **Username of new owner** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert. - -8. Select **Confirm**. The new owner receives a notification email. Use that owner account to sign in and manage the new organization. +1. Sign in to [Docker Home](https://app.docker.com/login). +1. Select your avatar in the top-right corner and select **Account settings**. +1. In the **Settings** section, select **Convert**. +1. Review the warning displayed about converting a user account. This action cannot be undone and has considerable implications for your assets and the account. +1. Enter a **Username of new owner** to set an organization owner. This is the user account that will manage the organization, and the only way to access the organization settings after conversion. You cannot use the same Docker ID as the account you are trying to convert. +1. Select **Confirm**. The new owner receives a notification email. Use that owner account to sign in and manage the new organization. diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md index b0ad4ab3525e..aee1e720bc85 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -21,13 +21,9 @@ Before deactivating an organization, complete the following: - Download any images and tags you want to keep: `docker pull -a :`. - - If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md). - - Remove all other members within the organization. - - Unlink your [Github and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account). - - For Business organizations, [remove your SSO connection](../../security/for-admins/single-sign-on/manage/#remove-an-organization). ## Deactivate @@ -41,19 +37,22 @@ Once you have completed all the previous steps, you can deactivate your organiza {{< tabs >}} {{< tab name="Admin Console" >}} -1. In Admin Console, choose the organization you want to deactivate. -2. Under **Organization settings**, select **Deactivate**. -3. Enter the organization name to confirm deactivation. -4. Select **Deactivate organization**. +1. Sign in to [Docker Home](https://app.docker.com) and select the organization +you want to deactivate. +1. Select **Admin Console**, then **Deactivate**. If this button is greyed out, +you must complete the [Prerequisites](#prerequisites). +1. Enter the organization name to confirm deactivation. +1. Select **Deactivate organization**. {{< /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**. +1. Sign in to [Docker Hub](https://hub.docker.com). +1. Choose the organization you want to deactivate. +1. In **Settings**, select **Deactivate org**. +1. Select **Deactivate organization**. {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/admin/organization/general-settings.md b/content/manuals/admin/organization/general-settings.md index 65d4188dbcc2..c0f5f07ffb60 100644 --- a/content/manuals/admin/organization/general-settings.md +++ b/content/manuals/admin/organization/general-settings.md @@ -21,11 +21,10 @@ This information includes: To edit this information: -1. Sign in to the [Admin Console](https://admin.docker.com). -2. Select your company on the **Choose profile** page. -3. Under **Organization settings**, select **Organization information**. -4. Specify the organization information and select **Save**. +1. Sign in to the [Admin Console](https://app.docker.com/admin). +1. Select your company on the **Choose profile** page. +1. Specify the organization information and select **Save**. ## Next steps -In the **Organization settings** menu, you can also [configure SSO](../../security/for-admins/single-sign-on/configure/) and [set up SCIM](../../security/for-admins/provisioning/scim.md). If your organization isn't part of a company, from here you can also [audit your domains](../../security/for-admins/domain-audit.md) or [create a company](new-company.md). +In the **Organization settings** menu, you can also [configure SSO](../../security/for-admins/single-sign-on/configure/) and [set up SCIM](../../security/for-admins/provisioning/scim.md). If your organization isn't part of a company, from here you can also [manage your domains](/manuals/security/for-admins/domain-management.md) or [create a company](new-company.md). diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index 05ed1d1a54e5..6de7e5679090 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -34,12 +34,9 @@ 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 steps: -1. Open [Docker Home](https://app.docker.com/) and select your organization -on the **Choose profile** page. -1. Select **Admin Console** in the left-hand navigation menu. -1. Select **Desktop insights**. -1. Choose a timeframe for your insights data: **1 Week**, **1 Month**, or -**3 Months**. +1. Sign in to [Docker Home](https://app.docker.com/) and choose +your organization. +1. Select **Insights**. then select the period of time for the data. > [!NOTE] > diff --git a/content/manuals/admin/organization/manage-a-team.md b/content/manuals/admin/organization/manage-a-team.md index 1491f77edea7..43dd00e8c6f8 100644 --- a/content/manuals/admin/organization/manage-a-team.md +++ b/content/manuals/admin/organization/manage-a-team.md @@ -37,11 +37,12 @@ The organization owner can also add additional organization owners to help them {{< tabs >}} {{< tab name="Admin Console" >}} -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). +1. Sign in to [Docker Home](https://app.docker.com) and select your +organization. +1. Select **Teams**. +1. Select **Create team**. +1. Fill out your team's information and select **Create**. +1. [Add members to your team](members.md#add-a-member-to-a-team). {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -49,10 +50,10 @@ The organization owner can also add additional organization owners to help them {{% 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). +1. Select **My Hub** and choose your organization. +1. Select the **Teams** and then select **Create Team**. +1. Fill out your team's information and select **Create**. +1. [Add members to your team](members.md#add-a-member-to-a-team). {{< /tab >}} {{< /tabs >}} @@ -67,11 +68,11 @@ access. Note that organization owners have full administrative access to all rep To give a team access to a repository: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select the **Teams** and select the team that you'd like to configure repository access to. -4. Select the **Permissions** tab and select a repository from the +1. Select **My Hub** and choose your organization. +1. Select the **Teams** and select the team that you'd like to configure repository access to. +1. Select the **Permissions** tab and select a repository from the **Repository** drop-down. -5. Choose a permission from the **Permissions** drop-down list and select +1. Choose a permission from the **Permissions** drop-down list and select **Add**. Organization owners can also assign members the editor role to grant partial administrative access. See [Roles and permissions](../../security/for-admins/roles-and-permissions.md) for more about the editor role. @@ -111,9 +112,9 @@ you automatically have "Read-only" permissions: To view a team's permissions across all repositories: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select **Teams** and choose your team name. -4. Select the **Permissions** tab, where you can view the repositories this team can access. +1. Select **My Hub** and choose your organization. +1. Select **Teams** and choose your team name. +1. Select the **Permissions** tab, where you can view the repositories this team can access. ## Delete a team @@ -122,11 +123,12 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r {{< 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**. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Teams**. +1. Select the **Actions** icon next to the name of the team you want to delete. +1. Select **Delete team**. +1. Review the confirmation message, then select **Delete**. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -134,12 +136,12 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r {{% 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**. -4. Select the name of the team that you want to delete. -5. Select **Settings**. -6. Select **Delete Team**. -7. Review the confirmation message, then select **Delete**. +1. Select **My Hub** and choose your organization. +1. Select **Teams**. +1. Select the name of the team that you want to delete. +1. Select **Settings**. +1. Select **Delete Team**. +1. Review the confirmation message, then select **Delete**. {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/admin/organization/manage-products.md b/content/manuals/admin/organization/manage-products.md index b20004ed23f3..b2dc56ec662c 100644 --- a/content/manuals/admin/organization/manage-products.md +++ b/content/manuals/admin/organization/manage-products.md @@ -102,7 +102,7 @@ View usage for the products on the following pages: page](https://app.testcontainers.cloud/dashboard/billing) in the Testcontainers Cloud Dashboard. -- Docker Desktop: View the **Insights** page in the [Docker Admin Console](https://app.docker.com/admin). For more details, see +- Docker Desktop: View the **Insights** page in [Docker Home](https://app.docker.com/). For more details, see [Insights](./insights.md). If your usage exceeds your subscription amount, you can [scale your diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 0cfee31d0e77..505f088d6188 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -34,7 +34,7 @@ To accept an invitation: 1. Navigate to your email inbox and open the Docker email with an invitation to join the Docker organization. -2. To open the link to Docker Hub, select the **click here** link. +1. To open the link to Docker Hub, select the **click here** link. > [!WARNING] > @@ -43,14 +43,14 @@ join the Docker organization. > address the link was sent to and accept the invitation from the > **Notifications** panel. -3. The Docker create an account page will open. If you already have an account, select **Already have an account? Sign in**. +1. The Docker create an account page will open. If you already have an account, select **Already have an account? Sign in**. If you do not have an account yet, create an account using the same email address you received the invitation through. -4. Optional. If you do not have an account and created one, you must navigate +1. Optional. If you do not have an account and created one, you must navigate back to your email inbox and verify your email address using the Docker verification email. -5. Once you are signed in to Docker Hub, select **My Hub** from the top-level navigation menu. -6. Select **Accept** on your invitation. +1. Once you are signed in to Docker Hub, select **My Hub** from the top-level navigation menu. +1. Select **Accept** on your invitation. After accepting an invitation, you are now a member of the organization. @@ -67,18 +67,20 @@ You can send individual invitations, or bulk invitations from the Admin Console. To resend an individual invitation: -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**. -4. Select **Invite** to confirm. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Members**. +1. Select the **action menu** next to the invitee and select **Resend**. +1. Select **Invite** to confirm. To bulk resend invitations: -1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **Members**. -3. Use the **checkboxes** next to **Usernames** to bulk select users. -4. Select **Resend invites**. -5. Select **Resend** to confirm. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Members**. +1. Use the **checkboxes** next to **Usernames** to bulk select users. +1. Select **Resend invites**. +1. Select **Resend** to confirm. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -88,10 +90,10 @@ To bulk resend invitations: To resend an invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **My Hub**, your organization, and then **Members**. -3. In the table, locate the invitee, select the **Actions** icon, and then select +1. Select **My Hub**, your organization, and then **Members**. +1. In the table, locate the invitee, select the **Actions** icon, and then select **Resend invitation**. -4. Select **Invite** to confirm. +1. Select **Invite** to confirm. 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. @@ -106,10 +108,11 @@ see the [Resend an invite](https://docs.docker.com/reference/api/hub/latest/#tag 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. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Members**. +1. Select the **action menu** next to the invitee and select **Remove invitee**. +1. Select **Remove** to confirm. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -119,9 +122,9 @@ To remove an invitation from the Admin Console: To remove a member's invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **My Hub**, your organization, and then **Members**. -3. In the table, select the **Action** icon, and then select **Remove member** or **Remove invitee**. -4. Follow the on-screen instructions to remove the member or invitee. +1. Select **My Hub**, your organization, and then **Members**. +1. In the table, select the **Action** icon, and then select **Remove member** or **Remove invitee**. +1. Follow the on-screen instructions to remove the member or invitee. 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. @@ -140,9 +143,11 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization 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. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Teams**. +1. Select the team name. +1. Select **Add member**. You can add the member by searching for their email address or username. > [!NOTE] > @@ -156,13 +161,13 @@ To add a member to a team with the Admin Console: To add a member to a team with Docker Hub: 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 **Add to team**. +1. Select **My Hub**, your organization, and then **Members**. +1. Select the **Action** icon, and then select **Add to team**. > [!NOTE] > > You can also navigate to **My Hub** > **Your Organization** > **Teams** > **Your Team Name** and select **Add Member**. Select a member from the drop-down list to add them to the team or search by Docker ID or email. -4. Select the team and then select **Add**. +1. Select the team and then select **Add**. > [!NOTE] > @@ -184,10 +189,12 @@ Organization owners can remove a member from a team in Docker Hub or Admin Conso 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. -2. Select the team name. -3. Select the **X** next to the user's name to remove them from the team. -4. When prompted, select **Remove** to confirm. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Teams**. +1. Select the team name. +1. Select the **X** next to the user's name to remove them from the team. +1. When prompted, select **Remove** to confirm. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -197,9 +204,9 @@ To remove a member from a specific team with the Admin Console: 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. +1. Select **My Hub**, your organization, **Teams**, and then the team. +1. Select the **X** next to the user’s name to remove them from the team. +1. When prompted, select **Remove** to confirm. {{< /tab >}} {{< /tabs >}} @@ -215,10 +222,11 @@ the company owner can also manage that organization's roles. If you have SSO ena 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**. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Members**. +1. Find the username of the member whose role you want to edit. Select the +**Actions** menu, then **Edit role**. > [!NOTE] > @@ -233,10 +241,10 @@ To update a member role in the Admin Console: 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**. -3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon. -4. Select **Edit role**. -5. Select their organization, select the role you want to assign, and then select **Save**. +1. Select **My Hub**, your organization, and then **Members**. +1. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon. +1. Select **Edit role**. +1. Select their organization, select the role you want to assign, and then select **Save**. > [!NOTE] > @@ -251,6 +259,7 @@ To update a member role in Docker Hub: {{< summary-bar feature_name="Admin orgs" >}} Owners can export a CSV file containing all members. The CSV file for a company contains the following fields: + - Name: The user's name - Username: The user's Docker ID - Email: The user's email address @@ -263,9 +272,10 @@ Owners can export a CSV file containing all members. The CSV file for a company 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 Home](https://app.docker.com/) and select your +organization. +1. Select **Members**. +1. Select the **download** icon to export a CSV file of all members. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -275,8 +285,8 @@ To export a CSV file of your members: 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. Select **My Hub**, your organization, and then **Members**. +1. 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/onboard.md b/content/manuals/admin/organization/onboard.md index 6fa0cf1936d1..480252e5f81b 100644 --- a/content/manuals/admin/organization/onboard.md +++ b/content/manuals/admin/organization/onboard.md @@ -127,6 +127,6 @@ security posture: - [Manage Docker products](./manage-products.md) to configure access and view usage. - Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development. -- [Audit your domains](/docker-hub/domain-audit/) to ensure that all Docker users in your domain are part of your organization. +- [Manage your domains](/manuals/security/for-admins/domain-management.md) to ensure that all Docker users in your domain are part of your organization. Your Docker subscription provides many more additional features. To learn more, see [Docker subscriptions and features](/subscription/details/). \ No newline at end of file diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 712b8b76fb84..9115918628f9 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -30,12 +30,13 @@ detailed instructions on converting an existing user account to an organization, 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 subscription 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 subscription. -5. Select **Continue to profile**. -6. Enter an **Organization namespace**. This is the official, unique name for +1. Sign in to [Docker Home](https://app.docker.com/) and navigate to the bottom +of the organization list. +1. Select **Create new organization**. +1. Choose a subscription 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 subscription. +1. Select **Continue to profile**. +1. Select **Create an organization** to create a new one. +1. 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. @@ -43,13 +44,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 +1. 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**. +1. Select **Continue to billing** to continue. +1. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. +1. Provide your payment details and select **Purchase**. You've now created an organization. @@ -59,10 +60,10 @@ You've now created an organization. {{% include "hub-org-management.md" %}} 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 subscription 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 subscription. -4. Select **Continue to profile**. -5. Enter an **Organization namespace**. This is the official, unique name for +1. Select **My Hub**, select the account drop-down, and then **Create Organization** to create a new organization. +1. Choose a subscription 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 subscription. +1. Select **Continue to profile**. +1. 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. @@ -70,13 +71,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). -6. Enter your **Company name**. This is the full name of your company. Docker +1. 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**. +1. Select **Continue to billing** to continue. +1. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. +1. Provide your card details and select **Purchase**. You've now created an organization. @@ -90,28 +91,13 @@ You've now created an organization. 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. +1. Sign in to [Docker Home](https://app.docker.com) and select your +organization. +1. From the left-hand navigation menu, select **Admin Console**. -The Admin Console displays various options that let you to +The Admin Console contains many 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 organization information or [deactivate your organization](/manuals/admin/organization/deactivate-account.md). - {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -133,7 +119,7 @@ To view an organization: > then you are neither a member or an owner of it. An organization > administrator needs to add you as a member of the organization. -2. Select **My Hub** in the top navigation bar, then choose your +1. Select **My Hub** in the top navigation bar, then choose your organization from the list. The organization landing page displays various options that let you to @@ -141,25 +127,20 @@ 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. - - **Repositories**: Displays a list of repositories associated with the organization. See [Repositories](../../docker-hub/repos/_index.md) for detailed information about working with repositories. - - **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. - - **Settings**: Displays information about your organization, and you to view and change your repository privacy settings, configure org permissions such as [Image Access Management](/manuals/security/for-admins/hardened-desktop/image-access-management.md), configure notification settings, and [deactivate](/manuals/admin/organization/deactivate-account.md#deactivate-an-organization) You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the organization's **Settings** page. - - **Billing**: Displays information about your existing [Docker subscription](../../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). @@ -178,9 +159,9 @@ configure your organization. If you have multiple organizations that you want to merge into one, complete the following: 1. Based on the number of seats from the secondary organization, [purchase additional seats](../../subscription/manage-seats.md) for the primary organization account that you want to keep. -2. Manually add users to the primary organization and remove existing users from the secondary organization. -3. Manually move over your data, including all repositories. -4. Once you're done moving all of your users and data, [downgrade](../../subscription/change.md) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle. +1. Manually add users to the primary organization and remove existing users from the secondary organization. +1. Manually move over your data, including all repositories. +1. Once you're done moving all of your users and data, [downgrade](../../subscription/change.md) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle. > [!TIP] > diff --git a/content/manuals/billing/cycle.md b/content/manuals/billing/cycle.md index b72ef3ead8d6..439a9c90d159 100644 --- a/content/manuals/billing/cycle.md +++ b/content/manuals/billing/cycle.md @@ -5,13 +5,15 @@ description: Learn to change your billing cycle for your Docker subscription keywords: billing, cycle, payments, subscription --- -You can pay for a subscription on a monthly or yearly billing cycle. You select your preferred billing cycle when you buy your subscription. +You can pay for a subscription on a monthly or yearly billing cycle. You select +your preferred billing cycle when you buy your subscription. > [!NOTE] > > Business subscriptions are available only on yearly billing cycle. -If you have a monthly billing cycle, you can choose to switch to an annual billing cycle. +If you have a monthly billing cycle, you can choose to switch to an annual +billing cycle. > [!NOTE] > @@ -19,9 +21,17 @@ If you have a monthly billing cycle, you can choose to switch to an annual billi When you change the billing cycle's duration: -- The next billing date reflects the new cycle. To find your next billing date, see [View renewal date](history.md#view-renewal-date). -- The subscription's start date resets. For example, if the start date of the monthly subscription is March 1st and the end date is April 1st, then after switching the billing duration to March 15th, 2024 the new start date is March 15th, 2024, and the new end date is March 15th, 2025. -- Any unused monthly subscription is prorated and applied as credit towards the new annual period. For example, if you switch from a $10 monthly subscription to a $100 annual subscription, deducting the unused monthly value (in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost after March 15, 2025 is $100. +- The next billing date reflects the new cycle. To find your next billing date, +see [View renewal date](history.md#view-renewal-date). +- The subscription's start date resets. For example, if the start date of the +monthly subscription is March 1st and the end date is April 1st, then after +switching the billing duration to March 15th, 2024 the new start date is March +15th, 2024, and the new end date is March 15th, 2025. +- Any unused monthly subscription is prorated and applied as credit towards the +new annual period. For example, if you switch from a $10 monthly subscription to +a $100 annual subscription, deducting the unused monthly value +(in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost +after March 15, 2025 is $100. {{% include "tax-compliance.md" %}} @@ -32,19 +42,22 @@ When you change the billing cycle's duration: To change your billing cycle: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. On the plans and usage page, select **Switch to annual billing**. -4. Verify your billing information. -5. Select **Continue to payment**. -6. Verify payment information and select **Upgrade subscription**. +1. Sign in to [Docker Home](https://app.docker.com/) and select +your organization. +1. Select **Billing**. +1. On the plans and usage page, select **Switch to annual billing**. +1. Verify your billing information. +1. Select **Continue to payment**. +1. Verify payment information and select **Upgrade subscription**. > [!NOTE] > > If you choose to pay using a US bank account, you must verify the account. For -> more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account). +> more information, see +[Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account). -The billing plans and usage page will now reflect your new annual subscription details. +The billing plans and usage page will now reflect your new annual subscription +details. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -52,10 +65,10 @@ The billing plans and usage page will now reflect your new annual subscription d To change your billing cycle: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. In the bottom-right of the **Plan** tab, select **Switch to annual billing**. -5. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm. +1. Select your organization, then select **Billing**. +1. In the bottom-right of the **Plan** tab, select **Switch to annual billing**. +1. Review the information displayed on the **Change to an Annual subscription** +page and select **Accept Terms and Purchase** to confirm. {{< /tab >}} {{< /tabs >}} @@ -71,17 +84,19 @@ To change your billing cycle: To change your organization's billing cycle: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. On the plans and usage page, select **Switch to annual billing**. -4. Verify your billing information. -5. Select **Continue to payment**. -6. Verify payment information and select **Upgrade subscription**. +1. Sign in to [Docker Home](https://app.docker.com/) and select +your organization. +1. Select **Billing**. +1. On the plans and usage page, select **Switch to annual billing**. +1. Verify your billing information. +1. Select **Continue to payment**. +1. Verify payment information and select **Upgrade subscription**. > [!NOTE] > > If you choose to pay using a US bank account, you must verify the account. For -> more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account). +> more information, see +> [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account). {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -89,10 +104,10 @@ To change your organization's billing cycle: To change your organization's billing cycle: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** from the top-level navigation. -3. Select the organization that you want to change the payment method for, and then select **Billing**. -4. Select **Switch to annual billing**. -5. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm. +1. Select your organization, then select **Billing**. +1. Select **Switch to annual billing**. +1. Review the information displayed on the **Change to an Annual subscription** +page and select **Accept Terms and Purchase** to confirm. {{< /tab >}} {{< /tabs >}} \ No newline at end of file diff --git a/content/manuals/billing/details.md b/content/manuals/billing/details.md index a26b1d423254..f88b1a8545c6 100644 --- a/content/manuals/billing/details.md +++ b/content/manuals/billing/details.md @@ -20,19 +20,20 @@ The billing information provided appears on all your billing invoices. The email To update your billing information: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Billing information** from the left-hand navigation. -4. On your billing information card, select **Change**. -5. Update your billing contact and billing address information. -6. Optional. To add or update a VAT ID, select the **I'm purchasing as a business** checkbox and enter your Tax ID. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Billing information** from the left-hand navigation. +1. On your billing information card, select **Change**. +1. Update your billing contact and billing address information. +1. Optional. To add or update a VAT ID, select the **I'm purchasing as a business** checkbox and enter your Tax ID. > [!IMPORTANT] > > Your VAT number must include your country prefix. For example, if you are entering a VAT number for Germany, you would enter `DE123456789`. -7. Select **Update**. +1. Select **Update**. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -40,17 +41,16 @@ To update your billing information: To update your billing information: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu, select **Billing**. -4. Select **Billing Address** and enter your updated billing information. -5. Optional. To add or update a VAT ID, enter your **Tax ID/VAT**. +1. Select your organization, then select **Billing**. +1. Select **Billing Address** and enter your updated billing information. +1. Optional. To add or update a VAT ID, enter your **Tax ID/VAT**. > [!IMPORTANT] > > Your VAT number must include your country prefix. For example, if you are entering a VAT number for Germany, you would enter `DE123456789`. -6. Select **Submit**. +1. Select **Submit**. {{< /tab >}} {{< /tabs >}} @@ -66,19 +66,20 @@ To update your billing information: To update your billing information: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Billing information** from the left-hand navigation. -4. On your billing information card, select **Change**. -5. Update your billing contact and billing address information. -6. Optional. To add or update a VAT ID, select the **I'm purchasing as a business** checkbox and enter your Tax ID. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Billing information** from the left-hand navigation. +1. On your billing information card, select **Change**. +1. Update your billing contact and billing address information. +1. Optional. To add or update a VAT ID, select the **I'm purchasing as a business** checkbox and enter your Tax ID. > [!IMPORTANT] > > Your VAT number must include your country prefix. For example, if you are entering a VAT number for Germany, you would enter `DE123456789`. -7. Select **Update**. +1. Select **Update**. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -86,18 +87,16 @@ To update your billing information: To update your billing information: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select the organization that you want to change the payment method for. -5. Select **Billing Address**. -6. Optional. To add or update a VAT ID, enter your **Tax ID/VAT**. +1. Select your organization, then select **Billing**. +1. Select **Billing Address**. +1. Optional. To add or update a VAT ID, enter your **Tax ID/VAT**. > [!IMPORTANT] > > Your VAT number must include your country prefix. For example, if you are entering a VAT number for Germany, you would enter `DE123456789`. -7. Select **Submit**. +1. Select **Submit**. {{< /tab >}} {{< /tabs >}} @@ -111,7 +110,8 @@ Docker sends the following billing-related emails: - Notifications of credit or debit card payment failures. - Notifications of credit or debit card expiration. - Confirmation of a cancelled subscription -- Reminders of subscription renewals for annual subscribers. This is sent 14 days before the renewal date. +- Reminders of subscription renewals for annual subscribers. This is sent 14 +days before the renewal date. You can update the email address that receives billing invoices at any time. @@ -122,11 +122,12 @@ You can update the email address that receives billing invoices at any time. To update your billing email address: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Billing information** from the left-hand navigation. -4. On your billing information card, select **Change**. -5. Update your billing contact information and select **Update**. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Billing information** from the left-hand navigation. +1. On your billing information card, select **Change**. +1. Update your billing contact information and select **Update**. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -134,11 +135,10 @@ To update your billing email address: To update your billing email address: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select **Billing Address**. -5. Update the email address in the **Billing contact** section. -6. Select **Submit**. +1. Select your organization, then select **Billing**. +1. Select **Billing Address**. +1. Update the email address in the **Billing contact** section. +1. Select **Submit**. {{< /tab >}} {{< /tabs >}} @@ -150,11 +150,12 @@ To update your billing email address: To update your billing email address: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Billing information** from the left-hand navigation. -4. On your billing information card, select **Change**. -5. Update your billing contact information and select **Update**. +1. Sign in to [Docker Home](https://app.docker.com/) and select +your organization. +1. Select **Billing**. +1. Select **Billing information** from the left-hand navigation. +1. On your billing information card, select **Change**. +1. Update your billing contact information and select **Update**. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -162,12 +163,11 @@ To update your billing email address: To update your billing email address: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select the name of the organization. -5. Select **Billing Address**. -6. Update the email address in the **Billing contact** section. -7. Select **Submit**. +1. Select your organization, then select **Billing**. +1. Select the name of the organization. +1. Select **Billing Address**. +1. Update the email address in the **Billing contact** section. +1. Select **Submit**. {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/billing/history.md b/content/manuals/billing/history.md index ecb3139c53de..0e64a9c75a61 100644 --- a/content/manuals/billing/history.md +++ b/content/manuals/billing/history.md @@ -37,7 +37,7 @@ You can’t make changes to a paid or unpaid billing invoice. When you update yo {{< tabs >}} {{< tab name="Docker subscription" >}} -You receive your invoice when the subscription renews. To verify your renewal date, sign in to the [Docker Home Billing](https://app.docker.com/billing). Your renewal date and amount are displayed on your subscription card. +You receive your invoice when the subscription renews. To verify your renewal date, sign in to [Docker Billing](https://app.docker.com/billing). Your renewal date and amount are displayed on your subscription card. {{< /tab >}} @@ -64,19 +64,20 @@ You receive your invoice when the subscription renews. To verify your renewal da To add or update your VAT number: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Billing information** from the left-hand menu. -4. Select **Change** on your billing information card. -5. Ensure the **I'm purchasing as a business** checkbox is checked. -6. Enter your VAT number in the Tax ID section. +1. Sign in to [Docker Home](https://app.docker.com/) and choose your +organization. +1. Select **Billing**. +1. Select **Billing information** from the left-hand menu. +1. Select **Change** on your billing information card. +1. Ensure the **I'm purchasing as a business** checkbox is checked. +1. Enter your VAT number in the Tax ID section. > [!IMPORTANT] > > Your VAT number must include your country prefix. For example, if you are entering a VAT number for Germany, you would enter `DE123456789`. -7. Select **Update**. +1. Select **Update**. Your VAT number will be included on your next invoice. @@ -86,17 +87,17 @@ Your VAT number will be included on your next invoice. To add or update your VAT number: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. For user accounts, Select your avatar in the top-right corner, then **Billing**. For organizations, select the name of the organization. -3. Select the **Billing address** link. -4. In the **Billing Information** section, select **Update information**. -5. Enter your VAT number in the Tax ID section. +1. Select your organization, then select **Billing**. +1. Select the **Billing address** link. +1. In the **Billing Information** section, select **Update information**. +1. Enter your VAT number in the Tax ID section. > [!IMPORTANT] > > Your VAT number must include your country prefix. For example, if you are entering a VAT number for Germany, you would enter `DE123456789`. -6. Select **Save**. +1. Select **Save**. Your VAT number will be included on your next invoice. @@ -114,11 +115,12 @@ You can view the billing history and download past invoices for a personal accou To view billing history: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Invoices** from the left-hand menu. -4. Optional. Select the **Invoice number** to open invoice details. -5. Optional. Select the **Download** button to download an invoice. +1. Sign in to [Docker Home](https://app.docker.com/) and choose your +organization. +1. Select **Billing**. +1. Select **Invoices** from the left-hand menu. +1. Optional. Select the **Invoice number** to open invoice details. +1. Optional. Select the **Download** button to download an invoice. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -126,12 +128,11 @@ To view billing history: To view billing history: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select the **Payment methods and billing history** link. - You can find your past invoices in the **Invoice History** section. +1. Select your organization, then select **Billing**. +1. Select the **Payment methods and billing history** link. -From here you can download an invoice. +You can find your past invoices in the **Invoice History** section, where +you can download an invoice. {{< /tab >}} {{< /tabs >}} @@ -147,11 +148,12 @@ From here you can download an invoice. To view billing history: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Invoices** from the left-hand menu. -4. Optional. Select the **invoice number** to open invoice details. -5. Optional. Select the **download** button to download an invoice. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Invoices** from the left-hand menu. +1. Optional. Select the **invoice number** to open invoice details. +1. Optional. Select the **download** button to download an invoice. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -159,12 +161,11 @@ To view billing history: To view billing history: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select the **Payment methods and billing history** link. - You can find your past invoices in the **Invoice History** section. +1. Select your organization, then select **Billing**. +1. Select the **Payment methods and billing history** link. -From here you can download an invoice. +You can find your past invoices in the **Invoice History** section, where you +can download an invoice. {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/billing/payment-method.md b/content/manuals/billing/payment-method.md index 72a663f28e59..9354051d16e1 100644 --- a/content/manuals/billing/payment-method.md +++ b/content/manuals/billing/payment-method.md @@ -43,11 +43,12 @@ All currency, for example the amount listed on your billing invoice, is in Unite To add a payment method: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select **Payment methods** from the left-hand menu. -4. Select **Add payment method**. -5. Enter your new payment information: +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Payment methods** from the left-hand menu. +1. Select **Add payment method**. +1. Enter your new payment information: - If you are adding a card: - Select **Card** and fill out the card information form. - If you are adding a Link payment: @@ -59,9 +60,9 @@ To add a payment method: - If your bank is listed, select your bank's name. - If your bank is not listed, select **Search for your bank**. - To verify your bank account, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account). -6. Select **Add payment method**. -7. Optional. You can set a new default payment method by selecting the **Set as default** action. -8. Optional. You can remove non-default payment methods by selecting the **Delete** action. +1. Select **Add payment method**. +1. Optional. You can set a new default payment method by selecting the **Set as default** action. +1. Optional. You can remove non-default payment methods by selecting the **Delete** action. > [!NOTE] > @@ -74,19 +75,18 @@ To add a payment method: To add a payment method: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select the **Payment methods and billing history** link. -5. In the **Payment method** section, select **Add payment method**. -6. Enter your new payment information: +1. Select **Billing**. +1. Select the **Payment methods** link. +1. Select **Add payment method**. +1. Enter your new payment information: - If you are adding a card: - Select **Card** and fill out the card information form. - If you are adding a Link payment: - Select **Secure, 1-click checkout with Link** and enter your Link **email address** and **phone number**. - If you are not an existing Link customer, you must fill out the card information form to store a card for Link payments. -7. Select **Add**. -8. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions. -9. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**. +1. Select **Add**. +1. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions. +1. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**. {{< /tab >}} {{< /tabs >}} @@ -102,12 +102,12 @@ To add a payment method: To add a payment method: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Choose your organization from the top-left drop-down. -4. Select **Payment methods** from the left-hand menu. -5. Select **Add payment method**. -6. Enter your new payment information: +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Payment methods** from the left-hand menu. +1. Select **Add payment method**. +1. Enter your new payment information: - If you are adding a card: - Select **Card** and fill out the card information form. - If you are adding a Link payment: @@ -119,10 +119,10 @@ To add a payment method: - If your bank is listed, select your bank's name. - If your bank is not listed, select **Search for your bank**. - To verify your bank account, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account). -7. Select **Add payment method**. -8. Select **Add payment method**. -9. Optional. You can set a new default payment method by selecting the **Set as default** action. -10. Optional. You can remove non-default payment methods by selecting the **Delete** action. +1. Select **Add payment method**. +1. Select **Add payment method**. +1. Optional. You can set a new default payment method by selecting the **Set as default** action. +1. Optional. You can remove non-default payment methods by selecting the **Delete** action. > [!NOTE] > @@ -135,20 +135,18 @@ To add a payment method: To add a payment method: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-right corner. -3. From the drop-down menu select **Billing**. -4. Select the organization account you want to update. -5. Select the **Payment methods and billing history** link. -6. In the **Payment Method** section, select **Add payment method**. -7. Enter your new payment information: +1. Select your organization, then select **Billing**. +1. Select the **Payment methods** link. +1. Select **Add payment method**. +1. Enter your new payment information: - If you are adding a card: - Select **Card** and fill out the card information form. - If you are adding a Link payment: - Select **Secure, 1-click checkout with Link** and enter your Link **email address** and **phone number**. - If you are not an existing Link customer, you must fill out the card information form to store a card for Link payments. -8. Select **Add payment method**. -9. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions. -10. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**. +1. Select **Add payment method**. +1. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions. +1. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**. {{< /tab >}} {{< /tabs >}} @@ -166,12 +164,12 @@ To verify your bank account instantly, you must sign in to your bank account from the Docker billing flow: 1. Choose **US bank account** as your payment method. -2. Verify your **Email** and **Full name**. -3. If your bank is listed, select your bank's name or select **Search for your bank**. -4. Sign in to your bank and review the terms and conditions. This agreement +1. Verify your **Email** and **Full name**. +1. If your bank is listed, select your bank's name or select **Search for your bank**. +1. Sign in to your bank and review the terms and conditions. This agreement allows Docker to debit payments from your connected bank account. -5. Select **Agree and continue**. -6. Select an account to link and verify, and select **Connect account**. +1. Select **Agree and continue**. +1. Select an account to link and verify, and select **Connect account**. When the account is verified, you will see a success message in the pop-up modal. @@ -180,11 +178,11 @@ When the account is verified, you will see a success message in the pop-up modal To verify your bank account manually, you must enter the micro-deposit amount from your bank statement: 1. Choose **US bank account** as your payment method. -2. Verify your **Email** and **First and last name**. -3. Select **Enter bank details manually instead**. -4. Enter your bank details: **Routing number** and **Account number**. -5. Select **Submit**. -6. You will receive an email with instructions on how to manually verify. +1. Verify your **Email** and **First and last name**. +1. Select **Enter bank details manually instead**. +1. Enter your bank details: **Routing number** and **Account number**. +1. Select **Submit**. +1. You will receive an email with instructions on how to manually verify. Manual verification uses micro-deposits. You should see a small deposit (e.g. $-0.01) in your bank account in 1-2 business days. Open your manual verification email and enter the amount of this deposit to verify your account. diff --git a/content/manuals/desktop/setup/install/enterprise-deployment/msi-install-and-configure.md b/content/manuals/desktop/setup/install/enterprise-deployment/msi-install-and-configure.md index a377c62c5254..bfdd2df5043b 100644 --- a/content/manuals/desktop/setup/install/enterprise-deployment/msi-install-and-configure.md +++ b/content/manuals/desktop/setup/install/enterprise-deployment/msi-install-and-configure.md @@ -17,8 +17,8 @@ The MSI package supports various MDM (Mobile Device Management) solutions, makin ## Install interactively -1. In the [Docker Admin Console](http://admin.docker.com/), navigate to your organization. -2. Under **Docker Desktop**, select the **Deploy** page. +1. In [Docker Home](http://app.docker.com), choose your organization. +2. Select **Admin Console**, then **Enterprise deployment**. 3. From the **Windows OS** tab, select the **Download MSI installer** button. 4. Once downloaded, double-click `Docker Desktop Installer.msi` to run the installer. 5. After accepting the license agreement, choose the install location. By default, Docker Desktop is installed at `C:\Program Files\Docker\Docker`. @@ -35,6 +35,7 @@ The MSI package supports various MDM (Mobile Device Management) solutions, makin 8. When the installation is successful, select **Finish** to complete the installation process. If your administrator account is different from your user account, you must add the user to the **docker-users** group to access features that require higher privileges, such as creating and managing the Hyper-V VM, or using Windows containers: + 1. Run **Computer Management** as an **administrator**. 2. Navigate to **Local Users and Groups** > **Groups** > **docker-users**. 3. Right-click to add the user to the group. @@ -44,7 +45,7 @@ If your administrator account is different from your user account, you must add > > When installing Docker Desktop with the MSI, in-app updates are automatically disabled. This ensures organizations can maintain version consistency and prevent unapproved updates. For Docker Desktop installed with the .exe installer, in-app updates remain supported. > -> Docker Desktop notifies you when an update is available. To update Docker Desktop, download the latest installer from the Docker Admin Console. Navigate to the **Deploy** page > under **Docker Desktop**. +> Docker Desktop notifies you when an update is available. To update Docker Desktop, download the latest installer from the Docker Admin Console. Navigate to the **Enterprise deployment** page. > > To keep up to date with new releases, check the [release notes](/manuals/desktop/release-notes.md) page. diff --git a/content/manuals/desktop/setup/install/enterprise-deployment/pkg-install-and-configure.md b/content/manuals/desktop/setup/install/enterprise-deployment/pkg-install-and-configure.md index 94f0ec00e16a..899ac525f771 100644 --- a/content/manuals/desktop/setup/install/enterprise-deployment/pkg-install-and-configure.md +++ b/content/manuals/desktop/setup/install/enterprise-deployment/pkg-install-and-configure.md @@ -12,8 +12,8 @@ The PKG package supports various MDM (Mobile Device Management) solutions, makin ## Install interactively -1. In the [Docker Admin Console](http://admin.docker.com/), navigate to your organization. -2. Under **Docker Desktop**, select the **Deploy** page. +1. In [Docker Home](http://app.docker.com), choose your organization. +2. Select **Admin Console**, then **Enterprise deployment**. 3. From the **macOS** tab, select the **Download PKG installer** button. 4. Once downloaded, double-click `Docker.pkg` to run the installer. 5. Follow the instructions on the installation wizard to authorize the installer and proceed with the installation. @@ -28,14 +28,14 @@ The PKG package supports various MDM (Mobile Device Management) solutions, makin > > When installing Docker Desktop with the PKG, in-app updates are automatically disabled. This ensures organizations can maintain version consistency and prevent unapproved updates. For Docker Desktop installed with the `.dmg` installer, in-app updates remain supported. > -> Docker Desktop notifies you when an update is available. To update Docker Desktop, download the latest installer from the Docker Admin Console. Navigate to the **Deploy** page > under **Docker Desktop**. +> Docker Desktop notifies you when an update is available. To update Docker Desktop, download the latest installer from the Docker Admin Console. Navigate to the **Enterprise deployment** page. > > To keep up to date with new releases, check the [release notes](/manuals/desktop/release-notes.md) page. ## Install from the command line -1. In the [Docker Admin Console](http://admin.docker.com/), navigate to your organization. -2. Under **Security and access**, select the **Deploy Docker Desktop** page. +1. In [Docker Home](http://app.docker.com), choose your organization. +2. Select **Admin Console**, then **Enterprise deployment**. 3. From the **macOS** tab, select the **Download PKG installer** button. 4. From your terminal, run the following command: diff --git a/content/manuals/platform-release-notes.md b/content/manuals/platform-release-notes.md index fa0dbb2e8d4b..e595e8b6eb9b 100644 --- a/content/manuals/platform-release-notes.md +++ b/content/manuals/platform-release-notes.md @@ -67,10 +67,10 @@ This page provides details on new features, enhancements, known issues, and bug ### New -- Administrators can now view [organization insights](/manuals/admin/organization/insights.md) (Early Access). +- Administrators can now view [organization Insights](/manuals/admin/organization/insights.md). ## 2024-07-17 ### New -- You can now centrally access and manage Docker products in [Docker Home](https://app.docker.com) (Early Access). \ No newline at end of file +- You can now centrally access and manage Docker products in [Docker Home](https://app.docker.com). \ No newline at end of file diff --git a/content/manuals/security/_index.md b/content/manuals/security/_index.md index 755814c7e907..9bca77f06c72 100644 --- a/content/manuals/security/_index.md +++ b/content/manuals/security/_index.md @@ -31,9 +31,9 @@ grid_admins: description: Configure sign-in for members of your teams and organizations. link: /security/for-admins/enforce-sign-in/ icon: passkey -- title: Domain audit +- title: Domain management description: Identify uncaptured users in your organization. - link: /security/for-admins/domain-audit/ + link: /security/for-admins/domain-management/ icon: person_search - title: Docker Scout description: Explore how Docker Scout can help you create a more secure software supply chain. diff --git a/content/manuals/security/for-admins/access-tokens.md b/content/manuals/security/for-admins/access-tokens.md index 13d6e0a65b37..dbb807c54ac6 100644 --- a/content/manuals/security/for-admins/access-tokens.md +++ b/content/manuals/security/for-admins/access-tokens.md @@ -65,28 +65,21 @@ Expired tokens count towards the total amount of tokens. To create an OAT: -1. Sign in to the [Admin Console](https://app.docker.com/admin). - -2. Select the organization you want to create an access token for. - -3. Under **Security and access**, select **Access tokens**. - -4. Select **Generate access token**. - -5. Add a label and optional description for your token. Use something that +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Admin Console**, then **Access tokens**. +1. Select **Generate access token**. +1. Add a label and optional description for your token. Use something that indicates the use case or purpose of the token. - -6. Select the expiration date for the token. - -7. Expand the **Repository** drop-down to set access permission +1. Select the expiration date for the token. +1. Expand the **Repository** drop-down to set access permission scopes for your token. To set Repository access scopes: 1. Optional. Select **Read public repositories**. - 2. Select **Add repository** and choose a repository from the drop-down. - 3. Set the scopes for your repository — **Image Push** or + 1. Select **Add repository** and choose a repository from the drop-down. + 1. Set the scopes for your repository — **Image Push** or **Image Pull**. - 4. Add more repositories as needed. You can add up to 50 repositories. - -8. Optional. Expand the **Organization** drop-down and select the + 1. Add more repositories as needed. You can add up to 50 repositories. +1. Optional. Expand the **Organization** drop-down and select the **Allow management access to this organization's resources** checkbox. This setting enables organization management scopes for your token. The following organization management scopes are available: @@ -96,8 +89,7 @@ organization management scopes are available: - **Invite Read**: Read invites to the organization - **Group Edit**: Edit groups of the organization - **Group Read**: Read groups of the organization - -9. Select **Generate token**. Copy the token that appears on the screen +1. Select **Generate token**. Copy the token that appears on the screen and save it. You won't be able to retrieve the token once you exit the screen. @@ -120,14 +112,8 @@ password. You can rename, update the description, update the repository access, deactivate, or delete a token as needed. -1. Sign in to the [Admin Console](https://app.docker.com/admin). - -2. Select the organization you want to modify an access token for. - -3. Under **Security and access**, select **Access tokens**. - -4. Select the actions menu in the token row, then select - **Deactivate**, **Edit**, or **Delete** to modify the token. For **Inactive** - tokens, you can only select **Delete**. - -5. If editing a token, select **Save** after specifying your modifications. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Admin Console**, then **Access tokens**. +1. Select the actions menu in the token row, then select **Deactivate**, **Edit**, or **Delete** to modify the token. For **Inactive** tokens, you can only select **Delete**. +1. If editing a token, select **Save** after specifying your modifications. diff --git a/content/manuals/security/for-admins/domain-audit.md b/content/manuals/security/for-admins/domain-audit.md deleted file mode 100644 index ac9f13b920d5..000000000000 --- a/content/manuals/security/for-admins/domain-audit.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -description: Learn how to audit your domains for uncaptured users. -keywords: domain audit, security, identify users, manage users -title: Domain audit -aliases: -- /docker-hub/domain-audit/ -- /admin/company/settings/domains/ -- /admin/organization/security-settings/domains/ -weight: 50 ---- - -{{< summary-bar feature_name="Domain audit" >}} - -Domain audit identifies uncaptured users in an organization. Uncaptured users are Docker users who have authenticated to Docker using an email address associated with one of your verified domains, but they're not a member of your organization in Docker. You can audit domains on organizations that are part of the Docker Business subscription. To upgrade your existing account to a Docker Business subscription, see [Upgrade your subscription](/subscription/upgrade/). - -Uncaptured users who access Docker Desktop in your environment may pose a security risk because your organization's security settings, like Image Access Management and Registry Access Management, aren't applied to a user's session. In addition, you won't have visibility into the activity of uncaptured users. You can add uncaptured users to your organization to gain visibility into their activity and apply your organization's security settings. - -Domain audit can't identify the following Docker users in your environment: - -- Users who access Docker Desktop without authenticating -- Users who authenticate using an account that doesn't have an email address associated with one of your verified domains - -Although domain audit can't identify all Docker users in your environment, you can enforce sign-in to prevent unidentifiable users from accessing Docker Desktop in your environment. For more details about enforcing sign-in, see [Configure registry.json to enforce sign-in](../for-admins/enforce-sign-in/_index.md). - -> [!TIP] -> -> You can use endpoint management (MDM) software to identify the number of Docker Desktop instances and their versions within your environment. This can provide accurate license reporting, help ensure your machines use the latest version of Docker Desktop, and enable you to [enforce sign-in](enforce-sign-in/_index.md). -> - [Intune](https://learn.microsoft.com/en-us/mem/intune/apps/app-discovered-apps) -> - [Jamf](https://docs.jamf.com/10.25.0/jamf-pro/administrator-guide/Application_Usage.html) -> - [Kandji](https://support.kandji.io/support/solutions/articles/72000559793-view-a-device-application-list) -> - [Kolide](https://www.kolide.com/features/device-inventory/properties/mac-apps) -> - [Workspace One](https://blogs.vmware.com/euc/2022/11/how-to-use-workspace-one-intelligence-to-manage-app-licenses-and-reduce-costs.html) - -## Prerequisites - -Before you audit your domains, review the following required prerequisites: - -- Your organization must be part of a Docker Business subscription. To upgrade your existing account to a Docker Business subscription, see [Upgrade your subscription](../../subscription/change.md). -- You must [add and verify your domains](./single-sign-on/configure/_index.md#step-one-add-and-verify-your-domain). - -> [!IMPORTANT] -> -> Domain audit is not supported for companies or organizations within a company. - -## Audit your domains for uncaptured users - -{{< tabs >}} -{{< tab name="Admin Console" >}} - -{{% admin-domain-audit product="admin" %}} - -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -{{% admin-domain-audit product="hub" %}} - -{{< /tab >}} -{{< /tabs >}} - diff --git a/content/manuals/security/for-admins/domain-management.md b/content/manuals/security/for-admins/domain-management.md index 8a2e99a454fa..81b8086012e7 100644 --- a/content/manuals/security/for-admins/domain-management.md +++ b/content/manuals/security/for-admins/domain-management.md @@ -18,14 +18,13 @@ or control. ## Add a domain -1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the **Choose profile** page. -If your organization is part of a company, select the company +1. Sign in to [Docker Home](https://app.docker.com) and select +your organization. If your organization is part of a company, select the company and configure the domain for the organization at the company level. -3. Under **Security and access**, select **Domain management**. -4. Select **Add a domain**. -5. Enter your domain and select **Add domain**. -6. In the pop-up modal, copy the **TXT Record Value** to verify your domain. +1. Select **Admin Console**, then **Domain management**. +1. Select **Add a domain**. +1. Enter your domain and select **Add domain**. +1. In the pop-up modal, copy the **TXT Record Value** to verify your domain. ## Verify a domain @@ -56,7 +55,7 @@ domain name. These values may direct to the wrong place. {{< tab name="AWS Route 53" >}} 1. To add your TXT record to AWS, see [Creating records by using the Amazon Route 53 console](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-creating.html). -2. TXT record verification can take 72 hours. Once you have waited for +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. @@ -65,7 +64,7 @@ your domain name. {{< tab name="Google Cloud DNS" >}} 1. To add your TXT record to Google Cloud DNS, see [Verifying your domain with a TXT record](https://cloud.google.com/identity/docs/verify-domain-txt). -2. TXT record verification can take 72 hours. Once you have waited for TXT +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. @@ -74,7 +73,7 @@ your domain name. {{< tab name="GoDaddy" >}} 1. To add your TXT record to GoDaddy, see [Add a TXT record](https://www.godaddy.com/help/add-a-txt-record-19232). -2. TXT record verification can take 72 hours. Once you have waited for TXT +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. @@ -83,8 +82,8 @@ domain name. {{< tab name="Other providers" >}} 1. Sign in to your domain host. -2. Add a TXT record to your DNS settings and save the record. -3. TXT record verification can take 72 hours. Once you have waited for TXT +1. Add a TXT record to your DNS settings and save the record. +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. @@ -96,14 +95,13 @@ your domain name. Deleting a domain removes the assigned TXT record value. To delete a domain: -1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the **Choose profile** page. -If your organization is part of a company, select the company +1. Sign in to [Docker Home](https://app.docker.com) and select +your organization. If your organization is part of a company, select the company and configure the domain for the organization at the company level. -3. Under **Security and access**, select **Domain management**. -4. For the domain you want to delete, section the **Actions** menu, then +1. Select **Admin Console**, then **Domain management**. +1. For the domain you want to delete, section the **Actions** menu, then **Delete domain**. -5. To confirm, select **Delete domain** in the pop-up modal. +1. To confirm, select **Delete domain** in the pop-up modal. ## Auto-provisioning @@ -136,14 +134,16 @@ to accomodate new users, see [Manage seats](/manuals/subscription/manage-seats.m Auto-provisioning is enabled per user. To enable auto-provisioning: -1. Open the [Admin Console](https://app.docker.com/admin). -2. Select **Domain management** from the left-hand navigation. -3. Select the **Actions menu** next to the user you want to enable +1. Sign in to [Docker Home](https://app.docker.com) and select +your organization. If your organization is part of a company, select the company +and configure the domain for the organization at the company level. +1. Select **Admin Console**, then **Domain management**. +1. Select the **Actions menu** next to the user you want to enable auto-provisioning for. -4. Select **Enable auto-provisioning**. -5. Optional. If enabling auto-provisioning at the company level, select an +1. Select **Enable auto-provisioning**. +1. Optional. If enabling auto-provisioning at the company level, select an organization for the user. -6. Select **Enable** to confirm. +1. Select **Enable** to confirm. The **Auto-provisioning** column will update to **Enabled**. @@ -151,8 +151,10 @@ The **Auto-provisioning** column will update to **Enabled**. To disable auto-provisioning for a user: -1. Open the [Admin Console](https://app.docker.com/admin). -2. Select **Domain management** from the left-hand navigation. -3. Select the **Actions menu** next to your user. -4. Select **Disable auto-provisioning**. -5. Select **Disable**. +1. Sign in to [Docker Home](https://app.docker.com) and select +your organization. If your organization is part of a company, select the company +and configure the domain for the organization at the company level. +1. Select **Admin Console**, then **Domain management**. +1. Select the **Actions menu** next to your user. +1. Select **Disable auto-provisioning**. +1. Select **Disable**. diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md index 603587407e78..e832f4f101f7 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md @@ -28,9 +28,9 @@ compliance status, and resolving non-compliant users. > Desktop settings reporting is in Early Access and is being rolled out > gradually. You may not see this setting in the Admin Console yet. -1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select your organization or company from the **Choose profile** page. -3. Under Docker Desktop, select **Reporting**. +1. Sign in to [Docker Home](https://app.docker.com) and select +your organization. +1. Select **Admin Console**, then **Desktop settings reporting**. This opens the Desktop settings reporting page. From here you can: @@ -48,15 +48,14 @@ This opens the Desktop settings reporting page. From here you can: > because older versions can't report compliance. To ensure accurate > compliance status, users must update to Docker Desktop version 4.40 and later. -1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select your organization or company from the **Choose profile** page. -3. Under **Docker Desktop**, select **Reporting**. By default, non-compliant users -are displayed. -4. Optional. Select the **Hide compliant users** checkbox to show both compliant +1. Sign in to [Docker Home](https://app.docker.com) and select +your organization. +1. Select **Admin Console**, then **Desktop settings reporting**. +1. Optional. Select the **Hide compliant users** checkbox to show both compliant and non-compliant users. -5. Use the **Search** field to search by username or email address. -6. Hover over a user’s compliance status indicator to quickly view their status. -7. Select a username to view more details about their compliance status, and for +1. Use the **Search** field to search by username or email address. +1. Hover over a user’s compliance status indicator to quickly view their status. +1. Select a username to view more details about their compliance status, and for steps to resolve non-compliant users. ## Understand compliance status @@ -139,7 +138,7 @@ next to their name on the Desktop settings reporting dashboard. Non-compliant users must have their compliance status resolved: 1. Select a username from the Desktop settings reporting dashboard. -2. On the compliance status details page, follow the resolution steps provided +1. On the compliance status details page, follow the resolution steps provided to resolve the compliance status. -3. Refresh the page to ensure the resolution steps resolved the compliance +1. Refresh the page to ensure the resolution steps resolved the compliance status. diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md index 1738dca37c42..83559eade569 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md @@ -26,18 +26,18 @@ ensure users authenticate to your organization. ## Create a settings policy -1. Go to the [Docker Admin Console](https://app.docker.com/admin) and select +1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. -2. Under **Docker Desktop**, select **Settings Management**. -3. Select **Create a settings policy**. -4. Provide a name and optional description. +1. Select **Admin Console**, then **Desktop Settings Management**. +1. Select **Create a settings policy**. +1. Provide a name and optional description. > [!TIP] > > You can upload an existing `admin-settings.json` file to pre-fill the form. Admin Console policies override local `admin-settings.json` files. -5. Choose who the policy applies to: +1. Choose who the policy applies to: - All users - Specific users @@ -46,7 +46,7 @@ your organization. > User-specific policies override the global default. Test your policy with a few users before rolling it out globally. -6. Configure the state for each setting: +1. Configure the state for each setting: - **User-defined**: Users can change the setting. - **Always enabled**: Setting is on and locked. - **Enabled**: Setting is on but can be changed. @@ -57,7 +57,7 @@ your organization. > > For a complete list of available settings, their supported platforms, and which configuration methods they work with, see the [Settings reference](settings-reference.md). -7. Select **Create**. +1. Select **Create**. To apply the policy: diff --git a/content/manuals/security/for-admins/provisioning/just-in-time.md b/content/manuals/security/for-admins/provisioning/just-in-time.md index 597a636ae80a..b4709951c94d 100644 --- a/content/manuals/security/for-admins/provisioning/just-in-time.md +++ b/content/manuals/security/for-admins/provisioning/just-in-time.md @@ -65,7 +65,7 @@ You may want to disable JIT provisioning for reasons such as the following: Users are provisioned with JIT by default. If you enable SCIM, you can disable JIT: -1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **SSO and SCIM**. -3. In the SSO connections table, select the **Action** icon and then **Disable JIT provisioning**. -4. Select **Disable** to confirm. +1. In [Docker Home](https://app.docker.com/), select your organization. +1. Select **Admin Console**, then **SSO and SCIM**. +1. In the SSO connections table, select the **Action** icon and then **Disable JIT provisioning**. +1. Select **Disable** to confirm. 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 920f321a6ccd..eddbd94000b6 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -25,12 +25,13 @@ Get started creating a single sign-on (SSO) connection for your organization or {{< tabs >}} {{< tab name="Admin Console" >}} -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**. -4. Select **Add a domain**. -5. Enter your domain in the text box and select **Add domain**. -6. The pop-up modal will prompt you with steps to verify your domain. Copy the **TXT Record Value**. +1. Sign in to [Docker Home](https://app.docker.com) and choose your +organization. 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. +1. Select **Admin Console**, then **Domain management**. +1. Select **Add a domain**. +1. Enter your domain in the text box and select **Add domain**. +1. The pop-up modal will prompt you with steps to verify your domain. Copy the **TXT Record Value**. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -38,11 +39,11 @@ Get started creating a single sign-on (SSO) connection for your organization or {{% 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**. -4. Select **Add a domain**. -5. Enter your domain in the text box and select **Add domain**. -6. The pop-up modal will prompt you with steps to verify your domain. Copy the **TXT Record Value**. +1. Select **My Hub** and then your organization from the list. +1. On your organization page, select **Settings** and then **Security**. +1. Select **Add a domain**. +1. Enter your domain in the text box and select **Add domain**. +1. The pop-up modal will prompt you with steps to verify your domain. Copy the **TXT Record Value**. {{< /tab >}} {{< /tabs >}} @@ -66,26 +67,26 @@ Use the **TXT Record Value** provided by Docker and follow the steps based on yo {{< tab name="AWS Route 53" >}} 1. To add your TXT record to AWS, see [Creating records by using the Amazon Route 53 console](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-creating.html). -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](https://app.docker.com/admin) and select **Verify** next to your domain name. +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. {{< /tab >}} {{< tab name="Google Cloud DNS" >}} 1. To add your TXT record to Google Cloud DNS, see [Verifying your domain with a TXT record](https://cloud.google.com/identity/docs/verify-domain-txt). -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](https://app.docker.com/admin) and select **Verify** next to your domain name. +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. {{< /tab >}} {{< tab name="GoDaddy" >}} 1. To add your TXT record to GoDaddy, see [Add a TXT record](https://www.godaddy.com/help/add-a-txt-record-19232). -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](https://app.docker.com/admin) and select **Verify** next to your domain name. +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. {{< /tab >}} {{< tab name="Other providers" >}} 1. Sign in to your domain host. -2. Add a TXT record to your DNS settings and save the record. -3. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. +1. Add a TXT record to your DNS settings and save the record. +1. 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](https://app.docker.com/admin) and select **Verify** next to your domain name. {{< /tab >}} {{< /tabs >}} 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 04041c66d0e3..5c2ac8be3182 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -30,15 +30,16 @@ Make sure you have completed the following before you begin: {{< tabs >}} {{< tab name="Admin Console" >}} -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**. -4. Select **Create Connection** and provide a name for the connection. -5. Select an authentication method, **SAML** or **Azure AD (OIDC)**. -6. Copy the following fields to add to your IdP: +1. Sign in to [Docker Home](https://app.docker.com) and choose your +organization. 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. +1. Select **Admin Console**, then **SSO and SCIM**. +1. Select **Create Connection** and provide a name for the connection. +1. Select an authentication method, **SAML** or **Azure AD (OIDC)**. +1. Copy the following fields to add to your IdP: - Okta SAML: **Entity ID**, **ACS URL** - Azure OIDC: **Redirect URL** -7. Keep this window open so you can paste the connection information from your IdP here at the end of this guide. +1. Keep this window open so you can paste the connection information from your IdP here at the end of this guide. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -46,14 +47,14 @@ Make sure you have completed the following before you begin: {{% 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**. -4. In the SSO connection table, select **Create Connection** and provide a name for the connection. -5. Select an authentication method, **SAML** or **Azure AD (OIDC)**. -6. Copy the following fields to add to your IdP: +1. Select **My Hub** and then your organization from the list. +1. On your organization page, select **Settings** and then **Security**. +1. In the SSO connection table, select **Create Connection** and provide a name for the connection. +1. Select an authentication method, **SAML** or **Azure AD (OIDC)**. +1. Copy the following fields to add to your IdP: - Okta SAML: **Entity ID**, **ACS URL** - Azure OIDC: **Redirect URL** -7. Keep this window open so you can paste the connection information from your IdP here at the end of this guide. +1. Keep this window open so you can paste the connection information from your IdP here at the end of this guide. {{< /tab >}} {{< /tabs >}} @@ -66,40 +67,40 @@ The user interface for your IdP may differ slightly from the following steps. Re {{< tab name="Okta SAML" >}} 1. Sign in to your Okta account. -2. Select **Admin** to open the Okta Admin portal. -3. From the left-hand navigation, select **Administration**. -4. Select **Administration** and then **Create App Integration**. -5. Select **SAML 2.0** and then **Next**. -6. Enter "Docker Hub" as your **App Name**. -7. Optional. Upload a logo. -8. Select **Next**. -9. Enter the following values from Docker into their corresponding Okta fields: +1. Select **Admin** to open the Okta Admin portal. +1. From the left-hand navigation, select **Administration**. +1. Select **Administration** and then **Create App Integration**. +1. Select **SAML 2.0** and then **Next**. +1. Enter "Docker Hub" as your **App Name**. +1. Optional. Upload a logo. +1. Select **Next**. +1. Enter the following values from Docker into their corresponding Okta fields: - Docker ACS URL: **Single Sign On URL** - Docker Entity ID: **Audience URI (SP Entity ID)** -10. Configure the following settings in Okta: +1. Configure the following settings in Okta: - Name ID format: `EmailAddress` - Application username: `Email` - Update application on: `Create and update` -11. Optional. Add SAML attributes. See [SSO attributes](/manuals/security/for-admins/provisioning/_index.md#sso-attributes) for a table of SSO attributes. -12. Select **Next**. -13. Select the **This is an internal app that we have created** checkbox. -14. Select **Finish**. +1. Optional. Add SAML attributes. See [SSO attributes](/manuals/security/for-admins/provisioning/_index.md#sso-attributes) for a table of SSO attributes. +1. Select **Next**. +1. Select the **This is an internal app that we have created** checkbox. +1. Select **Finish**. {{< /tab >}} {{< tab name="Entra ID SAML 2.0" >}} 1. Sign in to your Azure AD admin portal. -2. Select **Default Directory** and then **Add**. -3. Choose **Enterprise Application** and select **Create your own application**. -4. Enter "Docker" for application name and select the **non-gallery** option. -5. After the application is created, go to **Single Sign-On** and select **SAML**. -6. Select **Edit** on the **Basic SAML configuration** section. -7. Enter the following values from Docker into their corresponding Azure fields: +1. Select **Default Directory** and then **Add**. +1. Choose **Enterprise Application** and select **Create your own application**. +1. Enter "Docker" for application name and select the **non-gallery** option. +1. After the application is created, go to **Single Sign-On** and select **SAML**. +1. Select **Edit** on the **Basic SAML configuration** section. +1. Enter the following values from Docker into their corresponding Azure fields: - Docker Entity ID: **Identifier** - Docker ACS URL: **Reply URL** -8. Optional. Add SAML attributes. See [SSO attributes](/manuals/security/for-admins/provisioning/_index.md#sso-attributes) for a table of SSO attributes. -9. Save configuration. -10. From the **SAML Signing Certificate** section, download your **Certificate (Base64)**. +1. Optional. Add SAML attributes. See [SSO attributes](/manuals/security/for-admins/provisioning/_index.md#sso-attributes) for a table of SSO attributes. +1. Save configuration. +1. From the **SAML Signing Certificate** section, download your **Certificate (Base64)**. {{< /tab >}} {{< tab name="Azure Connect (OIDC)" >}} @@ -109,30 +110,30 @@ To create an Azure Connect (OIDC) connection, you must create an app registratio ### Create app registration 1. Sign in to your Azure AD admin portal. -2. Select **App Registration** and then **New Registration**. -3. Enter "Docker Hub SSO" or similar for application name. -4. Under **Supported account types**, specify who can use this application or access the app. -5. In the **Redirect URI** section, select **Web** from the drop-down menu and paste the **Redirect URI** value from the Docker console into this field. -6. Select **Register** to register the app. -7. Copy the **Client ID** from the app's overview page. You need this information to continue configuring SSO in Docker. +1. Select **App Registration** and then **New Registration**. +1. Enter "Docker Hub SSO" or similar for application name. +1. Under **Supported account types**, specify who can use this application or access the app. +1. In the **Redirect URI** section, select **Web** from the drop-down menu and paste the **Redirect URI** value from the Docker console into this field. +1. Select **Register** to register the app. +1. Copy the **Client ID** from the app's overview page. You need this information to continue configuring SSO in Docker. ### Create client secrets 1. Open your app in Azure AD and select **Certificates & secrets**. -2. Select **+ New client secret**. -3. Specify the description of the secret and set how long keys can be used. -4. Select **Add** to continue. -5. Copy the secret **Value** field. You need this to continue configuring SSO in Docker. +1. Select **+ New client secret**. +1. Specify the description of the secret and set how long keys can be used. +1. Select **Add** to continue. +1. Copy the secret **Value** field. You need this to continue configuring SSO in Docker. ### Configure API permissions 1. Open your app in Azure AD and navigate to your app settings. -2. Select **API permission** and then **Grant admin consent for [your tenant name]**. -3. Select **Yes** to confirm. -4. After confirming, select **Add a permission** and then **Delegated permissions**. -5. Search for `User.Read` and select this option. -6. Select **Add permissions** to confirm. -7. Verify admin consent was granted for each permission by checking the **Status** column. +1. Select **API permission** and then **Grant admin consent for [your tenant name]**. +1. Select **Yes** to confirm. +1. After confirming, select **Add a permission** and then **Delegated permissions**. +1. Search for `User.Read` and select this option. +1. Select **Add permissions** to confirm. +1. Verify admin consent was granted for each permission by checking the **Status** column. {{< /tab >}} {{< /tabs >}} @@ -145,7 +146,7 @@ After creating your connection in Docker and your IdP, you can cross-connect the {{< tab name="Okta SAML" >}} 1. Open your app you created in Okta and select **View SAML setup instructions**. -2. Copy the following values from the Okta SAML setup instruction page: +1. Copy the following values from the Okta SAML setup instruction page: - **SAML Sign-in URL** - **x509 Certificate** @@ -154,19 +155,19 @@ After creating your connection in Docker and your IdP, you can cross-connect the > 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. -6. Select **Next**. -7. Optional. Select a default team to provision users to and select **Next**. -8. Verify your SSO connection details and select **Create Connection**. +1. Open Docker Hub or the Admin Console. Your SSO configuration page should still be open from Step one of this guide. +1. Select **Next** to open the **Update single-sign on connection** page. +1. Paste your Okta **SAML Sign-in URL** and **x509 Certificate** values in Docker. +1. Select **Next**. +1. Optional. Select a default team to provision users to and select **Next**. +1. Verify your SSO connection details and select **Create Connection**. {{< /tab >}} {{< tab name="Entra ID SAML 2.0" >}} 1. Open your app in Azure AD. -2. Open your downloaded **Certificate (Base64)** in a text editor. -3. Copy the following values: +1. Open your downloaded **Certificate (Base64)** in a text editor. +1. Copy the following values: - From Azure AD: **Login URL** - Copy the contents of your **Certificate (Base64)** file from your text editor @@ -175,23 +176,23 @@ After creating your connection in Docker and your IdP, you can cross-connect the > 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**. -7. Optional. Select a default team to provision users to and select **Next**. -8. Verify your SSO connection details and select **Create Connection**. +1. Open Docker Hub or the Admin Console. Your SSO configuration page should still be open from Step one of this guide. +1. Paste your **Login URL** and **Certificate (Base64)** values in Docker. +1. Select **Next**. +1. Optional. Select a default team to provision users to and select **Next**. +1. Verify your SSO connection details and select **Create Connection**. {{< /tab >}} {{< tab name="Azure Connect (OIDC)" >}} 1. Open Docker Hub or the Admin Console. Your SSO configuration page should still be open from Step one of this guide. -2. Paste the following values from Azure AD in to Docker: +1. Paste the following values from Azure AD in to Docker: - **Client ID** - **Client Secret** - **Azure AD Domain** -3. Select **Next**. -4. Optional. Select a default team to provision users to and select **Next**. -5. Verify your SSO connection details and select **Create Connection**. +1. Select **Next**. +1. Optional. Select a default team to provision users to and select **Next**. +1. Verify your SSO connection details and select **Create Connection**. {{< /tab >}} {{< /tabs >}} @@ -201,9 +202,9 @@ After creating your connection in Docker and your IdP, you can cross-connect the After you've completed the SSO connection process in Docker, we recommend testing it: 1. Open an incognito browser. -2. Sign in to the Admin Console using your **domain email address**. -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**. -4. Authenticate through your domain email instead of using your Docker ID. +1. Sign in to the Admin Console using your **domain email address**. +1. 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**. +1. Authenticate through your domain email instead of using your Docker ID. 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). @@ -221,12 +222,12 @@ When a user signs in to a Docker organization that has multiple IdPs, on the sig Enforcing SSO requires users to use SSO when signing into Docker. This centralizes authentication and enforces policies set by the IdP. -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**. -4. In the SSO connections table, select the **Action** icon and then **Enable enforcement**. When SSO is enforced, your users are unable to modify their email address and password, convert a user account to an organization, or set up 2FA through Docker Hub. If you want to use 2FA, you must enable 2FA through your IdP. -5. Continue with the on-screen instructions and verify you've completed all tasks. -6. Select **Turn on enforcement** to complete. +1. Sign in to [Docker Home](https://app.docker.com/) and select +your organization. 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. +1. Select **Admin Console**, then **SSO and SCIM**. +1. In the SSO connections table, select the **Action** icon and then **Enable enforcement**. When SSO is enforced, your users are unable to modify their email address and password, convert a user account to an organization, or set up 2FA through Docker Hub. If you want to use 2FA, you must enable 2FA through your IdP. +1. Continue with the on-screen instructions and verify you've completed all tasks. +1. Select **Turn on enforcement** to complete. Your users must now sign in to Docker with SSO. 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 4c188a3e5ea8..2b3a48e1101a 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -70,19 +70,21 @@ aliases: To add a guest that isn't verified through your IdP: -1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select your organization or company from the **Choose profile** page, then select **Members**. -3. Select **Invite**. -4. Follow the on-screen instructions to invite the user. +1. Sign in to [Docker Home](https://app.docker.com/) and select +your organization. +1. Select **Members**. +1. Select **Invite**. +1. Follow the on-screen instructions to invite the user. ### Remove users from the SSO company To remove a user: -1. Sign in to [Admin Console](https://app.docker.com/admin). -2. Select your organization or company from the **Choose profile** page, then select **Members**. -3. Select the action icon next to a user’s name, and then select **Remove member**, if you're an organization, or **Remove user**, if you're a company. -4. Follow the on-screen instructions to remove the user. +1. Sign in to [Docker Home](https://app.docker.com/) and select +your organization. +1. Select **Members**. +1. Select the action icon next to a user’s name, and then select **Remove member**, if you're an organization, or **Remove user**, if you're a company. +1. Follow the on-screen instructions to remove the user. ## Manage provisioning diff --git a/content/manuals/security/for-developers/access-tokens.md b/content/manuals/security/for-developers/access-tokens.md index 1c61509edfda..6ba1d0a23ab6 100644 --- a/content/manuals/security/for-developers/access-tokens.md +++ b/content/manuals/security/for-developers/access-tokens.md @@ -25,25 +25,18 @@ any time. Use the Docker Admin Console to create an access token. -1. Sign in to your [Docker account](https://app.docker.com/login). - -2. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**. - -3. Select **Personal access tokens**. - -4. Select **Generate new token**. - -5. Add a description for your token. Use something that indicates the use case or purpose of the token. - -6. Select the expiration date for the token. - -7. Set the access permissions. +1. Sign in to [Docker Home](https://app.docker.com/). +1. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**. +1. Select **Personal access tokens**. +1. Select **Generate new token**. +1. Add a description for your token. Use something that indicates the use case or purpose of the token. +1. Select the expiration date for the token. +1. Set the access permissions. The access permissions are scopes that set restrictions in your repositories. For example, for Read & Write permissions, an automation pipeline can build an image and then push it to a repository. However, it can't delete the repository. - -8. Select **Generate** and then copy the token that appears on the screen and save it. You won't be able to retrieve the token once you close this prompt. +1. Select **Generate** and then copy the token that appears on the screen and save it. You won't be able to retrieve the token once you close this prompt. ## Use an access token @@ -75,21 +68,17 @@ When utilizing PATs, users should be aware that excessive creation of PATs could You can rename, activate, deactivate, or delete a token as needed. You can manage your tokens in your account settings. -1. Sign in to your [Docker account](https://app.docker.com/login). - -2. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**. - -3. Select **Personal access tokens**. +1. Sign in to [Docker Home](https://app.docker.com/login). +1. Select your avatar in the top-right corner and from the drop-down menu select **Account settings**. +1. Select **Personal access tokens**. This page shows an overview of all your tokens, and lists if the token was generated manually or if it was [auto-generated](#auto-generated-tokens). You can also view the scope of the tokens, which tokens are activate and inactive, when they were created, when they were last used, and their expiration date. - -4. Select the actions menu on the far right of a token row, then select **Deactivate** or **Activate**, **Edit**, or **Delete** to modify the token. - -5. After editing the token, select **Save token**. +1. Select the actions menu on the far right of a token row, then select **Deactivate** or **Activate**, **Edit**, or **Delete** to modify the token. +1. After editing the token, select **Save token**. ## Auto-generated tokens diff --git a/content/manuals/security/troubleshoot/troubleshoot-provisioning.md b/content/manuals/security/troubleshoot/troubleshoot-provisioning.md index b4f73262160c..5ed009d084a6 100644 --- a/content/manuals/security/troubleshoot/troubleshoot-provisioning.md +++ b/content/manuals/security/troubleshoot/troubleshoot-provisioning.md @@ -43,8 +43,8 @@ assignment does not reflect changes. #### Disable JIT provisioning (recommended) -1. Sign in to the Docker [Admin Console](https://app.docker.com/admin). -1. Go to your organization's **Settings** > **Security** > **SSO and SCIM**. +1. Sign in to [Docker Home](https://app.docker.com/). +1. Select **Admin Console**, then **SSO and SCIM**. 1. Find the relevant SSO connection. 1. Select the **actions menu** and choose **Edit**. 1. Disable **Just-in-Time provisioning**. diff --git a/content/manuals/security/troubleshoot/troubleshoot-sso.md b/content/manuals/security/troubleshoot/troubleshoot-sso.md index ceae9fea46c2..1804dd3df2b5 100644 --- a/content/manuals/security/troubleshoot/troubleshoot-sso.md +++ b/content/manuals/security/troubleshoot/troubleshoot-sso.md @@ -19,11 +19,11 @@ If you experience issues with SSO, check both the Docker Admin Console and your ### Check Docker error logs -1. Sign in to the [Admin Console](https://app.docker.com/admin/) and select your organization. -2. Select **SSO and SCIM**. -3. In the SSO connections table, select the **Action** menu and then **View error logs**. -4. For more details on specific errors, select **View error details** next to an error message. -5. Note any errors you see on this page for further troubleshooting. +1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. +1. Select **Admin Console**, then **SSO and SCIM**. +1. In the SSO connections table, select the **Action** menu and then **View error logs**. +1. For more details on specific errors, select **View error details** next to an error message. +1. Note any errors you see on this page for further troubleshooting. ### Check for errors in your IdP @@ -92,10 +92,10 @@ User '$username' is not assigned to this SSO organization. Contact your administ JIT is enabled by default when you enable SSO. If you have JIT disabled and need to re-enable it: -1. Sign in to the [Admin Console](https://app.docker.com/admin) and select your organization. -2. Select **SSO and SCIM**. -3. In the SSO connections table, select the **Action** menu and then **Enable JIT provisioning**. -4. Select **Enable** to confirm. +1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. +1. Select **Admin Console**, then **SSO and SCIM**. +1. In the SSO connections table, select the **Action** menu and then **Enable JIT provisioning**. +1. Select **Enable** to confirm. **Manually invite users** @@ -106,14 +106,14 @@ To manually invite users, see [Invite members](/manuals/admin/organization/membe If you have SCIM enabled, troubleshoot your SCIM connection using the following steps: -1. Sign in to the [Admin Console](https://app.docker.com/admin) and select your organization. -2. Select **SSO and SCIM**. -3. In the SSO connections table, select the **Action** menu and then **View error logs**. For more details on specific errors, select **View error details** next to an error message. Note any errors you see on this page. -4. Navigate back to the **SSO and SCIM** page of the Admin Console and verify your SCIM configuration: +1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. +1. Select **Admin Console**, then **SSO and SCIM**. +1. In the SSO connections table, select the **Action** menu and then **View error logs**. For more details on specific errors, select **View error details** next to an error message. Note any errors you see on this page. +1. Navigate back to the **SSO and SCIM** page of the Admin Console and verify your SCIM configuration: - Ensure that the SCIM Base URL and API Token in your IdP match those provided in the Docker Admin Console. - Verify that SCIM is enabled in both Docker and your IdP. -5. Ensure that the attributes being synced from your IdP match Docker's [supported attributes](/manuals/security/for-admins/provisioning/scim.md#supported-attributes) for SCIM. -6. Test user provisioning by trying to provision a test user through your IdP and verify if they appear in Docker. +1. Ensure that the attributes being synced from your IdP match Docker's [supported attributes](/manuals/security/for-admins/provisioning/scim.md#supported-attributes) for SCIM. +1. Test user provisioning by trying to provision a test user through your IdP and verify if they appear in Docker. ## IdP-initiated sign in is not enabled for connection diff --git a/content/manuals/subscription/change.md b/content/manuals/subscription/change.md index 5acad6638624..6d9518a3659d 100644 --- a/content/manuals/subscription/change.md +++ b/content/manuals/subscription/change.md @@ -40,12 +40,12 @@ When you upgrade a Docker subscription, you immediately have access to all the f To upgrade your Docker subscription: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Optional. If you're upgrading from a free Personal subscription to a Team subscription and want to keep your username, [convert your user account into an organization](../admin/organization/convert-account.md). -4. Select the account you want to upgrade in the drop-down at the top-left of the page. -5. Select **Upgrade**. -6. Follow the on-screen instructions to complete your upgrade. +1. Sign in to [Docker Home](https://app.docker.com/) and select the organization +you want to upgrade. +1. Select **Billing**. +1. Optional. If you're upgrading from a free Personal subscription to a Team subscription and want to keep your username, [convert your user account into an organization](../admin/organization/convert-account.md). +1. Select **Upgrade**. +1. Follow the on-screen instructions to complete your upgrade. > [!NOTE] > @@ -82,11 +82,11 @@ If you have a [sales-assisted Docker Business subscription](details.md#sales-ass To downgrade your Docker subscription: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select the account you want to downgrade in the drop-down at the top-left of the page. -4. Select the action icon and then **Cancel subscription**. -5. Fill out the feedback survey to continue with cancellation. +1. Sign in to [Docker Home](https://app.docker.com/) and select +the organization you want to downgrade. +1. Select **Billing**. +1. Select the action icon and then **Cancel subscription**. +1. Fill out the feedback survey to continue with cancellation. {{< /tab >}} {{< tab name="Legacy Docker subscription" >}} @@ -97,20 +97,20 @@ If you have a [sales-assisted Docker Business subscription](details.md#sales-ass To downgrade your legacy Docker subscription: -1. Sign in to [Docker Hub Billing](https://hub.docker.com/billing). -2. Select the account you want to downgrade in the drop-down at the top-left of the page. -3. Select the link to **Manage this account on Docker Hub**. -4. In the plan section, select **Change plan**. -5. Follow the on-screen instructions to complete your downgrade. +1. Sign in to [Docker Hub](https://hub.docker.com/billing). +1. Select the organization you want to downgrade, then select **Billing**. +1. To downgrade, you must navigate to the upgrade plan page. Select **Upgrade**. +1. On the upgrade page, select **Downgrade** in the **Free Team** plan card. +1. Follow the on-screen instructions to complete your downgrade. ### Downgrade Docker Build Cloud subscription To downgrade your Docker Build Cloud subscription: -1. Sign in to [Docker Home](https://app.docker.com) and open **Docker Build Cloud**. -2. Select **Account settings**, then **Downgrade**. -3. To confirm your downgrade, type **DOWNGRADE** in the text field and select **Yes, continue**. -4. The account settings page will update with a notification bar notifying you of your downgrade date (start of next billing cycle). +1. Sign in to [Docker Home](https://app.docker.com) and select **Build Cloud**. +1. Select **Account settings**, then **Downgrade**. +1. To confirm your downgrade, type **DOWNGRADE** in the text field and select **Yes, continue**. +1. The account settings page will update with a notification bar notifying you of your downgrade date (start of next billing cycle). {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/subscription/manage-seats.md b/content/manuals/subscription/manage-seats.md index 66082bb2034e..dfa6410478b9 100644 --- a/content/manuals/subscription/manage-seats.md +++ b/content/manuals/subscription/manage-seats.md @@ -30,11 +30,11 @@ When you add seats to your subscription in the middle of your billing cycle, you To add seats to your subscription: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select your account from the drop-down menu in the top-left. -4. Select **Add seats**. -5. Follow the on-screen instructions to complete adding seats. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. Select **Add seats** and follow the on-screen instructions to complete +adding seats. > [!NOTE] > @@ -53,15 +53,15 @@ You can now add more members to your organization. For more information, see [Ma ### Add seats to Legacy Docker subscription 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-left, and select **Billing** from the drop-down menu. -3. On the Billing page, select **Add seats**. -4. Select the number of seats you want to add, then select **Purchase**. +1. Select your organization, then select **Billing**. +1. On the Billing page, select **Add seats**. +1. Select the number of seats you want to add, then select **Purchase**. ### Add seats to Docker Build Cloud -1. Sign in to Docker Build Cloud. -2. Select **Account settings**, then **Add seats**. -3. Select the number of seats you want to add, then select **Add seats**. +1. Sign in to [Docker Home](https://app.docker.com) and select **Build Cloud**. +1. Select **Account settings**, then **Add seats**. +1. Select the number of seats you want to add, then select **Add seats**. {{< /tab >}} {{< /tabs >}} @@ -87,11 +87,11 @@ For example, if you receive your billing on the 8th of every month for 10 seats To remove seats: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. Select your account from the drop-down menu in the top-left. -4. Select the action icon and then select **Remove seats**. -5. Follow the on-screen instructions to complete removing seats. +1. Sign in to [Docker Home](https://app.docker.com/) and select your +organization. +1. Select **Billing**. +1. In the **Seats** row, select the action icon, then **Remove seats**. +1. Follow the on-screen instructions to complete removing seats. You can cancel the removal of seats before your next billing cycle. To do so, select **Cancel change**. @@ -105,15 +105,15 @@ You can cancel the removal of seats before your next billing cycle. To do so, se ### Remove seats from Legacy Docker subscription 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select your avatar in the top-left, and select **Billing** from the drop-down menu. -3. On the Billing page, select **Remove seats**. -4. Follow the on-screen instructions to complete removing seats. +1. Select your organization, then select **Billing**. +1. On the Billing page, select **Remove seats**. +1. Follow the on-screen instructions to complete removing seats. ### Remove seats from Docker Build Cloud -1. Sign in to [Docker Build Cloud](https://app.docker.com/build). -2. Select **Account settings**, then **Remove seats**. -3. Follow the on-screen instructions to complete removing seats. +1. Sign in to [Docker Home](https://app.docker.com) and select **Build Cloud**. +1. Select **Account settings**, then **Remove seats**. +1. Follow the on-screen instructions to complete removing seats. {{< /tab >}} {{< /tabs >}} \ No newline at end of file diff --git a/content/manuals/subscription/scale.md b/content/manuals/subscription/scale.md index 1c2691f058c3..5e73e79c97bb 100644 --- a/content/manuals/subscription/scale.md +++ b/content/manuals/subscription/scale.md @@ -48,14 +48,13 @@ subscription period. You can pre-purchase Docker Build Cloud build minutes in the Docker Build Cloud Dashboard: -1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Billing**. -3. On the plan and usage page, select **View build minutes**. - This will launch the Docker Build Cloud settings page. -4. Select **Add minutes**. -5. Select your additional minute amount, then **Continue to payment**. -6. Enter your payment details and billing address. -7. Review your order and select **Pay**. +1. Sign in to [Docker Home](https://app.docker.com/) and choose +your organization. +1. Select **Build Cloud**, then **Build minutes**. +1. Select **Add prepaid minutes**. +1. Select your additional minute amount, then **Continue to payment**. +1. Enter your payment details and billing address. +1. Review your order and select **Pay**. Your additional minutes will now display on the Build minutes page. diff --git a/data/summary.yaml b/data/summary.yaml index 596e888c00b5..84f2aae2dc25 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -175,9 +175,6 @@ Docker Scout health scores: availability: Beta Docker Scout Mount Permissions: requires: Docker Desktop [4.34.0](/manuals/desktop/release-notes.md#4340) and later -Domain audit: - subscription: [Business] - for: Administrators Domain management: subscription: [Business] for: Administrators diff --git a/layouts/shortcodes/admin-domain-audit.md b/layouts/shortcodes/admin-domain-audit.md deleted file mode 100644 index 01e8da1179d1..000000000000 --- a/layouts/shortcodes/admin-domain-audit.md +++ /dev/null @@ -1,29 +0,0 @@ -{{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $domain_navigation := "Select **My Hub**, your organization, **Settings**, and then **Security**." }} -{{ $sso_link := "[SSO](/security/for-admins/single-sign-on/)" }} -{{ $scim_link := "[SCIM](/security/for-admins/provisioning/scim/)" }} - -{{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $domain_navigation = "Select your organization on the **Choose profile** page, and then select **Domain management**." }} - {{ $sso_link = "[SSO](/security/for-admins/single-sign-on/)" }} - {{ $scim_link = "[SCIM](/security/for-admins/provisioning/scim/)" }} -{{ end }} - -To audit your domains: - -1. Sign in to {{ $product_link }}. -2. {{ $domain_navigation }} -3. In **Domain Audit**, select **Export Users** to export a CSV file of uncaptured users with the following columns: - - - Name: The name of the user. - - Username: The Docker ID of the user. - - Email: The email address of the user. - -You can invite all the uncaptured users to your organization using the exported CSV file. For more details, see [Invite members](/admin/organization/members/). Optionally, enforce single sign-on or enable SCIM to add users to your organization automatically. For more details, see {{ $sso_link }} or {{ $scim_link }}. - -> [!NOTE] -> -> Domain audit may identify accounts of users who are no longer a part of your organization. If you don't want to add a user to your organization and you don't want the user to appear in future domain audits, the user must deactivate their account or update their associated email address. -> -> You can't deactivate an account or update an associated email address on behalf of a user. For more details, see [Deactivating an account](/manuals/accounts/deactivate-user-account.md). \ No newline at end of file diff --git a/layouts/shortcodes/admin-domains.html b/layouts/shortcodes/admin-domains.html index f3374f4c32d9..d9d51fac6119 100644 --- a/layouts/shortcodes/admin-domains.html +++ b/layouts/shortcodes/admin-domains.html @@ -2,8 +2,8 @@ {{ $domain_navigation := `Navigate to the domain settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} -{{ $product_link = "the [Admin Console](https://admin.docker.com)" }} -{{ $domain_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **Domain management**. Note that when an organization is part of a company, you must select the company and configure the domain for that organization at the company level. Each organization in a company can have its own domain, but it must be configured at the company level." }} +{{ $product_link = "[Docker Home](https://app.docker.com) and select your organization or company. Note that when an organization is part of a company, you must select the company and configure the domain for that organization at the company level. Each organization in a company can have its own domain, but it must be configured at the company level." }} +{{ $domain_navigation = "Select **Admin Console**, then **Domain management**." }} {{ end }} diff --git a/layouts/shortcodes/admin-image-access.html b/layouts/shortcodes/admin-image-access.html index a6d03ad3f5a6..11bd7d5ad54a 100644 --- a/layouts/shortcodes/admin-image-access.html +++ b/layouts/shortcodes/admin-image-access.html @@ -2,8 +2,8 @@ {{ $iam_navigation := "Select **My Hub**, select your organization in the left navigation drop-down menu, and then select **Image access**." }} {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $iam_navigation = "Select your organization in the left navigation drop-down menu, and then select **Image access**." }} + {{ $product_link = "[Docker Home](https://app.docker.com/) and select your organization." }} + {{ $iam_navigation = "Select **Admin Console**, then **Image access**." }} {{ end }} 1. Sign in to {{ $product_link }}. diff --git a/layouts/shortcodes/admin-org-audit-log.html b/layouts/shortcodes/admin-org-audit-log.html index eaed5a993371..a3d0802c5911 100644 --- a/layouts/shortcodes/admin-org-audit-log.html +++ b/layouts/shortcodes/admin-org-audit-log.html @@ -1,8 +1,9 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} {{ $audit_navigation := "Select **My Hub**, your organization, and then **Activity**." }} + {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $audit_navigation = "Select your organization in the left navigation drop-down menu, and then select **Activity logs**." }} + {{ $product_link = "[Docker Home](https://app.docker.com/) and select your organization." }} + {{ $audit_navigation = "Select **Admin Console**, then **Activity logs**." }} {{ end }} ### View the activity logs diff --git a/layouts/shortcodes/admin-registry-access.html b/layouts/shortcodes/admin-registry-access.html index 7e15ad4d5ad3..07364f8063b0 100644 --- a/layouts/shortcodes/admin-registry-access.html +++ b/layouts/shortcodes/admin-registry-access.html @@ -1,8 +1,9 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} {{ $ram_navigation := "Select **My Hub**, your organization, **Settings**, and then select **Registry Access**." }} + {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $ram_navigation = "Select your organization in the left navigation drop-down menu, and then select **Registry access**." }} + {{ $product_link = "[Docker Home](https://app.docker.com/) and select your organization." }} + {{ $ram_navigation = "Select **Admin Console**, then **Registry access**." }} {{ end }} To configure Registry Access Management permissions, perform the following steps: diff --git a/layouts/shortcodes/admin-scim-disable.html b/layouts/shortcodes/admin-scim-disable.html index 087ba1bdc41e..3b1499fd42db 100644 --- a/layouts/shortcodes/admin-scim-disable.html +++ b/layouts/shortcodes/admin-scim-disable.html @@ -3,8 +3,8 @@ - Organization: Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} -{{ $product_link = "the [Admin Console](https://admin.docker.com)" }} -{{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }} + {{ $product_link = "[Docker Home](https://app.docker.com/) and select your organization." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} 1. Sign in to {{ $product_link }}. diff --git a/layouts/shortcodes/admin-scim.html b/layouts/shortcodes/admin-scim.html index 46b8a6f84337..874ad92b5516 100644 --- a/layouts/shortcodes/admin-scim.html +++ b/layouts/shortcodes/admin-scim.html @@ -3,8 +3,8 @@ - Organization: Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} -{{ $product_link = "the [Admin Console](https://admin.docker.com)" }} -{{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM.**" }} + {{ $product_link = "[Docker Home](https://app.docker.com/) and select your organization." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} 1. Sign in to {{ $product_link }}. diff --git a/layouts/shortcodes/admin-sso-config.md b/layouts/shortcodes/admin-sso-config.md index 7f205e74bffe..4695913d8942 100644 --- a/layouts/shortcodes/admin-sso-config.md +++ b/layouts/shortcodes/admin-sso-config.md @@ -2,8 +2,8 @@ {{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $product_link = "[Docker Home](https://app.docker.com) and select your organization. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} > [!IMPORTANT] diff --git a/layouts/shortcodes/admin-sso-connect.md b/layouts/shortcodes/admin-sso-connect.md index 89ab466a2562..6d61bb7c83c4 100644 --- a/layouts/shortcodes/admin-sso-connect.md +++ b/layouts/shortcodes/admin-sso-connect.md @@ -2,8 +2,8 @@ {{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $product_link = "[Docker Home](https://app.docker.com) and select your organization. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} 1. In {{ $product_link }}, select the verified domains you want to apply the connection to. diff --git a/layouts/shortcodes/admin-sso-management-connections.md b/layouts/shortcodes/admin-sso-management-connections.md index a8759c363284..022ca6ccbce3 100644 --- a/layouts/shortcodes/admin-sso-management-connections.md +++ b/layouts/shortcodes/admin-sso-management-connections.md @@ -2,8 +2,8 @@ {{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $product_link = "[Docker Home](https://app.docker.com) and select your organization. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} ### Edit a connection diff --git a/layouts/shortcodes/admin-sso-management-orgs.md b/layouts/shortcodes/admin-sso-management-orgs.md index 12406a00f418..e22ee8b567f7 100644 --- a/layouts/shortcodes/admin-sso-management-orgs.md +++ b/layouts/shortcodes/admin-sso-management-orgs.md @@ -1,8 +1,9 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} {{ $sso_navigation := "Select **My Hub**, your organization, and then **Settings**." }} + {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your company from the **Choose profile** page, and then select **SSO and SCIM**." }} + {{ $product_link = "[Docker Home](https://app.docker.com) and select your organization. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} ### Connect an organization diff --git a/layouts/shortcodes/admin-sso-management.md b/layouts/shortcodes/admin-sso-management.md index 9d04bebfea8c..5155191a4102 100644 --- a/layouts/shortcodes/admin-sso-management.md +++ b/layouts/shortcodes/admin-sso-management.md @@ -2,8 +2,8 @@ {{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} - {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**." }} + {{ $product_link = "[Docker Home](https://app.docker.com) and select your organization. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select **Admin Console**, then **SSO and SCIM**." }} {{ end }} ### Remove a domain from an SSO connection diff --git a/layouts/shortcodes/admin-users.html b/layouts/shortcodes/admin-users.html index 853c93f3221d..66d946d3e111 100644 --- a/layouts/shortcodes/admin-users.html +++ b/layouts/shortcodes/admin-users.html @@ -17,9 +17,9 @@ {{ if eq (.Get "product") "admin" }} {{ $invite_button = "**Invite**" }} {{ $export_button = "the **Action** icon and then select **Export users as CSV**" }} -{{ $member_navigation = "Select your organization from the **Choose profile** page, and then select **Members**." }} +{{ $member_navigation = "Select **Members**." }} {{ $remove_button = "**Remove member**" }} -{{ $product_link = "the [Admin Console](https://admin.docker.com)" }} +{{ $product_link = "[Docker Home](https://app.docker.com) and select your organization." }} {{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/provisioning/scim/)" }} {{ if eq (.Get "layer") "company" }} {{ $export_fields = `The CSV file for a company contains the following fields: @@ -131,15 +131,15 @@ To resend an individual invitation: -1. In the [Admin Console](https://app.docker.com/admin), select your company. -2. Select **Users**. +1. In [Docker Home](https://app.docker.com/), select your company. +2. Select **Admin Console**, then **Users**. 3. Select the **action menu** next to the invitee and select **Resend**. 4. Select **Invite** to confirm. To bulk resend invitations: -1. In the [Admin Console](https://app.docker.com/admin), select your company. -2. Select **Users**. +1. In [Docker Home](https://app.docker.com/), select your company. +2. Select **Admin Console**, then **Users**. 3. Use the **checkboxes** next to **Usernames** to bulk select users. 4. Select **Resend invites**. 5. Select **Resend** to confirm.