From 689205569add52df7014d22b5325ed8a44bd19d7 Mon Sep 17 00:00:00 2001 From: Stephanie Aurelio <133041642+stephaurelio@users.noreply.github.com> Date: Mon, 6 May 2024 07:59:28 -0700 Subject: [PATCH] Add merge organization steps to admin docs (#19947) * update org faq and add steps to main doc * update wording --- content/admin/faqs/organization-faqs.md | 8 ++++---- content/admin/organization/orgs.md | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/content/admin/faqs/organization-faqs.md b/content/admin/faqs/organization-faqs.md index 8fd8896efb..945f9ad9de 100644 --- a/content/admin/faqs/organization-faqs.md +++ b/content/admin/faqs/organization-faqs.md @@ -1,6 +1,6 @@ --- description: Organization FAQs -keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration +keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration, Admin Console, members, organization management, manage orgs title: FAQs on organizations tags: [FAQ] aliases: @@ -52,15 +52,15 @@ There isn't any automatic notification when the total number of users for the re members exceed the number of licenses, you will receive an error informing you to contact the administrator due to lack of seats. -### How can I merge organizations in Docker Hub? +### How can I merge organization accounts? -Reach out to your Support contact if you need to merge organizations. +You can downgrade a secondary organization and transition your users and data to a primary organization. See [Merge organizations](../organization/orgs.md#merge-organizations). ### Do organization invitees take up seats? Yes. A user invited to an organization will take up one of the provisioned seats, even if that user hasn’t accepted their invitation yet. Organization -owners can manage the list of invitees through the **Invitees** tab on the organization settings page in Docker Hub. +owners can manage the list of invitees through the **Invitees** tab on the organization settings page in Docker Hub, or in the **Members** page in Admin Console. ### Do organization owners take a seat? diff --git a/content/admin/organization/orgs.md b/content/admin/organization/orgs.md index 8b7dce4370..6b9bf37b81 100644 --- a/content/admin/organization/orgs.md +++ b/content/admin/organization/orgs.md @@ -104,6 +104,21 @@ configure your organization. - **Billing**: Displays information about your existing [Docker subscription (plan)](../../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/core-billing/history.md). +## Merge organizations + +If you have multiple organizations that you want to merge into one, complete the following: + +1. Based on the number of seats from the secondary organization, [purchase additional seats](../../subscription/core-subscription/add-seats.md) for the primary organization account that you want to keep. +2. Manually add users to the primary organization and remove existing users from the secondary organization. +3. Manually move over your data, including all repositories. +4. Once you're done moving all of your users and data, [downgrade](../../subscription/core-subscription/downgrade.md) the secondary account to a free subscription. + +> **Tip** +> +> If your organization has a Docker Core Business subscription with a purchase order, contact Support or your Account Manager at Docker. +> +{ .tip } + ## More resources - [Video: Docker Hub Organizations](https://www.youtube.com/watch?v=WKlT1O-4Du8)