From 8f795ed0eb36a76f399fcbc66b2ef7dc3c085ab0 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Tue, 7 Oct 2025 12:19:54 -0400 Subject: [PATCH 1/2] admin: deprecate org management from Hub --- .../admin/organization/activity-logs.md | 16 -- .../admin/organization/deactivate-account.md | 15 -- .../admin/organization/manage-a-team.md | 36 --- content/manuals/admin/organization/members.md | 212 ------------------ content/manuals/admin/organization/orgs.md | 85 ------- 5 files changed, 364 deletions(-) diff --git a/content/manuals/admin/organization/activity-logs.md b/content/manuals/admin/organization/activity-logs.md index 57ea00250a16..adb476fc098d 100644 --- a/content/manuals/admin/organization/activity-logs.md +++ b/content/manuals/admin/organization/activity-logs.md @@ -24,28 +24,12 @@ Owners can also see the activity logs for their repository if the repository is ## Access activity logs -{{< tabs >}} -{{< tab name="Admin Console" >}} - To view activity logs in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com) and select your organization. 1. Select **Admin Console**, then **Activity logs**. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -To view activity logs in Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com). -1. Select **My Hub**, your organization, and then **Activity**. - -{{< /tab >}} -{{< /tabs >}} - ## Filter and customize activity logs By default, the **Activity** tab displays all recorded events. To narrow your diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md index d799923359cd..190bb403861e 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -40,9 +40,6 @@ Docker Hub. > This cannot be undone. Be sure you've gathered all the data you need from your organization before deactivating it. -{{< tabs >}} -{{< tab name="Admin Console" >}} - 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 the **Deactivate** @@ -50,15 +47,3 @@ button is unavailable, confirm you've completed all [Prerequisites](#prerequisit 1. Enter the organization name to confirm deactivation. 1. Select **Deactivate organization**. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -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/manage-a-team.md b/content/manuals/admin/organization/manage-a-team.md index f3c143b1548a..69f5a340879c 100644 --- a/content/manuals/admin/organization/manage-a-team.md +++ b/content/manuals/admin/organization/manage-a-team.md @@ -48,27 +48,10 @@ For more information on roles, see ## Create a team -{{< tabs >}} -{{< tab name="Admin Console" >}} - 1. Sign in to [Docker Home](https://app.docker.com) and select your organization. 1. Select **Teams**. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -1. Sign in to [Docker Hub](https://hub.docker.com). -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 >}} - ## Set team repository permissions You must create a team before you are able to configure repository permissions. @@ -144,9 +127,6 @@ organization, this action revokes member access to the team's permitted resources. It won't remove users from other teams that they belong to, and it won't delete any resources. -{{< tabs >}} -{{< tab name="Admin Console" >}} - 1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. 1. Select **Teams**. @@ -154,22 +134,6 @@ organization. 1. Select **Delete team**. 1. Review the confirmation message, then select **Delete**. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -1. Sign in to [Docker Hub](https://hub.docker.com). -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 >}} - ## More resources - [Video: Docker teams](https://youtu.be/WKlT1O-4Du8?feature=shared&t=348) diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index db6fc904658d..941c7ac38b8a 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -11,9 +11,6 @@ Learn how to manage members for your organization in Docker Hub and the Docker A ## Invite members -{{< tabs >}} -{{< tab name="Admin Console" >}} - Owners can invite new members to an organization via Docker ID, email address, or with a CSV file containing email addresses. If an invitee does not have a Docker account, they must create an account and verify their email address before they can accept an invitation to join the organization. When inviting members, their pending invitation occupies a seat. ### Invite members via Docker ID or email address @@ -85,87 +82,6 @@ Pending invitations appear in the table. The invitees receive an email with a li You can bulk invite members using the Docker Hub API. For more information, see the [Bulk create invites](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1bulk/post) API endpoint. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -Owners can invite new members to an organization via Docker ID, email address, or with a CSV file containing email addresses. If an invitee does not have a Docker account, they must create an account and verify their email address before they can accept an invitation to join the organization. When inviting members, their pending invitation occupies a seat. - -### Invite members via Docker ID or email address - -Use the following steps to invite members to your organization via Docker ID or email address. - -1. Sign in to [Docker Hub](https://hub.docker.com). -1. Select **My Hub**, your organization, then **Members**. -1. Select **Invite members**. -1. Select **Emails or usernames**. -1. Follow the on-screen instructions to invite members. Invite a maximum of 1000 members and separate multiple entries by comma, semicolon, or space. - -> [!NOTE] -> -> When you invite members, you assign them a role. See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md) for -details about the access permissions for each role. - -Pending invitations appear in the table. The invitees receive an email with a link to Docker Hub where they can accept or decline the invitation. - -### Invite members via CSV file - -To invite multiple members to an organization via a CSV file containing email addresses: - -1. Sign in to [Docker Hub](https://hub.docker.com). -1. Select **My Hub**, your organization, then **Members**. -1. Select **Invite members**. -1. Select **CSV upload**. -1. Optional. Select **Download the template CSV file** to download an example CSV file. The following is an example of the contents of a valid CSV file. - -```text -email -docker.user-0@example.com -docker.user-1@example.com -``` - -CSV file requirements: - -- The file must contain a header row with at least one heading named email. Additional columns are allowed and are ignored in the import. -- The file must contain a maximum of 1000 email addresses (rows). To invite more than 1000 users, create multiple CSV files and perform all steps in this task for each file. - -1. Create a new CSV file or export a CSV file from another application. - -- To export a CSV file from another application, see the application’s documentation. -- To create a new CSV file, open a new file in a text editor, type email on the first line, type the user email addresses one per line on the following lines, and then save the file with a .csv extension. - -1. Select **Browse files** and then select your CSV file, or drag and drop the CSV file into the **Select a CSV file to upload** box. You can only select one CSV file at a time. - -> [!NOTE] -> -> If the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you cannot continue to invite members. To invite members, you can purchase more seats, or remove some email addresses from the CSV file and re-select the new file. To purchase more seats, see [Add seats](/manuals/subscription/manage-seats.md) to your subscription or [Contact sales](https://www.docker.com/pricing/contact-sales/). - -1. After the CSV file has been uploaded, select **Review**. - -Valid email addresses and any email addresses that have issues appear. Email addresses may have the following issues: - -- Invalid email: The email address is not a valid address. The email address will be ignored if you send invites. You can correct the email address in the CSV file and re-import the file. -- Already invited: The user has already been sent an invite email and another invite email will not be sent. -- Member: The user is already a member of your organization and an invite email will not be sent. -- Duplicate: The CSV file has multiple occurrences of the same email address. The user will be sent only one invite email. - -1. Follow the on-screen instructions to invite members. - -> [!NOTE] -> -> When you invite members, you assign them a role. See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md) for -details about the access permissions for each role. - -Pending invitations appear in the table. The invitees receive an email with a link to Docker Hub where they can accept or decline the invitation. - -### Invite members via API - -You can bulk invite members using the Docker Hub API. For more information, see the [Bulk create invites](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1bulk/post) API endpoint. - -{{< /tab >}} -{{< /tabs >}} - ## Accept invitation When an invitation is to a user's email address, they receive @@ -200,9 +116,6 @@ After inviting members, you can resend or remove invitations as needed. ### Resend an invitation -{{< tabs >}} -{{< tab name="Admin Console" >}} - You can send individual invitations, or bulk invitations from the Admin Console. To resend an individual invitation: @@ -222,30 +135,8 @@ organization. 1. Select **Resend invites**. 1. Select **Resend** to confirm. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -To resend an invitation from Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com/). -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**. -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. - -{{< /tab >}} -{{< /tabs >}} - ### Remove an invitation -{{< tabs >}} -{{< tab name="Admin Console" >}} - To remove an invitation from the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com/) and select your @@ -254,33 +145,12 @@ organization. 1. Select the **action menu** next to the invitee and select **Remove invitee**. 1. Select **Remove** to confirm. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -To remove a member's invitation from Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com/). -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. - -{{< /tab >}} -{{< /tabs >}} - ## Manage members on a team Use Docker Hub or the Admin Console to add or remove team members. Organization owners can add a member to one or more teams within an organization. ### Add a member to a team -{{< tabs >}} -{{< tab name="Admin Console" >}} - To add a member to a team with the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com/) and select your @@ -293,29 +163,6 @@ organization. > > An invitee must first accept the invitation to join the organization before being added to the team. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -To add a member to a team with Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com). -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. -1. Select the team and then select **Add**. - - > [!NOTE] - > - > An invitee must first accept the invitation to join the organization before being added to the team. - -{{< /tab >}} -{{< /tabs >}} - ### Remove members from teams > [!NOTE] @@ -324,9 +171,6 @@ To add a member to a team with Docker Hub: Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources. -{{< tabs >}} -{{< tab name="Admin Console" >}} - To remove a member from a specific team with the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com/) and select your @@ -336,21 +180,6 @@ organization. 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" >}} - -{{% include "hub-org-management.md" %}} - -To remove a member from a specific team with Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com). -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 >}} - ### Update a member role Organization owners can manage [roles](/security/for-admins/roles-and-permissions/) @@ -362,9 +191,6 @@ the company owner can also manage that organization's roles. If you have SSO ena > If you're the only owner of an organization, you need to assign a new owner before you can edit your role. -{{< tabs >}} -{{< tab name="Admin Console" >}} - To update a member role in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com/) and select your @@ -373,27 +199,6 @@ organization. 1. Find the username of the member whose role you want to edit. Select the **Actions** menu, then **Edit role**. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -To update a member role in Docker Hub: - -1. Sign in to [Docker Hub](https://hub.docker.com). -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] -> -> If you're the only owner of an organization, -> you need to assign a new owner before you can edit your role. - -{{< /tab >}} -{{< /tabs >}} - ## Export members CSV file {{< summary-bar feature_name="Admin orgs" >}} @@ -407,26 +212,9 @@ Owners can export a CSV file containing all members. The CSV file for a company - Invited to Organizations: All organizations the user is an invitee of within a company - Account Created: The time and date when the user account was created -{{< tabs >}} -{{< tab name="Admin Console" >}} - To export a CSV file of your 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" >}} - -{{% include "hub-org-management.md" %}} - -To export a CSV file of your members: - -1. Sign in to [Docker Hub](https://hub.docker.com). -1. Select **My Hub**, your organization, and then **Members**. -1. Select the **Action** icon and then select **Export users as CSV**. - -{{< /tab >}} -{{< /tabs >}} diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 6f125097608d..ec58c0587d82 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -31,9 +31,6 @@ The following section contains instructions on how to create a new organization. detailed instructions on converting an existing user account to an organization, see [Convert an account into an organization](/manuals/admin/organization/convert-account.md). -{{< tabs >}} -{{< tab name="Admin Console" >}} - To create an organization: 1. Sign in to [Docker Home](https://app.docker.com/) and navigate to the bottom @@ -60,41 +57,8 @@ to your organization's **Settings** page. You've now created an organization. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% 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. -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. - - > [!NOTE] - > - > 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). - -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. -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. - -{{< /tab >}} -{{< /tabs >}} - ## View an organization -{{< tabs >}} -{{< tab name="Admin Console" >}} - To view an organization in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com) and select your @@ -104,55 +68,6 @@ organization. The Admin Console contains many options that let you to configure your organization. -{{< /tab >}} -{{< tab name="Docker Hub" >}} - -{{% include "hub-org-management.md" %}} - -To view an organization: - -1. Sign in to [Docker Hub](https://hub.docker.com) with a user account that is - a member of any team in the organization. - - > [!NOTE] - > - > You can't *directly* sign in to an organization. This is especially - > important to note if you create an organization by - [converting a user account](/manuals/admin/organization/convert-account.md), as conversion means you lose the ability to log into that - > "account", since it no longer exists. To view the organization you - > need to sign in with the new owner account assigned during the - > conversion or another account that was added as a member. If you - > don't see the organization after logging in, - > then you are neither a member or an owner of it. An organization - > administrator needs to add you as a member of the organization. - -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 -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/enterprise/security/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). - -{{< /tab >}} -{{< /tabs >}} - ## Merge organizations > [!WARNING] From 0d2258dbdac057c59a5405d5d63776f6beec2901 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Tue, 7 Oct 2025 12:38:46 -0400 Subject: [PATCH 2/2] remove includes --- content/includes/hub-org-management.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 content/includes/hub-org-management.md diff --git a/content/includes/hub-org-management.md b/content/includes/hub-org-management.md deleted file mode 100644 index b75bb77bf96d..000000000000 --- a/content/includes/hub-org-management.md +++ /dev/null @@ -1,6 +0,0 @@ -> [!IMPORTANT] -> -> Organization management is moving to the Admin Console. -> -> Manage members, team, settings, and activity logs in the Docker Admin Console. -> Access to these features in Docker Hub will end soon. Explore the [Admin Console](https://app.docker.com/admin). \ No newline at end of file