From ec20f5e360517573cbba196b6dd83d7770f1496c Mon Sep 17 00:00:00 2001 From: Stephanie Aurelio <133041642+stephaurelio@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:29:28 -0700 Subject: [PATCH] Add account section and update settings and security (#20350) * add account section and update admin pages * update hub build and security sections * update toc * Update content/accounts/_index.md * Update .github/labeler.yml --------- Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> --- .github/labeler.yml | 5 ++ .../config/vocabularies/Docker/accept.txt | 1 + content/accounts/_index.md | 32 +++++++++ content/accounts/deactivate-user-account.md | 50 +++++++++++++ content/accounts/manage-account.md | 68 ++++++++++++++++++ content/admin/convert-account.md | 14 ++-- content/admin/deactivate-account.md | 54 +++----------- content/admin/faqs/general-faqs.md | 4 ++ content/docker-hub/builds/link-source.md | 21 +++--- .../images/docker-hub-repo-settings-menu.png | Bin 0 -> 7091 bytes content/docker-hub/repos/_index.md | 12 ++++ content/docker-id/_index.md | 4 +- content/security/for-developers/2fa/_index.md | 16 ++--- .../for-developers/2fa/disable-2fa.md | 12 ++-- .../for-developers/2fa/new-recovery-code.md | 10 +-- .../for-developers/2fa/recover-hub-account.md | 2 +- .../security/for-developers/access-tokens.md | 29 ++++---- data/toc.yaml | 17 +++-- 18 files changed, 255 insertions(+), 96 deletions(-) create mode 100644 content/accounts/_index.md create mode 100644 content/accounts/deactivate-user-account.md create mode 100644 content/accounts/manage-account.md create mode 100644 content/docker-hub/images/docker-hub-repo-settings-menu.png diff --git a/.github/labeler.yml b/.github/labeler.yml index 6bf0e7006fa..d6835d717b8 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -124,6 +124,11 @@ area/storage: - any-glob-to-any-file: - content/storage/** +area/accounts: + - changed-files: + - any-glob-to-any-file: + - content/accounts/** + hugo: - changed-files: - any-glob-to-any-file: diff --git a/.github/vale/config/vocabularies/Docker/accept.txt b/.github/vale/config/vocabularies/Docker/accept.txt index 5f782e1381f..361f3301c33 100644 --- a/.github/vale/config/vocabularies/Docker/accept.txt +++ b/.github/vale/config/vocabularies/Docker/accept.txt @@ -60,6 +60,7 @@ Git GitHub( Actions)? Google Grafana +Gravatar HTTP HyperKit IPs? diff --git a/content/accounts/_index.md b/content/accounts/_index.md new file mode 100644 index 00000000000..91f6062dc70 --- /dev/null +++ b/content/accounts/_index.md @@ -0,0 +1,32 @@ +--- +description: Learn how to create and manage your Docker account. +keywords: accounts, docker ID, account management, account settings, docker account, docker home +title: Docker account overview +grid: +- title: Create a Docker ID + description: Get started with Docker and create an account. + icon: fingerprint + link: /docker-id/ +- title: Manage account + description: Learn how to manage the settings for your account. + icon: manage_accounts + link: /accounts/manage-account/ +- title: Account FAQ + description: Explore popular FAQ topics about organizations. + icon: help + link: /faq/admin/general-faqs/ +- title: Personal access tokens + description: Learn how to create and manage access tokens for your account. + icon: password + link: /security/for-developers/access-tokens/ +- title: Set up two-factor authentication + description: Add an extra layer of authentication to your Docker account. + link: /security/for-developers/2fa/ + icon: phonelink_lock +--- + +You can create a Docker account to secure a Docker ID, which is a username for your account that lets you access Docker products. You can use your Docker account to sign in to Docker products like Docker Hub, Docker Desktop, or Docker Scout. You can centrally manage your [Docker account settings](https://app.docker.com/settings), as well as account security features, in [Docker Home](https://app.docker.com). + +In this section, explore how you can create, manage, or update your account. + +{{< grid >}} \ No newline at end of file diff --git a/content/accounts/deactivate-user-account.md b/content/accounts/deactivate-user-account.md new file mode 100644 index 00000000000..51e7ff2415e --- /dev/null +++ b/content/accounts/deactivate-user-account.md @@ -0,0 +1,50 @@ +--- +title: Deactivating a user account +description: Learn how to deactivate a Docker user account. +keywords: Docker Hub, delete, deactivate, account, account management +--- + +You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate a user account. For information on deactivating an organization, see [Deactivating an organization](../admin/deactivate-account.md). + +>**Warning** +> +> All Docker products and services that use your Docker account will be inaccessible after deactivating your account. +{ .warning } + +## Prerequisites + +Before deactivating your Docker account, ensure that you meet the following requirements: + +- You must not be a member of a company or any teams or organizations. You must remove the account from all teams, organizations, or the company. + + To do this: + 1. Navigate to **Organizations** and then select the organization(s) you need to leave. + 2. Find your username in the **Members** tab. + 3. Select the **More options** menu and then select **Leave organization**. + +- If you are the sole owner of an organization, either assign another member of the organization the owner role 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/core-subscription/downgrade.md). + +- If you have an active Docker Build Cloud Paid subscription, [downgrade it to a Docker Build Cloud Starter subscription](../billing/build-billing.md#downgrade-your-subscription). + +- If you have an active Docker Scout subscription, [downgrade it to a Docker Scout Free subscription](../billing/scout-billing.md#downgrade-your-subscription). + +- Download any images and tags you want to keep. Use `docker pull -a :`. + +- Unlink your [GitHub and Bitbucket accounts](../docker-hub/builds/link-source.md#unlink-a-github-user-account). + +## Deactivate + +Once you have completed all the previous steps, you can deactivate your account. + +> **Warning** +> +> This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it. +{ .warning } + +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**. +4. In the **Account management** section, select **Deactivate account** to open to deactivate account page. +5. To confirm, select **Deactivate account**. \ No newline at end of file diff --git a/content/accounts/manage-account.md b/content/accounts/manage-account.md new file mode 100644 index 00000000000..eaf8e515fcd --- /dev/null +++ b/content/accounts/manage-account.md @@ -0,0 +1,68 @@ +--- +description: Learn how to manage settings for your Docker account. +keywords: accounts, docker ID, account settings, account management, docker home +title: Manage your Docker account +--- + +You can centrally manage the settings for your Docker account. Here you can also take administrative actions for your account and manage your account security. + +> **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 need to contact your administrator to update your settings. +{ .tip } + +## Update general settings + +1. Sign in to your [Docker account](https://account.docker.com/login). +2. In Docker Home, select your avatar in the top-right corner to open the drop-down. +3. Select **Account settings**. + +From here, you can take any of the following actions. + +### Update account information + +To update your account information, select the arrow icon. You can edit the following settings here: + +- Full name +- Company +- Location +- Website +- Gravatar email + +This information is visible on your account profile in Docker Hub. + +Make your changes here, then select **Save** to save your settings. + +### Update email address + +To update your email address, select the arrow icon. + +1. Enter your new email address. +2. Enter your password to confirm the change. +3. Select **Send verification email** to send a verification email to your new email address. + +Once you verify your email address, your account information will update. + +### Change your password + +You can change your password by initiating a password reset via email. + +To change your password, select **Reset password**. + +Follow the instructions in the password reset email. + +## Manage security settings + +You can manage the security settings for your account in Docker Home. + +For information on two-factor authentication (2FA) for your account, see [Enable two-factor authentication](../security/for-developers/2fa/_index.md) to get started. + +For information on personal access tokens (PAT), see [Create and manage access tokens](../security/for-developers/access-tokens.md). + +## Account management + +You can take administrative actions for your account in Docker Home. + +For more information on converting your account, see [Convert an account into an organization](../admin/convert-account.md). + +For information on deactivating your account, see [Deactivating a user account](./deactivate-user-account.md). \ No newline at end of file diff --git a/content/admin/convert-account.md b/content/admin/convert-account.md index 11c93777eec..aba1356cbdb 100644 --- a/content/admin/convert-account.md +++ b/content/admin/convert-account.md @@ -50,12 +50,16 @@ Consider the following effects of converting your account: 1. Ensure you have removed your user account from any company or teams or organizations. Also make sure that you have a new Docker ID before you convert an account. See the [Prerequisites](#prerequisites) section for details. -2. In the top-right of Docker Hub, select your account name and then from the drop-down menu, select **Account settings**. +2. Sign in to your [Docker account](https://app.docker.com/login). -3. From the **Convert Account** tab, select **Convert to Organization**. +3. In Docker Home, select your avatar in the top-right corner to open the drop-down. -4. Review the warning displayed about converting a user account. This action cannot be undone and has considerable implications for your assets and the account. +4. Select **Account settings**. -5. Enter a **Docker ID** 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. +5. In the **Account management** section, select **Convert account**. -6. Select **Convert and Purchase** to confirm. The new owner receives a notification email. Use that owner account to sign in to your new organization. +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 **Docker ID** 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 and purchase** to confirm. The new owner receives a notification email. Use that owner account to sign in and manage the new organization. diff --git a/content/admin/deactivate-account.md b/content/admin/deactivate-account.md index 4b1664245f2..2092cf328b2 100644 --- a/content/admin/deactivate-account.md +++ b/content/admin/deactivate-account.md @@ -1,62 +1,26 @@ --- -title: Deactivating an account or an organization -description: Learn how to deactivate a Docker Hub account or an organization -keywords: Docker Hub, delete, deactivate, account, organization +title: Deactivating an organization +description: Learn how to deactivate a Docker organization. +keywords: Docker Hub, delete, deactivate organization, account, organization management aliases: - /docker-hub/deactivate-account/ --- -You can deactivate an account at any time. +You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate an organization account. For information on deactivating a user account, see [Deactivate a user account](../accounts/deactivate-user-account.md). >**Warning** > > All Docker products and services that use your Docker account or organization account will be inaccessible after deactivating your account. { .warning } -## Deactivate a user account - -### Prerequisites - -Before deactivating your Docker account, ensure that you meet the following requirements: - -- You must not be a member of a company or any teams or organizations. You must remove the account from all teams, organizations, or the company. - - To do this: - 1. Navigate to **Organizations** and then select the organization(s) you need to leave. - 2. Find your username in the **Members** tab. - 3. Select the **More options** menu and then select **Leave organization**. - -- If you are the sole owner of an organization, either assign another member of the organization the owner role 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/core-subscription/downgrade.md). - -- If you have an active Docker Build Cloud Team subscription, [downgrade it to a Docker Build Cloud Starter subscription](../billing/build-billing.md#downgrade-your-subscription). - -- If you have an active Docker Scout subscription, [downgrade it to a Docker Scout Free subscription](../billing/scout-billing.md#downgrade-your-subscription). - -- Download any images and tags you want to keep. Use `docker pull -a :`. - -- Unlink your [Github and Bitbucket accounts](../docker-hub/builds/link-source.md#unlink-a-github-user-account). - -### Deactivate - -Once you have completed all the steps above, you can deactivate your account. - -1. Select your account name in the top-right of Docker Hub and from the drop-down menu, select **Account settings**. -2. From the **Deactivate Account** tab, select **Deactivate account**. - -> This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it. -{ .warning } - - -## Deactivate an organization +## Prerequisites 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 **Docker Free Team** subscription](../subscription/core-subscription/downgrade.md). +- If you have an active Docker subscription, [downgrade it to a free subscription](../subscription/core-subscription/downgrade.md). - If you have an active Docker Scout subscription, [downgrade it to a Docker Scout Free subscription](../billing/scout-billing.md#downgrade-your-subscription). @@ -64,10 +28,12 @@ Before deactivating an organization, complete the following: - Unlink your [Github and Bitbucket accounts](../docker-hub/builds/link-source.md#unlink-a-github-user-account). -### Deactivate +## Deactivate -Once you have completed all the previous the steps, you can deactivate your organization. +Once you have completed all the previous steps, you can deactivate your organization. +> **Warning** +> > This cannot be undone. Be sure you've gathered all the data you need from your organization before deactivating it. { .warning } diff --git a/content/admin/faqs/general-faqs.md b/content/admin/faqs/general-faqs.md index c9008392e90..bb10c6bbf4e 100644 --- a/content/admin/faqs/general-faqs.md +++ b/content/admin/faqs/general-faqs.md @@ -71,3 +71,7 @@ A [service account](../../docker-hub/service-accounts.md) is a Docker ID used fo Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../../admin/deactivate-account.md). If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](../../admin/organization/members.md#remove-a-member-from-a-team). + +### How do I manage settings for a user account? + +You can manage your account settings any time 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. diff --git a/content/docker-hub/builds/link-source.md b/content/docker-hub/builds/link-source.md index 48e73d02d46..d3563530536 100644 --- a/content/docker-hub/builds/link-source.md +++ b/content/docker-hub/builds/link-source.md @@ -25,9 +25,12 @@ If you are linking a source code provider to create autobuilds for a team, follo 1. Sign in to Docker Hub. -2. Select **Account settings** in the top-right drop-down navigation, then select the **Linked Accounts** tab. +2. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. -3. Select **Link provider** for the source provider you want to link. + ![Repository settings menu](../images/docker-hub-repo-settings-menu.png) + + +3. From the **Linked accounts** tab, select **Link provider** for the source provider you want to link. If you want to unlink your current GitHub account and relink to a new GitHub account, make sure to completely sign out of [GitHub](https://github.com/) before linking via Docker Hub. @@ -97,10 +100,9 @@ To revoke Docker Hub's access to an organization's GitHub repositories: To revoke Docker Hub's access to your GitHub account, you must unlink it both from Docker Hub, and from your GitHub account. -1. Select **Account settings** in the top-right drop-down navigation, then open -the **Linked Accounts** section. +1. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. -2. Select the plug icon next to the source provider you want to remove. +2. From the **Linked accounts** tab, select the plug icon next to the source provider you want to remove. 3. Go to your GitHub account's **Settings** page. @@ -119,9 +121,9 @@ code provider. 1. Sign in to Docker Hub using your Docker ID. -2. Select **Account settings** in the top-right drop-down navigation, then select the **Linked Accounts** tab. +2. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. -3. Select **Link provider** for the source provider you want to link. +3. From the **Linked accounts** tab, select **Link provider** for the source provider you want to link. 4. If necessary, sign in to Bitbucket. @@ -135,10 +137,9 @@ unlink it both from Docker Hub, and from your Bitbucket account. 1. Sign in to Docker Hub. -2. Select **Account settings** in the top-right drop-down navigation, then open -the **Linked Accounts** section. +2. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. -3. Select the **Plug** icon next to the source provider you want to remove. +3. From the **Linked accounts** tab, select the **Plug** icon next to the source provider you want to remove. 4. Go to your Bitbucket account and navigate to **Bitbucket settings**. diff --git a/content/docker-hub/images/docker-hub-repo-settings-menu.png b/content/docker-hub/images/docker-hub-repo-settings-menu.png new file mode 100644 index 0000000000000000000000000000000000000000..727359beda4ec419308487d18047aa24db063263 GIT binary patch literal 7091 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 literal 0 HcmV?d00001 diff --git a/content/docker-hub/repos/_index.md b/content/docker-hub/repos/_index.md index e6a01210045..a18d3954f3e 100644 --- a/content/docker-hub/repos/_index.md +++ b/content/docker-hub/repos/_index.md @@ -7,6 +7,18 @@ aliases: - /engine/tutorials/dockerrepos/ --- +## Manage default repository settings + +You can manage the default repository settings for your personal account in Docker Hub. Select the **Settings** icon, then select **Repository Settings**. + +![Repository settings menu](../images/docker-hub-repo-settings-menu.png) + +Here you can manage the following: + +- Default privacy: set the default repository privacy to either **Public** or **Private**. +- Linked accounts: for users with a Docker Pro, Team, or Business subscription, manage your source provider accounts to enable Automated Builds. +- Notifications: for users with a Docker Pro, Team, or Business subscription, manage how you receive notifications from autobuilds. + ## Change a repository from public to private 1. Navigate to your repository. diff --git a/content/docker-id/_index.md b/content/docker-id/_index.md index e5a62a3fc19..9d4851b1889 100644 --- a/content/docker-id/_index.md +++ b/content/docker-id/_index.md @@ -21,7 +21,7 @@ Your Docker ID becomes your username for hosted Docker services, and [Docker for ### Sign up with your email address -1. Go to the [Docker sign-up page](https://hub.docker.com/signup/). +1. Go to the [Docker sign-up page](https://app.docker.com/signup/). 2. Enter a unique, valid email address. @@ -48,7 +48,7 @@ Your Docker ID becomes your username for hosted Docker services, and [Docker for > To sign up with your social provider, make sure you verify your email address with your provider before you begin. { .important } -1. Go to the [Docker sign-up page](https://hub.docker.com/signup/). +1. Go to the [Docker sign-up page](https://app.docker.com/signup/). 2. Select your social provider, Google or GitHub. diff --git a/content/security/for-developers/2fa/_index.md b/content/security/for-developers/2fa/_index.md index e66af6c766b..3a73872926e 100644 --- a/content/security/for-developers/2fa/_index.md +++ b/content/security/for-developers/2fa/_index.md @@ -1,20 +1,20 @@ --- -description: Learn how to enable two-factor authentication on Docker Hub +description: Learn how to enable two-factor authentication on your Docker account keywords: Docker, docker, registry, security, Docker Hub, authentication, two-factor - authentication -title: Enable two-factor authentication for Docker Hub + authentication, account security +title: Enable two-factor authentication for your Docker account aliases: - /docker-hub/2fa/ --- -Two-factor authentication adds an extra layer of security to your Docker Hub +Two-factor authentication adds an extra layer of security to your Docker account by requiring a unique security code when you sign in to your account. The security code is required in addition to your password. When you enable two-factor authentication, you are also provided with a recovery code. Each recovery code is unique and specific to your account. You can use this code to recover your account in case you lose access to your authenticator -app. See [Recover your Docker Hub account](recover-hub-account/). +app. See [Recover your Docker account](recover-hub-account/). ## Prerequisites @@ -25,9 +25,9 @@ Authenticator with a registered YubiKey. ## Enable two-factor authentication -1. Sign in to your Docker Hub account. +1. Sign in to your [Docker account](https://app.docker.com/login). 2. Select your avatar and then from the drop-down menu, select **Account settings**. -3. Select the **Security** tab and then select **Enable Two-Factor Authentication**. +3. Navigate to the **Security** section, then select **Two-factor authentication**. 4. Enter your account password, then select **Confirm**. 5. Save your recovery code and store it somewhere safe. You can use your recovery code to recover your account in the event you lose access to your authenticator app. 6. Use a TOTP mobile app to scan the QR code or enter the text code. @@ -35,4 +35,4 @@ Authenticator with a registered YubiKey. 8. Select **Enable 2FA**. Two-factor authentication is now enabled. The next time you sign -in to your Docker Hub account, you are asked for a security code. \ No newline at end of file +in to your Docker account, you will need to enter a security code. \ No newline at end of file diff --git a/content/security/for-developers/2fa/disable-2fa.md b/content/security/for-developers/2fa/disable-2fa.md index cee0f448332..818dea2afaa 100644 --- a/content/security/for-developers/2fa/disable-2fa.md +++ b/content/security/for-developers/2fa/disable-2fa.md @@ -1,8 +1,8 @@ --- -description: Disable two-factor authentication on Docker Hub +description: Disable two-factor authentication on your Docker account keywords: Docker, docker, registry, security, Docker Hub, authentication, two-factor - authentication -title: Disable two-factor authentication on Docker Hub + authentication, account security, +title: Disable two-factor authentication on your Docker account aliases: - /docker-hub/2fa/disable-2fa/ --- @@ -10,11 +10,11 @@ aliases: > **Warning** > > Disabling two-factor authentication results in decreased security for your -> Docker Hub account. +> Docker account. { .warning } -1. Sign in to your Docker Hub account. +1. Sign in to your [Docker account](https://app.docker.com/login). 2. Select your avatar and then from the drop-down menu, select **Account settings**. -3. Navigate to the **Security** tab and select **Manage Two-Factor Authentication**. +3. Navigate to the **Security** section, then select **Two-factor authentication**. 4. Enter your password, then select **Confirm**. 5. Select **Disable 2FA**. diff --git a/content/security/for-developers/2fa/new-recovery-code.md b/content/security/for-developers/2fa/new-recovery-code.md index 6ddbce6ec08..2de6424cb51 100644 --- a/content/security/for-developers/2fa/new-recovery-code.md +++ b/content/security/for-developers/2fa/new-recovery-code.md @@ -1,7 +1,7 @@ --- description: Generate a new 2fa recovery code keywords: Docker, docker, registry, security, Docker Hub, authentication, two-factor - authentication + authentication, account security title: Generate a new recovery code aliases: - /docker-hub/2fa/new-recovery-code/ @@ -10,9 +10,11 @@ aliases: If you have lost your two-factor authentication recovery code and still have access to your Docker Hub account, you can generate a new recovery code. -1. Sign in to your Docker Hub account. +1. Sign in to your [Docker account](https://app.docker.com/login). 2. Select your avatar and then from the drop-down menu, select **Account settings**. -3. Navigate to the **Security** tab and select **Manage Two-Factor Authentication**. +3. Navigate to the **Security** section, then select **Manage Two-Factor Authentication**. 4. Enter your password, then select **Confirm**. +5. Select **Generate new code**. -In the **Manage recovery code** section, you can view your recovery code or generate a new code. Remember to save your recovery code and store it somewhere safe. +This generates a new code. Select the visibility icon to view the code. Remember to save your recovery code +and store it somewhere safe. \ No newline at end of file diff --git a/content/security/for-developers/2fa/recover-hub-account.md b/content/security/for-developers/2fa/recover-hub-account.md index 944807e85a2..c484f4d9950 100644 --- a/content/security/for-developers/2fa/recover-hub-account.md +++ b/content/security/for-developers/2fa/recover-hub-account.md @@ -9,7 +9,7 @@ aliases: If you have lost access to both your two-factor authentication application and your recovery code: -1. Navigate to [Docker Hub](https://hub.docker.com) and enter your username and password. +1. Sign in to your [Docker account](https://app.docker.com/login) with your username and password. 2. Select **I've lost my authentication device** and **I've lost my recovery code**. 3. Complete the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout). You must enter the primary email address associated with your Docker ID in the **Contact Support** form for recovery instructions. \ No newline at end of file diff --git a/content/security/for-developers/access-tokens.md b/content/security/for-developers/access-tokens.md index 0ebe8c5555b..91a009fb7f1 100644 --- a/content/security/for-developers/access-tokens.md +++ b/content/security/for-developers/access-tokens.md @@ -1,6 +1,6 @@ --- title: Create and manage access tokens -description: Learn how to create and manage your personal Docker Hub access tokens +description: Learn how to create and manage your personal Docker access tokens to securely push and pull images programmatically. keywords: docker hub, hub, security, PAT, personal access token aliases: @@ -24,21 +24,23 @@ any time. > Treat access tokens like your password and keep them secret. Store your tokens securely in a credential manager for example. { .important } -1. Sign in to [Docker Hub](https://hub.docker.com). +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 the **Security** tab and then **New Access Token**. +3. In the **Security** section, select **Personal access tokens**. -4. Add a description for your token. Use something that indicates the use case or purpose of the token. +4. Select **Generate new token**. + +5. Add a description for your token. Use something that indicates the use case or purpose of the token. -5. Set the access permissions. +6. 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 not delete the repository. + can't delete the repository. -6. Select **Generate** and then copy the token that appears on the screen and save it. You won't be able +7. 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 @@ -61,16 +63,19 @@ When prompted for a password, enter your personal access token instead of a pass ## Modify existing tokens -You can rename, activate, deactivate, or delete a token as needed. +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**. -1. Access your tokens under **Account settings > Security**. +3. In the **Security** section, 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 number of tokens that are activated and deactivated in the toolbar. -2. Select a token and then select **Delete** or **Edit**, or use the actions menu on the far right of a token row to bring up the edit screen. - You can also select multiple tokens to delete at once. +4. Select the actions menu on the far right of a token row, then select **Deactivate**, **Edit**, or **Delete** to modify the token. -3. After modifying the token, select **Save**. +5. After modifying the token, select **Save token**. ## Auto-generated tokens diff --git a/data/toc.yaml b/data/toc.yaml index 4e5e2aebccd..23a57b868ea 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -2150,8 +2150,6 @@ Manuals: section: - path: /docker-hub/ title: Overview - - path: /docker-id/ - title: Create an account - path: /docker-hub/quickstart/ title: Quickstart - sectiontitle: Repositories @@ -2200,6 +2198,17 @@ Manuals: - title: Docker for GitHub Copilot {{< badge color=violet text="Early Access" >}} path: /copilot/ +- sectiontitle: Docker accounts + section: + - path: /accounts/ + title: Overview + - path: /docker-id/ + title: Create an account + - path: /accounts/manage-account/ + title: Manage an account + - path: /accounts/deactivate-user-account/ + title: Deactivate an account + - sectiontitle: Administration section: - path: /admin/ @@ -2243,7 +2252,7 @@ Manuals: - path: /admin/convert-account/ title: Convert an account into an organization - path: /admin/deactivate-account/ - title: Deactivate an account or organization + title: Deactivate an organization - sectiontitle: Security section: @@ -2296,7 +2305,7 @@ Manuals: - path: /security/for-developers/2fa/disable-2fa/ title: Disable two-factor authentication - path: /security/for-developers/2fa/recover-hub-account/ - title: Recover your Docker Hub account + title: Recover your Docker account - path: /security/for-developers/2fa/new-recovery-code/ title: Generate a new recovery code - path: /security/security-announcements/