From 3cab0ca97f0e0635cb2eef56d49c2a94b238856a Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 16 Jul 2026 12:52:28 -0500 Subject: [PATCH 1/6] Expand Docker accounts docs with identity concepts and freshness updates. Clarify individual vs organization accounts, refresh create/manage/deactivate/FAQ pages, and align terminology away from personal-account wording. Co-authored-by: Cursor --- content/manuals/accounts/_index.md | 104 ++++++++++++------ content/manuals/accounts/create-account.md | 97 ++++++++++------ .../accounts/deactivate-user-account.md | 55 +++++---- content/manuals/accounts/general-faqs.md | 35 ++++-- content/manuals/accounts/manage-account.md | 32 ++++-- 5 files changed, 212 insertions(+), 111 deletions(-) diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index e39a5f5ef399..4dc5510deeea 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -1,45 +1,83 @@ --- title: Docker accounts -description: Learn how to create and manage your Docker account -keywords: accounts, docker ID, account management, account settings, docker account, docker home +description: > + Learn what a Docker account is, how Docker IDs, emails, and sign-in methods + relate, and how individual accounts differ from organizations +keywords: accounts, docker ID, username, email, Google, GitHub, sign-in, account + management, docker account, individual account, organization account weight: 10 params: sidebar: group: Platform grid: -- title: Create a Docker ID - description: Get started with Docker and create an account. - icon: finger-print - link: /accounts/create-account/ -- title: Manage account - description: Learn how to manage the settings for your account. - icon: cog - link: /accounts/manage-account/ -- title: Personal access tokens - description: Learn how to create and manage access tokens for your account. - icon: lock-closed - link: /security/access-tokens/ -- title: Set up two-factor authentication - description: Add an extra layer of authentication to your Docker account. - link: /security/2fa/ - icon: device-phone-mobile -- title: Deactivate an account - description: Learn how to deactivate a Docker user account. - link: /accounts/deactivate-user-account/ - icon: no-symbol -- title: Account FAQ - description: Explore frequently asked questions about Docker accounts. - icon: question-mark-circle - link: /accounts/general-faqs/ + - title: Create an account + description: Get started with Docker and create an account. + icon: finger-print + link: /accounts/create-account/ + - title: Manage account + description: Learn how to manage the settings for your account. + icon: cog + link: /accounts/manage-account/ + - title: Personal access tokens + description: Learn how to create and manage access tokens for your account. + icon: lock-closed + link: /security/access-tokens/ + - title: Set up two-factor authentication + description: Add an extra layer of authentication to your Docker account. + link: /security/2fa/ + icon: device-phone-mobile + - title: Deactivate an account + description: Learn how to deactivate a Docker user account. + link: /accounts/deactivate-user-account/ + icon: no-symbol + - title: Account FAQ + description: Explore frequently asked questions about Docker accounts. + icon: question-mark-circle + link: /accounts/general-faqs/ --- -This section covers individual Docker accounts and Docker IDs. It does -not cover organizations, companies, or administrator roles. +A Docker account is your identity on Docker. With an account, you can access +Docker products and services such as Docker Hub and Docker Desktop, manage +security settings, and join organizations. -A Docker account is required to: -- Create a Docker ID -- Access Docker products and services like Docker Hub and Docker Desktop -- Receive organization invitations -- Manage your personal settings and security features +This section covers individual Docker accounts. For organizations, companies, +and administrator roles, see [Administration](/manuals/admin/_index.md). + +## Account identity + +When you create a Docker account, you choose a Docker ID and a sign-in method. +Docker also ties a verified email address to the account. These pieces work +together, but they aren't the same thing: + +- Your Docker account is where Docker associates your plans, Hub + repositories, and account settings. +- Your Docker ID identifies you with a unique username. +- You authenticate with email and password, Google, or GitHub. + +You can sign in with your Docker ID, email, or connected social account. +Docker still associates a verified email from that provider with your account. +You choose one sign-in method when you create your account. Docker doesn't +support linking multiple sign-in methods to the same Docker ID. + +For how to create an account, see +[Create a Docker account](/manuals/accounts/create-account.md). + +## Individual accounts and organization accounts + +Docker has two primary account types: + +- Individual accounts that are identified by a Docker ID. +- Organization accounts that are shared workspaces for teams and + repositories. + +Every organization is created and administered by one or more individual +accounts. You always sign in with your individual account, then work in the +organizations you own or belong to. Organization owners and members are +individual accounts that hold a role in that organization. + +To create and manage organizations, see +[Organization overview](/manuals/admin/organization/_index.md). + +## What's next {{< grid >}} diff --git a/content/manuals/accounts/create-account.md b/content/manuals/accounts/create-account.md index ec26fd1a15c0..bbfd5c282def 100644 --- a/content/manuals/accounts/create-account.md +++ b/content/manuals/accounts/create-account.md @@ -1,11 +1,11 @@ --- title: Create a Docker account -linkTitle: Create an account +linkTitle: Create weight: 10 -description: Learn how to register for a Docker ID and sign in to your account +description: Create a Docker ID with email, Google, or GitHub, then sign in keywords: - accounts, docker ID, billing, paid plans, support, Hub, Store, Forums, knowledge - base, beta access, email, activation, verification + create docker account, docker ID, sign up, sign in, email, Google, GitHub, + verification, OTP, password reset, docker login aliases: - /docker-hub/accounts/ - /docker-id/ @@ -13,52 +13,66 @@ aliases: You can create a free Docker account with your email address or by signing up with your Google or GitHub account. After creating a unique Docker ID, you can -access all Docker products, including Docker Hub, Docker Desktop, and Docker Scout. +access Docker products, including Docker Hub, Docker Desktop, and Docker Scout. -Your Docker ID becomes your username for hosted Docker services, and +Your Docker ID becomes your username for hosted Docker services and [Docker forums](https://forums.docker.com/). > [!TIP] > -> Explore [Docker's subscriptions](https://www.docker.com/pricing?ref=Docs&refAction=DocsCreateAccount) to see what else Docker can offer you. +> Explore +> [Docker's subscriptions](https://www.docker.com/pricing?ref=Docs&refAction=DocsCreateAccount) +> to see what else Docker can offer you. ## Create and verify your account -Signing up with an email address, Google, or GitHub account requires additional verification to complete account creation: +Signing up with an email address, Google, or GitHub requires verification +before you can sign in: -- If you sign up with Google or GitHub, you must first verify your email address with that provider. -- If you sign up with an email address, you need to follow verification steps. - - After creating an account, Docker asks for a one-time password (OTP). - - Find the email from Docker with your code, then return to the OTP page to paste in your OTP code. +- If you sign up with Google or GitHub, verify your email address with that + provider first. +- If you sign up with an email address, Docker sends a one-time password + (OTP). Enter the code from the Docker email on the OTP page. Docker blocks sign-in until you've verified your account. -### Sign up with your email +{{< tabs >}} +{{< tab name="Email" >}} -1. Go to the [Docker sign-up page](https://app.docker.com/signup/) and enter a unique, valid email address. -1. Enter a username to use as your Docker ID. Once you create your Docker ID - you can't reuse it in the future if you deactivate this account. Your username: - Must be between 4 and 30 characters long - Can only contain numbers and lowercase letters -1. Choose a password that's at least 9 characters long, then select **Sign Up**. -1. Verify your email address when you receive the Docker OTP verification email. This completes the registration process. +1. Go to the [Docker sign-up page](https://app.docker.com/signup/) and enter a + unique, valid email address. +1. Enter a username to use as your Docker ID. Once you create your Docker ID, + you can't reuse it if you deactivate this account. Your username: + - Must be between 4 and 30 characters long + - Can only contain numbers and lowercase letters +1. Choose a password that's at least 9 characters long, then select + **Sign Up**. +1. Verify your email address when you receive the Docker OTP verification + email. This completes the registration process. -### Sign up with Google or GitHub +{{< /tab >}} +{{< tab name="Google or GitHub" >}} 1. Go to the [Docker sign-up page](https://app.docker.com/signup/). 1. Select your social provider, Google or GitHub. 1. Select the social account you want to link to your Docker account. 1. Select **Authorize Docker** to let Docker access your social account - information. You will be re-routed to the sign-up page. + information. Docker redirects you to the sign-up page. 1. Enter a username to use as your Docker ID. Your username: - Must be between 4 and 30 characters long - Can only contain numbers and lowercase letters 1. Select **Sign up**. +{{< /tab >}} +{{< /tabs >}} + ## Sign in to your account -You can sign in with your email, Google or GitHub account, or from -the Docker CLI. +You can sign in with your email, Google or GitHub account, or from the Docker +CLI. -### Sign in with email or Docker ID +{{< tabs >}} +{{< tab name="Email or Docker ID" >}} 1. Go to the [Docker sign in page](https://login.docker.com). 1. Enter your email address or Docker ID and select **Continue**. @@ -66,18 +80,20 @@ the Docker CLI. To reset your password, see [Reset your password](#reset-your-password). -### Sign in with Google or GitHub +{{< /tab >}} +{{< tab name="Google or GitHub" >}} You can sign in using your Google or GitHub credentials. If your social -account uses the same email address as an existing Docker ID, the -accounts are automatically linked. +account uses the same email address as an existing Docker ID, the accounts +are automatically linked. If no Docker ID exists, Docker creates a new account for you. -Docker doesn't support linking multiple sign-in methods -to the same Docker ID. +Docker doesn't support linking multiple sign-in methods to the same Docker +ID. -### Sign in using the CLI +{{< /tab >}} +{{< tab name="CLI" >}} Use the `docker login` command to authenticate from the command line. For details, see [`docker login`](/reference/cli/docker/login/). @@ -89,9 +105,13 @@ details, see [`docker login`](/reference/cli/docker/login/). > > To improve security, use > [Docker credential helpers](https://github.com/docker/docker-credential-helpers). -> For even stronger protection, use a [personal access token](../security/access-tokens.md) -> instead of a password. This is especially useful in CI/CD environments -> or when credential helpers aren't available. +> For even stronger protection, use a +> [personal access token](../security/access-tokens.md) instead of a password. +> This is especially useful in CI/CD environments or when credential helpers +> aren't available. + +{{< /tab >}} +{{< /tabs >}} ## Reset your password @@ -104,11 +124,18 @@ To reset your password: ## Troubleshooting If you have a paid Docker subscription, -[contact the Support team](https://hub.docker.com/support/contact/) for assistance. +[contact the Support team](https://hub.docker.com/support/contact/) for +assistance. All Docker users can seek troubleshooting information and support through the -following resources, where Docker or the community respond on a best effort +following resources, where Docker or the community respond on a best-effort basis: - [Docker Community Forums](https://forums.docker.com/) -- [Docker Community Slack](http://dockr.ly/comm-slack) +- [Docker Community Slack](https://dockr.ly/comm-slack) + +## What's next + +- [Manage your account](./manage-account.md) +- [Enable two-factor authentication](../security/2fa/_index.md) +- [Docker accounts overview](./_index.md) diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index 0f95f0515055..bffec86278d2 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -1,16 +1,19 @@ --- title: Deactivate a Docker account -linkTitle: Deactivate an account +linkTitle: Deactivate weight: 30 -description: Learn how to deactivate a Docker user account. -keywords: Docker Hub, delete, deactivate, account, account management, delete Docker account, close Docker account, disable Docker account +description: Prerequisites and steps to deactivate an individual Docker account +keywords: + deactivate docker account, delete docker account, close docker account, + disable docker account, account management, leave organization, privacy + request --- -Learn how to deactivate an individual Docker account, including prerequisites required -for deactivation. +Learn how to deactivate an individual Docker account, including the +prerequisites required for deactivation. -For information on deactivating an organization, -see [Deactivating an organization](../admin/organization/deactivate-account.md). +For information on deactivating an organization, see +[Deactivate an organization](../admin/organization/deactivate-account.md). > [!WARNING] > @@ -19,29 +22,35 @@ see [Deactivating an organization](../admin/organization/deactivate-account.md). ## Prerequisites -Before deactivating your Docker account, ensure you meet the following requirements: +Before deactivating your Docker account, ensure you meet the following +requirements: -- If you are an organization or company owner, you must leave your organization - or company before deactivating your Docker account: - 1. Sign in to [Docker Home](https://app.docker.com/admin) and choose - your organization. +- If you are an organization or company owner, you must leave your + organization or company before deactivating your Docker account: + 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. -- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/plans/docker.md#cancel-a-docker-plan). -- Download any images and tags you want to keep. Use `docker pull -a ` - to pull all tags, or `docker pull :` to pull a specific tag. + owner of a company, either add someone else as a company owner and then + remove yourself, or deactivate the company. +- If you have an active Docker subscription, + [downgrade it to a Docker Personal subscription](../subscription/plans/docker.md#cancel-a-docker-plan). +- Download any images and tags you want to keep. Use + `docker pull -a ` to pull all tags, or `docker pull :` + to pull a specific tag. - If you linked a GitHub or Bitbucket account for automated builds, unlink it. - See [Unlink a GitHub user account](../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account) - or [Unlink a Bitbucket user account](../docker-hub/repos/manage/builds/link-source.md#unlink-a-bitbucket-user-account). + See + [Unlink a GitHub user account](../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account) + or + [Unlink a Bitbucket user account](../docker-hub/repos/manage/builds/link-source.md#unlink-a-bitbucket-user-account). ## Deactivate -Once you have completed all the previous steps, you can deactivate your account. +Once you have completed all the previous steps, you can deactivate your +account. > [!WARNING] > @@ -59,3 +68,9 @@ Once you have completed all the previous steps, you can deactivate your account. Deactivating your account does not delete your personal data. To request personal data deletion, fill out Docker's [Privacy request form](https://preferences.docker.com/). + +## What's next + +- [Manage your account](./manage-account.md) +- [Docker accounts overview](./_index.md) +- [Deactivate an organization](../admin/organization/deactivate-account.md) diff --git a/content/manuals/accounts/general-faqs.md b/content/manuals/accounts/general-faqs.md index 2b927f6e53cf..b4b41e0d6c19 100644 --- a/content/manuals/accounts/general-faqs.md +++ b/content/manuals/accounts/general-faqs.md @@ -1,9 +1,11 @@ --- -title: FAQs on Docker accounts -linkTitle: Accounts -weight: 10 -description: Frequently asked questions about Docker accounts -keywords: onboarding, docker, teams, orgs, user accounts, organization accounts +title: Docker accounts FAQs +linkTitle: FAQs +weight: 40 +description: FAQs about Docker IDs, account creation, and organization names +keywords: + docker ID, docker account FAQ, change docker ID, username taken, trademark, + organization name, organization namespace, create account, Google, GitHub tags: [FAQ] aliases: - /docker-hub/general-faqs/ @@ -12,38 +14,47 @@ aliases: - /admin/faqs/general-faqs/ --- -### What is a Docker ID? +## What is a Docker ID? A Docker ID is a username for your Docker account that lets you access Docker products. To create a Docker ID you need one of the following: - An email address -- A social account +- A Google account - A GitHub account Your Docker ID must be between 4 and 30 characters long, and can only contain numbers and lowercase letters. You can't use any special characters or spaces. -For more information, see [Create a Docker ID](/manuals/accounts/create-account.md). +For more information, see +[Create a Docker account](/manuals/accounts/create-account.md). -### Can I change my Docker ID? +## Can I change my Docker ID? No. You can't change your Docker ID once it's created. If you need a different Docker ID, you must create a new Docker account with a new Docker ID. Docker IDs can't be reused after deactivation. -### What if my Docker ID is taken? +## What if my Docker ID is taken? All Docker IDs are first-come, first-served except for companies that have a U.S. Trademark on a username. -If you have a trademark for your namespace, +If you have a trademark for your Docker ID, [Docker Support](https://hub.docker.com/support/contact/) can retrieve the Docker ID for you. -### What's an organization name or namespace? +## What's an organization name or namespace? The organization name, sometimes referred to as the organization namespace or the organization ID, is the unique identifier of a Docker organization. The organization name can't be the same as an existing Docker ID. + +For more information, see +[Organization overview](/manuals/admin/organization/_index.md). + +## What's next + +- [Docker accounts overview](./_index.md) +- [Create a Docker account](./create-account.md) diff --git a/content/manuals/accounts/manage-account.md b/content/manuals/accounts/manage-account.md index 5c05f335622e..20cc3e4d4a94 100644 --- a/content/manuals/accounts/manage-account.md +++ b/content/manuals/accounts/manage-account.md @@ -1,24 +1,27 @@ --- title: Manage a Docker account -linkTitle: Manage an account +linkTitle: Manage weight: 20 -description: Learn how to manage your Docker account. -keywords: accounts, docker ID, account settings, account management, docker home +description: Update account settings, email, password, 2FA, tokens, and connected accounts +keywords: + manage docker account, account settings, update email, change password, + Gravatar, two-factor authentication, personal access tokens, Google, GitHub, + connected accounts, convert account, deactivate account, Docker Home --- -You can centrally manage your Docker account using Docker Home, including +You can centrally manage your Docker account in Docker Home, including administrative and security settings. > [!TIP] > > If your account is associated with an organization that enforces single > sign-on (SSO), you may not have permissions to update your account settings. -> You must contact your administrator to update your settings. +> Contact your administrator to update your settings. ## Update account information Account information is visible on your **Account settings** page. You can -update the following account information: +update the following: - Full name - Company @@ -40,7 +43,8 @@ To update your email address: 1. Sign in to your [Docker account](https://app.docker.com/login). 1. Go to **Settings**, then choose **Email**. -1. Enter your new email address and confirm your identity with your password. Select **Verify email**. +1. Enter your new email address and confirm your identity with your password. + Select **Verify email**. 1. Go to the new Docker email and copy the 6-digit verification code. 1. Paste the verification code to complete updating your email. @@ -54,13 +58,13 @@ Your verification session expires after 15 minutes. ## Change your password -You can change your password by initiating a password reset via email. To change your password: +You can change your password by starting a password reset by email: 1. Sign in to your [Docker account](https://app.docker.com/login). 1. Select your avatar in the top-right corner and select **Account settings**. 1. Select **Password**, then **Reset password**. -1. Docker will send you a password reset email with instructions to reset - your password. +1. Docker sends you a password reset email with instructions to reset your + password. ## Manage two-factor authentication @@ -107,4 +111,10 @@ For information on converting your account into an organization, see ## Deactivate your account For information on deactivating your account, see -[Deactivating a user account](./deactivate-user-account.md). +[Deactivate a Docker account](./deactivate-user-account.md). + +## What's next + +- [Docker accounts overview](./_index.md) +- [Create a Docker account](./create-account.md) +- [Enable two-factor authentication](../security/2fa/_index.md) From 7650df6cb7004bb32de43adbee84541ba08982bc Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 16 Jul 2026 13:07:16 -0500 Subject: [PATCH 2/6] Simplify Docker accounts overview and fix sign-in linking docs. Tighten account identity framing, surface Organization overview in the grid, and align create-account linking language with email-plus-one-social behavior. Co-authored-by: Cursor --- content/manuals/accounts/_index.md | 40 +++++++------------ content/manuals/accounts/create-account.md | 11 +++-- .../admin/organization/deactivate-account.md | 2 +- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index 4dc5510deeea..c57f97f60c47 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -26,41 +26,34 @@ grid: description: Add an extra layer of authentication to your Docker account. link: /security/2fa/ icon: device-phone-mobile - - title: Deactivate an account - description: Learn how to deactivate a Docker user account. - link: /accounts/deactivate-user-account/ - icon: no-symbol - - title: Account FAQ + - title: Organization overview + description: Learn how to create and manage Docker organizations. + icon: building-storefront + link: /admin/organization/ + - title: Account FAQs description: Explore frequently asked questions about Docker accounts. icon: question-mark-circle link: /accounts/general-faqs/ --- -A Docker account is your identity on Docker. With an account, you can access -Docker products and services such as Docker Hub and Docker Desktop, manage -security settings, and join organizations. +A Docker account is your identity on Docker. Use it to access products like +Docker Hub and Docker Desktop, manage settings, and join organizations. -This section covers individual Docker accounts. For organizations, companies, -and administrator roles, see [Administration](/manuals/admin/_index.md). +This section covers individual accounts. For organizations and companies, see +[Administration](/manuals/admin/_index.md). ## Account identity -When you create a Docker account, you choose a Docker ID and a sign-in method. -Docker also ties a verified email address to the account. These pieces work -together, but they aren't the same thing: +When you create an account, you choose a Docker ID and a sign-in method. +Docker also ties a verified email to the account. These aren't the same thing: - Your Docker account is where Docker associates your plans, Hub repositories, and account settings. - Your Docker ID identifies you with a unique username. -- You authenticate with email and password, Google, or GitHub. - -You can sign in with your Docker ID, email, or connected social account. -Docker still associates a verified email from that provider with your account. -You choose one sign-in method when you create your account. Docker doesn't -support linking multiple sign-in methods to the same Docker ID. - -For how to create an account, see -[Create a Docker account](/manuals/accounts/create-account.md). +- Your email is how Docker contacts you for notifications and + security-related communications. +- Your sign-in method (email and password, Google, or GitHub) is how + you authenticate. ## Individual accounts and organization accounts @@ -75,9 +68,6 @@ accounts. You always sign in with your individual account, then work in the organizations you own or belong to. Organization owners and members are individual accounts that hold a role in that organization. -To create and manage organizations, see -[Organization overview](/manuals/admin/organization/_index.md). - ## What's next {{< grid >}} diff --git a/content/manuals/accounts/create-account.md b/content/manuals/accounts/create-account.md index bbfd5c282def..ea94f7410015 100644 --- a/content/manuals/accounts/create-account.md +++ b/content/manuals/accounts/create-account.md @@ -46,7 +46,7 @@ Docker blocks sign-in until you've verified your account. - Must be between 4 and 30 characters long - Can only contain numbers and lowercase letters 1. Choose a password that's at least 9 characters long, then select - **Sign Up**. + **Sign up**. 1. Verify your email address when you receive the Docker OTP verification email. This completes the registration process. @@ -74,7 +74,7 @@ CLI. {{< tabs >}} {{< tab name="Email or Docker ID" >}} -1. Go to the [Docker sign in page](https://login.docker.com). +1. Go to the [Docker sign in page](https://login.docker.com/). 1. Enter your email address or Docker ID and select **Continue**. 1. Enter your password and select **Continue**. @@ -84,13 +84,12 @@ To reset your password, see [Reset your password](#reset-your-password). {{< tab name="Google or GitHub" >}} You can sign in using your Google or GitHub credentials. If your social -account uses the same email address as an existing Docker ID, the accounts -are automatically linked. +account uses the same email address as an existing Docker ID, Docker links +that provider to the account. If no Docker ID exists, Docker creates a new account for you. -Docker doesn't support linking multiple sign-in methods to the same Docker -ID. +You can't link both Google and GitHub to the same Docker ID. {{< /tab >}} {{< tab name="CLI" >}} diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md index c79dcc541e32..02758315599c 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -12,7 +12,7 @@ aliases: Learn how to deactivate a Docker organization, including required prerequisite steps. For information about deactivating user -accounts, see [Deactivate a user account](../../accounts/deactivate-user-account.md). +accounts, see [Deactivate a Docker account](../../accounts/deactivate-user-account.md). > [!WARNING] > From 51b84ae4a22627b2258e28729ee0734b8a3f199e Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 16 Jul 2026 13:09:16 -0500 Subject: [PATCH 3/6] Clarify connected accounts vs sign-in method linking. Spell out that disconnecting Google or GitHub removes OAuth access without changing the Docker ID or adding another sign-in method. Co-authored-by: Cursor --- content/manuals/accounts/manage-account.md | 23 ++++++---------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/content/manuals/accounts/manage-account.md b/content/manuals/accounts/manage-account.md index 20cc3e4d4a94..cd5c43390953 100644 --- a/content/manuals/accounts/manage-account.md +++ b/content/manuals/accounts/manage-account.md @@ -90,7 +90,12 @@ For more information, see ## Manage connected accounts -You can unlink connected Google or GitHub accounts: +If you signed up with Google or GitHub, that provider appears under +**Connected accounts**. Disconnecting it removes the OAuth connection. It +doesn't change your Docker ID, and it doesn't let you add a different sign-in +method. You can't connect both Google and GitHub to the same account. + +To disconnect a connected account: 1. Sign in to your [Docker account](https://app.docker.com/login). 1. Select your avatar in the top-right corner and select **Account settings**. @@ -102,19 +107,3 @@ or GitHub. See Google or GitHub's documentation for more information: - [Manage connections between your Google Account and third-parties](https://support.google.com/accounts/answer/13533235?hl=en) - [Reviewing and revoking authorization of GitHub Apps](https://docs.github.com/en/apps/using-github-apps/reviewing-and-revoking-authorization-of-github-apps) - -## Convert your account - -For information on converting your account into an organization, see -[Convert an account into an organization](../admin/organization/setup/convert-account.md). - -## Deactivate your account - -For information on deactivating your account, see -[Deactivate a Docker account](./deactivate-user-account.md). - -## What's next - -- [Docker accounts overview](./_index.md) -- [Create a Docker account](./create-account.md) -- [Enable two-factor authentication](../security/2fa/_index.md) From d01935d448d642302fdfc0f741e3cef0f92aad3d Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 16 Jul 2026 13:09:38 -0500 Subject: [PATCH 4/6] Restore convert, deactivate, and next-step links on manage account. Keep the connected-accounts clarification while putting back the sections dropped in the prior commit. Co-authored-by: Cursor --- content/manuals/accounts/manage-account.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/content/manuals/accounts/manage-account.md b/content/manuals/accounts/manage-account.md index cd5c43390953..e574c25c7e31 100644 --- a/content/manuals/accounts/manage-account.md +++ b/content/manuals/accounts/manage-account.md @@ -107,3 +107,19 @@ or GitHub. See Google or GitHub's documentation for more information: - [Manage connections between your Google Account and third-parties](https://support.google.com/accounts/answer/13533235?hl=en) - [Reviewing and revoking authorization of GitHub Apps](https://docs.github.com/en/apps/using-github-apps/reviewing-and-revoking-authorization-of-github-apps) + +## Convert your account + +For information on converting your account into an organization, see +[Convert an account into an organization](../admin/organization/setup/convert-account.md). + +## Deactivate your account + +For information on deactivating your account, see +[Deactivate a Docker account](./deactivate-user-account.md). + +## What's next + +- [Docker accounts overview](./_index.md) +- [Create a Docker account](./create-account.md) +- [Enable two-factor authentication](../security/2fa/_index.md) From b02d5d1e2215bb01fd88d84cc632bf1695ffb070 Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 16 Jul 2026 13:11:33 -0500 Subject: [PATCH 5/6] Tighten accounts overview wording and drop redundant What's next sections. Rely on the overview grid for navigation instead of repeating next-step lists on create, deactivate, and FAQ pages. Co-authored-by: Cursor --- content/manuals/accounts/_index.md | 4 ++-- content/manuals/accounts/create-account.md | 6 ------ content/manuals/accounts/deactivate-user-account.md | 6 ------ content/manuals/accounts/general-faqs.md | 5 ----- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index c57f97f60c47..c20251cc3721 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -36,7 +36,7 @@ grid: link: /accounts/general-faqs/ --- -A Docker account is your identity on Docker. Use it to access products like +A Docker account is how Docker identifies you. Use it to access products like Docker Hub and Docker Desktop, manage settings, and join organizations. This section covers individual accounts. For organizations and companies, see @@ -45,7 +45,7 @@ This section covers individual accounts. For organizations and companies, see ## Account identity When you create an account, you choose a Docker ID and a sign-in method. -Docker also ties a verified email to the account. These aren't the same thing: +Docker also ties a verified email to the account. - Your Docker account is where Docker associates your plans, Hub repositories, and account settings. diff --git a/content/manuals/accounts/create-account.md b/content/manuals/accounts/create-account.md index ea94f7410015..4efe6565f5be 100644 --- a/content/manuals/accounts/create-account.md +++ b/content/manuals/accounts/create-account.md @@ -132,9 +132,3 @@ basis: - [Docker Community Forums](https://forums.docker.com/) - [Docker Community Slack](https://dockr.ly/comm-slack) - -## What's next - -- [Manage your account](./manage-account.md) -- [Enable two-factor authentication](../security/2fa/_index.md) -- [Docker accounts overview](./_index.md) diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index bffec86278d2..17e5d7db5529 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -68,9 +68,3 @@ account. Deactivating your account does not delete your personal data. To request personal data deletion, fill out Docker's [Privacy request form](https://preferences.docker.com/). - -## What's next - -- [Manage your account](./manage-account.md) -- [Docker accounts overview](./_index.md) -- [Deactivate an organization](../admin/organization/deactivate-account.md) diff --git a/content/manuals/accounts/general-faqs.md b/content/manuals/accounts/general-faqs.md index b4b41e0d6c19..8e248e93204a 100644 --- a/content/manuals/accounts/general-faqs.md +++ b/content/manuals/accounts/general-faqs.md @@ -53,8 +53,3 @@ organization name can't be the same as an existing Docker ID. For more information, see [Organization overview](/manuals/admin/organization/_index.md). - -## What's next - -- [Docker accounts overview](./_index.md) -- [Create a Docker account](./create-account.md) From 20a9e67219e5a1bc8af185aa0ed906a4bb583800 Mon Sep 17 00:00:00 2001 From: Alexa Date: Fri, 17 Jul 2026 08:10:15 -0500 Subject: [PATCH 6/6] Move account-types overview to org docs and cross-link both sides. Keep a brief account-types pointer on the accounts index with links to Organizations and Administration, and document individual vs organization accounts on the organization overview with a link back to Accounts. Co-authored-by: Cursor --- content/manuals/accounts/_index.md | 41 +++++++------------- content/manuals/admin/organization/_index.md | 33 ++++++++++++---- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index c20251cc3721..1c5924476101 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -2,9 +2,10 @@ title: Docker accounts description: > Learn what a Docker account is, how Docker IDs, emails, and sign-in methods - relate, and how individual accounts differ from organizations -keywords: accounts, docker ID, username, email, Google, GitHub, sign-in, account - management, docker account, individual account, organization account + relate, and how individual accounts connect to organizations +keywords: accounts, docker ID, username, email, Google, GitHub, sign-in, + authentication, account management, docker account, individual account, + organization account, account types, Docker Hub weight: 10 params: sidebar: @@ -39,34 +40,22 @@ grid: A Docker account is how Docker identifies you. Use it to access products like Docker Hub and Docker Desktop, manage settings, and join organizations. -This section covers individual accounts. For organizations and companies, see -[Administration](/manuals/admin/_index.md). +Docker has two primary account types: individual and organization. You create +and administer organizations with your individual account. For organization +accounts, see [Organizations](/manuals/admin/organization/_index.md). For +organizations and companies, see [Administration](/manuals/admin/_index.md). -## Account identity +## Docker ID, email, and sign-in When you create an account, you choose a Docker ID and a sign-in method. Docker also ties a verified email to the account. -- Your Docker account is where Docker associates your plans, Hub - repositories, and account settings. -- Your Docker ID identifies you with a unique username. -- Your email is how Docker contacts you for notifications and - security-related communications. -- Your sign-in method (email and password, Google, or GitHub) is how - you authenticate. - -## Individual accounts and organization accounts - -Docker has two primary account types: - -- Individual accounts that are identified by a Docker ID. -- Organization accounts that are shared workspaces for teams and - repositories. - -Every organization is created and administered by one or more individual -accounts. You always sign in with your individual account, then work in the -organizations you own or belong to. Organization owners and members are -individual accounts that hold a role in that organization. +- Docker account: Associates your plans, Hub repositories, and account + settings. +- Docker ID: A unique username that identifies you. +- Email: How Docker contacts you for notifications and security-related + communications. +- Sign-in method: Email and password, Google, or GitHub. ## What's next diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md index 8adf3e3f60a3..529931681ec9 100644 --- a/content/manuals/admin/organization/_index.md +++ b/content/manuals/admin/organization/_index.md @@ -2,8 +2,12 @@ title: Organization overview linkTitle: Organization weight: 10 -description: Learn how to manage your Docker organization, including teams, members, permissions, and settings. -keywords: organizations, admin, overview, manage teams, roles, members, permissions, organization settings +description: > + Learn how Docker organization accounts relate to individual accounts, and how + to manage teams, members, permissions, and settings. +keywords: organizations, admin, overview, manage teams, roles, members, + permissions, organization settings, organization account, individual account, + Docker ID, account types, owners, teams grid: - title: Onboard your organization description: Learn how to onboard and secure your organization. @@ -25,19 +29,34 @@ grid: link: /enterprise/security/ --- -A Docker organization is a collection of teams and repositories with centralized -management. It helps administrators group members and assign access in a -streamlined, scalable way. +A Docker organization is a collection of teams and repositories under +centralized management. Organization administrators group members and +assign repository access at scale. ## Organization structure The following diagram shows how organizations relate to teams and members. -![Diagram showing how teams and members relate within a Docker organization](/admin/images/org-structure.webp) +![Diagram showing how teams and members relate within a Docker +organization](/admin/images/org-structure.webp) -For how organizations fit into the broader company hierarchy, see the +For how organizations fit into the broader company hierarchy, see [administration overview](/manuals/admin/_index.md#company-and-organization-hierarchy). +## Individual and organization accounts + +Docker has two primary account types: + +- Individual accounts that are identified by a Docker ID. +- Organization accounts that are shared workspaces for teams and + repositories. + +Every organization is created and administered by one or more individual +accounts. You always sign in with your individual account, then work in the +organizations you own or belong to. Organization owners and members are +individual accounts that hold a role in that organization. For individual +accounts, see [Accounts](/manuals/accounts/_index.md). + ## Organization roles An organization includes owners, members, and optional teams. Organization