From 9591e92a6ae1ff6c7c6576951a71c655fff5547f Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Tue, 26 Apr 2022 09:51:25 -0500 Subject: [PATCH 1/8] removed recovery code --- docker-hub/2fa/recover-hub-account.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/docker-hub/2fa/recover-hub-account.md b/docker-hub/2fa/recover-hub-account.md index 3d2573eacb..fb6c5d30b4 100644 --- a/docker-hub/2fa/recover-hub-account.md +++ b/docker-hub/2fa/recover-hub-account.md @@ -17,24 +17,6 @@ your two-factor authentication recovery code. > not be able to recover your account. {: .important } -## Recover your Docker Hub account with a recovery code - -Go through the login process on Docker Hub. When you're asked to enter your -two-factor authentication code, click **I've lost my authentication device**. - -![Lost authentication device](../images/2fa-enter-2fa-code.png){:width="250px"} - -On the next screen, click "I have my recovery code". - -![You have your code](../images/2fa-have-recovery-code.png){:width="250px"} - -Enter your recovery code. - -![Enter recovery code](../images/2fa-enter-recover-code.png){:width="250px"} - -Once you have used your recovery code, you will have to re-enable two-factor -authentication. See [Enabling two-factor authentication on Docker Hub](/docker-hub/2fa). - ## Alternative recovery methods If you have lost access to both your two-factor authentication application and From 4d56f99386f04a0a318db6843fe8990805843884 Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Tue, 26 Apr 2022 09:59:30 -0500 Subject: [PATCH 2/8] removed all 2fa --- docker-hub/2fa/recover-hub-account.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docker-hub/2fa/recover-hub-account.md b/docker-hub/2fa/recover-hub-account.md index fb6c5d30b4..ab335b8bac 100644 --- a/docker-hub/2fa/recover-hub-account.md +++ b/docker-hub/2fa/recover-hub-account.md @@ -4,20 +4,6 @@ keywords: Docker, docker, registry, security, Docker Hub, authentication, two-fa title: Recover your Docker Hub account --- -If you have lost your two-factor authentication device and need to access your -Docker Hub account, you can gain access to your account using your two-factor -authentication recovery code. - -## Prerequisites - -Two-factor authentication is enabled on your Docker Hub account and you have -your two-factor authentication recovery code. - -> If you lose both your 2FA authentication device and recovery code, you may -> not be able to recover your account. -{: .important } - -## Alternative recovery methods If you have lost access to both your two-factor authentication application and your recovery code, get in touch with our Support team using the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout){:target="_blank" rel="noopener" class="_"}. You must enter the primary email address associated with your Docker ID in the Contact Support form for recovery instructions. From d27247ac6d94771aeea9f9eb15eb2713246bbbfc Mon Sep 17 00:00:00 2001 From: craig-osterhout Date: Tue, 26 Apr 2022 13:04:49 -0700 Subject: [PATCH 3/8] audit log capitalization, based on whether a feature name or not Signed-off-by: craig-osterhout --- docker-hub/audit-log.md | 20 ++++++++++---------- subscription/faq.md | 2 +- subscription/index.md | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-hub/audit-log.md b/docker-hub/audit-log.md index d689d9011e..3cef95ac33 100644 --- a/docker-hub/audit-log.md +++ b/docker-hub/audit-log.md @@ -5,33 +5,33 @@ title: Audit log --- {% include upgrade-cta.html - body="The Audit log feature is available for users subscribed to a Docker Team or a Business subscription. Upgrade now to start tracking events across your organization." + body="Audit log is available for users subscribed to a Docker Team or a Business subscription. Upgrade now to start tracking events across your organization." header-text="This feature requires a paid Docker subscription" target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_audit_log" %} -Audit log displays a chronological list of activities that occur at organization and repository levels. It provides owners of Docker Team accounts a report of all their team member activities. This allows the team owners to view and track what changes were made, the date when a change was made, and who initiated the change. For example, the Audit log displays activities such as the date when a repository was created or deleted, the team member who created the repository, the name of the repository, and when there was a change to the privacy settings. +Audit log displays a chronological list of activities that occur at organization and repository levels. It provides owners of Docker Team accounts a report of all their team member activities. This allows the team owners to view and track what changes were made, the date when a change was made, and who initiated the change. For example, the audit log displays activities such as the date when a repository was created or deleted, the team member who created the repository, the name of the repository, and when there was a change to the privacy settings. -Team owners can also see the Audit log for their repository if the repository is part of the organization subscribed to a Docker Team plan. +Team owners can also see the audit log for their repository if the repository is part of the organization subscribed to a Docker Team plan. -## View the Audit log +## View the audit log -To view the Audit log: +To view the audit log: 1. Sign into an owner account for the organization in Docker Hub. 2. Select your organization from the list and then click on the **Activity** tab. ![Organization activity tab](images/org-activity-tab.png){:width="700px"} -The Audit log begins tracking activities from the date the feature is live, that is from **25 January 2021**. Activities that took place before this date are not captured. +The audit log begins tracking activities from the date the feature is live, that is from **25 January 2021**. Activities that took place before this date are not captured. > **Note** > -> Docker will retain the Audit log activity data for a period of three months. +> Docker will retain the audit log activity data for a period of three months. -## Customize the Audit log +## Customize the audit log -By default, all activities that occur at organization and repository levels are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the **Activity** tab displays the Audit log of all the activities that occurred during that period. +By default, all activities that occur at organization and repository levels are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the **Activity** tab displays the audit log of all the activities that occurred during that period. ![Activities list](images/activity-list.png){:width="600px"} @@ -39,7 +39,7 @@ By default, all activities that occur at organization and repository levels are > **Note** > -> Activities created by the Docker Support team as part of resolving customer issues appear in the Audit log as **dockersupport**. +> Activities created by the Docker Support team as part of resolving customer issues appear in the audit log as **dockersupport**.
diff --git a/subscription/faq.md b/subscription/faq.md index ed3444b429..9c33264cfb 100644 --- a/subscription/faq.md +++ b/subscription/faq.md @@ -200,7 +200,7 @@ More details are available at the [Docker Pricing](https://www.docker.com/pricin * Support for an unlimited number of teams * Unlimited Hub image vulnerability scans * Higher scan limits in Docker Desktop -* Audit Logs +* Audit logs * Slack notifications * Premium customer support for Docker Desktop diff --git a/subscription/index.md b/subscription/index.md index 3a1acb9513..625fd9d982 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -48,7 +48,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www. **Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities. -Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit Logs](../docker-hub/audit-log.md), and more. +Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit log](../docker-hub/audit-log.md), and more. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. From 5a24650d24278cba69cbb6b0ed849e768ffef02b Mon Sep 17 00:00:00 2001 From: craig-osterhout Date: Tue, 26 Apr 2022 13:13:39 -0700 Subject: [PATCH 4/8] audit log capitalization, based on whether a feature name or not Signed-off-by: craig-osterhout --- subscription/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subscription/index.md b/subscription/index.md index 625fd9d982..080c4c5d1f 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -48,7 +48,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www. **Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities. -Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit log](../docker-hub/audit-log.md), and more. +Docker Team includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, an [audit log](../docker-hub/audit-log.md), and more. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. From 530fbf8f4cd32ae711788009cc7d4433246e3b01 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 26 Apr 2022 23:31:31 +0100 Subject: [PATCH 5/8] Update PR template Signed-off-by: Usha Mandya --- .github/PULL_REQUEST_TEMPLATE.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ac6c38af74..266d97f517 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,21 +1,11 @@ + as you go.--> ### Proposed changes -### Unreleased project version (optional) - - - ### Related issues (optional)