diff --git a/content/manuals/accounts/company/_index.md b/content/manuals/accounts/company/_index.md index 5c80ad5d0da1..653a926d741c 100644 --- a/content/manuals/accounts/company/_index.md +++ b/content/manuals/accounts/company/_index.md @@ -7,12 +7,12 @@ description: Why a Docker company groups organizations, and what company keywords: company, multiple organizations, Docker Home, Docker Business, company owners, SSO, SCIM grid: - - title: Create a company - description: Get started by learning how to create a company. + - title: Set up a company + description: Create a company, invite members, add organizations, and manage owners. icon: building-office-2 link: /accounts/company/new-company/ - title: Manage your company - description: Add organizations, manage company owners, and invite members. + description: Change roles, remove users, and export a member list. icon: building-storefront link: /accounts/company/manage/ - title: Configure SSO and SCIM @@ -89,6 +89,6 @@ who is not an organization member does not occupy a seat. ## Next steps -Learn how to create and manage a company in the following sections. +Set up the company, then manage members and access from the pages below. {{< grid >}} diff --git a/content/manuals/accounts/company/manage.md b/content/manuals/accounts/company/manage.md index 543c9f371dcc..165ed1983001 100644 --- a/content/manuals/accounts/company/manage.md +++ b/content/manuals/accounts/company/manage.md @@ -1,9 +1,13 @@ --- -title: Manage company organizations, owners, and members +title: Manage your company linkTitle: Manage weight: 20 -description: Manage your Docker company in Docker Home. Add organizations, invite members, manage owners, resend invitations, export a member CSV, and add subscription seats. -keywords: company, manage company, Docker Home, company owners, add organization, invite members, resend invitations, export members CSV, company members, manage seats +description: >- + Change company member roles, remove users, leave a company or + organization, and export a member CSV in Docker Home. +keywords: company members, change role, remove user, export members CSV, + leave organization, leave company, Docker Home +toc_max: 2 aliases: - /admin/company/manage/ - /admin/company/manage/organizations/ @@ -17,118 +21,38 @@ aliases: {{< summary-bar feature_name="Company" >}} -After creating a company, you can manage multiple organizations from -Docker Home. Company owners can use the company portal to invite members to -specific organizations, view seat availability across organizations, and -add new company owners. +After creating a company, you manage member roles and membership from +Docker Home. To invite members, add organizations, or manage company +owners, see +[Set up a company](/manuals/accounts/company/new-company.md). -## Add more organizations - -Company owners can add Docker organizations with a Docker Business plan -to their company, so long as they're also the organization owners for -that organization. There's no limit to the number of organizations you -add to a company. - -> [!IMPORTANT] -> -> Once you add an organization to a company, you can't remove it from the -> company. - -1. Sign in to [Docker Home](https://app.docker.com) and select - your company. -1. Select **Managed organizations**. -1. Select **Add organization**, then select an organization from the - drop-down list. - -A nested organization must keep its Docker Business subscription to stay -managed by the company. If an organization downgrades from Docker -Business, you can no longer manage it through the company, and its owner -must manage it separately. - -## Company owners - -A company can have multiple owners who manage the company and all of its -organizations. For details about the company owner role and how it affects -seats, see -[Company structure](/manuals/accounts/company/_index.md#company-structure). - -### Add a company owner - -1. Sign in to [Docker Home](https://app.docker.com) and select your company. -1. Select **Company owners**, then select **Add owner**. -1. Specify the member's Docker ID, then select **Add company owner**. - -### Remove a company owner +## Change a user's role 1. Sign in to [Docker Home](https://app.docker.com) and select your company. -1. Select **Company owners**. -1. Find the company owner you want to remove and select the **Actions** - menu, then select **Remove as company owner**. - -## Company invitations - -You add a member to your company by inviting them to an organization within -the company. Company owners can invite members to any organization in the -company using a Docker ID, email address, or in bulk with a CSV file of -email addresses. +1. Select **Users**. +1. Find the user and select the **Actions** menu, then select + **Change role**. If the user belongs to more than one organization, the + menu label is **Change roles**. +1. Complete the change in one of these ways: + - **One organization.** Select a role, then select **Save**. + - **Several organizations.** Select the **Organization**, select a + role, then select **Save**. -Members and invitations belong to individual organizations, not to the -company itself. A pending invitation occupies a seat until the invitee -accepts. +If the user is the only owner of the organization, assign another owner +before you can change that role. -### Invite members to an organization +## Remove a user 1. Sign in to [Docker Home](https://app.docker.com) and select your company. -1. Select **Users**, then select **Invite**. - -{{< tabs >}} -{{< tab name="Email or username" >}} - -1. Select **Emails or usernames**. -1. Enter the Docker IDs or email addresses of the invitees. -1. Select an organization for each invitee. - -{{< /tab >}} -{{< tab name="CSV upload" >}} - -1. Select **CSV upload**. -1. Upload a CSV file of email addresses. -1. Select an organization for the invitees. - -{{< /tab >}} -{{< /tabs >}} - -Invitees receive an email with instructions to accept. After they accept, -new members appear on the **Users** page. The table shows how many -organizations each member belongs to. - -### Resend invitations - -Company owners can resend invitations from the company-level **Users** -page. - -{{< tabs >}} -{{< tab name="Individual" >}} - -1. Select your company from [Docker Home](https://app.docker.com/). -1. Select **Users**, then locate the invitee from the table. -1. Select the **Actions** menu, then select **Resend**. - - Before resending, confirm you selected the correct invitee. - - The resend invitation modal displays the date you originally invited - the invitee. -1. Select **Invite** to confirm. - -{{< /tab >}} -{{< tab name="Bulk" >}} - -1. Select your company from [Docker Home](https://app.docker.com/). 1. Select **Users**. -1. From the table, use the multi-select checkboxes next to the invitees - you want to resend to. -1. Select **Resend invites**, then select **Resend** to confirm. +1. Find the user and select the **Actions** menu, then select **Remove**. +1. Complete the removal in one of these ways: + - **One organization.** Select **Remove**. + - **Several organizations.** Select the organizations, then select + **Remove**. -{{< /tab >}} -{{< /tabs >}} +If the user is the only owner of an organization, assign another owner +before you can remove them from that organization. ## Export a member list CSV @@ -151,26 +75,35 @@ company. {{< /accordion >}} -## Add seats to an organization +## Leave a company -If you have a self-serve subscription that has no pending subscription -changes, you can add seats using Docker Home. For more information about -adding seats, see -[Manage seats](/manuals/accounts/organization/manage/manage-seats.md#add-seats-to-your-subscription). +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Company owners**. +1. Find your account and select the **Actions** menu, then select + **Leave company**. +1. Select **Leave**. -If you have a sales-assisted subscription, you must contact Docker support -or sales to add seats. +If you are the only company owner, add another owner before you can leave. -## Manage teams +## Leave an organization in the company + +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Users**. +1. Find your account and select the **Actions** menu, then select + **Leave organization**. If you belong to more than one organization, the + menu label is **Leave organizations**. +1. Select **Leave**. -Teams exist at the organization level, not the company level. After inviting -members to an organization, you can add them to teams within that -organization. For more details, see -[Manage members on a team](/manuals/accounts/organization/manage/members.md#manage-members-on-a-team). +If you are the only owner of an organization, assign another owner before +you can leave it. ## Next steps -- [Company overview](/manuals/accounts/company/_index.md) -- [Manage organization members](/manuals/accounts/organization/manage/members.md) -- [Manage seats](/manuals/accounts/organization/manage/manage-seats.md) +- [Set up a company](/manuals/accounts/company/new-company.md) to invite + members, add owners, or add organizations +- [Manage members on a team](/manuals/accounts/organization/manage/members.md#manage-members-on-a-team) + to add company members to organization teams +- [Manage seats](/manuals/accounts/organization/manage/manage-seats.md) to + add or remove subscription seats - [Roles and permissions](/manuals/security/roles-and-permissions/_index.md) + for what each role can do diff --git a/content/manuals/accounts/company/new-company.md b/content/manuals/accounts/company/new-company.md index de9b55f015f0..9cf4d355bdd2 100644 --- a/content/manuals/accounts/company/new-company.md +++ b/content/manuals/accounts/company/new-company.md @@ -1,9 +1,14 @@ --- -title: Create new company +title: Set up a company linkTitle: Setup weight: 10 -description: Learn how to create a company to centrally manage multiple organizations. -keywords: company, hub, organization, company owner, Docker Home, company management, Docker Business, create company +description: >- + Set up a Docker company in Docker Home. Create the company, add + owners, invite members, add organizations, and manage seats. +keywords: company, hub, organization, company owner, Docker Home, company + management, Docker Business, set up company, create company, invite + members +toc_max: 2 aliases: - /admin/company/new-company/ - /docker-hub/new-company/ @@ -11,18 +16,16 @@ aliases: {{< summary-bar feature_name="Company" >}} -Learn how to create a new company in Docker Home, a centralized -dashboard for managing organizations. +When you set up a company in Docker Home, you create the company, then add +owners, invite members, and add more organizations as needed. You must be the +owner of the organization you want to add to your company. -## Prerequisites - -Before you begin, you must: - -- Be the owner of the organization you want to add to your company -- Have a Docker Business subscription ## Create a company +When you create the company, the organization you selected is automatically +migrated to the new company. The name for your company can't be the same as an existing user, organization, or company namespace. + To create a new company: 1. Sign in to [Docker Home](https://app.docker.com/) and select the @@ -30,22 +33,122 @@ To create a new company: 1. Select **Organization settings**. 1. Select **Create a company**. 1. Enter a unique name for your company, then select **Continue**. +1. Review the migration details and then select **Create company**. - > [!TIP] - > - > The name for your company can't be the same as an existing user, - > organization, or company namespace. +For more information on how you can add more organizations to your company, +see [Add more organizations](#add-more-organizations). -1. Review the migration details and then select **Create company**. +## Company owners -When you create the company, the organization you selected is automatically -migrated to the new company. +A company can have multiple owners who manage the company and all of its +organizations. A company can have up to 10 owners. For details about the +company owner role and how it affects seats, see +[Company structure](/manuals/accounts/company/_index.md#company-structure). -For more information on how you can add more organizations to your company, -see [Add more organizations](./manage.md#add-more-organizations). +### Add a company owner + +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Company owners**, then select **Add owner**. +1. Specify the member's Docker ID, then select **Add company owner**. + +**Add owner** is +unavailable when the company already has 10 owners. + +### Remove a company owner + +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Company owners**. +1. Find the company owner you want to remove and select the **Actions** + menu, then select **Remove as company owner**. + +## Company invitations + +You add a member to your company by inviting them to an organization within +the company. Company owners can invite members to any organization in the +company using a Docker ID, email address, or in bulk with a CSV file of +email addresses. + +Members and invitations belong to individual organizations, not to the +company itself. A pending invitation occupies a seat until the invitee +accepts. + +### Invite members to an organization + +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Users**, then select **Invite**. +1. Add the invitees in one of these ways: + - **Emails or usernames.** Select **Emails or usernames**. Enter the + Docker IDs or email addresses of the invitees. Select an organization + for each invitee. + - **CSV upload.** Select **CSV upload**. Upload a CSV file of email + addresses. Select an organization for the invitees. + +Invitees receive an email with instructions to accept. After they accept, +new members appear on the **Users** page. The table shows how many +organizations each member belongs to. + +### Resend invitations + +Company owners can resend invitations from the company-level **Users** +page. + +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Users**. +1. Resend one invitation, or resend several: + - **One invitee.** Locate the invitee in the table. Select the + **Actions** menu, then select **Resend**. Before resending, confirm + you selected the correct invitee. The resend invitation modal displays + the date you originally invited the invitee. Select **Invite** to + confirm. + - **Several invitees.** Select the checkboxes next to the invitees. + Select **Resend invites**, then select **Resend** to confirm. + +### Cancel an invitation + +1. Sign in to [Docker Home](https://app.docker.com) and select your company. +1. Select **Users**. +1. Find the invitee and select the **Actions** menu, then select **Remove**. +1. Complete the removal in one of these ways: + - **One organization.** Select **Remove**. + - **Several organizations.** Select the organizations, then select + **Remove**. + +Removing an invitee cancels the pending invitation. + +## Add more organizations + +Company owners can add a Docker Business organization when they are also +an owner of that organization. There's no limit to the number of +organizations you add to a company. + +1. Sign in to [Docker Home](https://app.docker.com) and select + your company. +1. Select **Managed organizations**. +1. Select **Add organization**, then select an organization from the + drop-down list. + +A nested organization must keep its Docker Business subscription to stay +managed by the company. If an organization downgrades from Docker +Business, you can no longer manage it through the company, and its owner +must manage it separately. + +## Add seats to an organization + +If you have a self-serve subscription that has no pending subscription +changes, you can add seats using Docker Home. For more information about +adding seats, see +[Manage seats](/manuals/accounts/organization/manage/manage-seats.md#add-seats-to-your-subscription). + +If you have a sales-assisted subscription, you must contact Docker support +or sales to add seats. ## Next steps -- [Add organizations](./manage.md#add-more-organizations) -- [Invite company members](./manage.md#company-invitations) -- [Manage company owners](./manage.md#company-owners) +- [Manage company members](./manage.md) to change roles, remove users, or + export a member CSV +- [Manage organization members](/manuals/accounts/organization/manage/members.md) + for organization-level invites and teams +- [Company overview](/manuals/accounts/company/_index.md) for company + structure and owner seats +- [Roles and permissions](/manuals/security/roles-and-permissions/_index.md) + for what each role can do diff --git a/content/manuals/accounts/organization/manage/_index.md b/content/manuals/accounts/organization/manage/_index.md index 14fc31f0ce4a..633090a056c5 100644 --- a/content/manuals/accounts/organization/manage/_index.md +++ b/content/manuals/accounts/organization/manage/_index.md @@ -2,79 +2,42 @@ title: Manage your organization linkTitle: Manage weight: 20 -description: Learn how to manage your Docker organization, including members, teams, licenses, seats, product access, and settings. -keywords: manage organization, members, teams, licenses, seats, product access, organization management, docker home, organization settings, deactivate organization -grid: - - title: User access workflow - description: Plan roles, provisioning, and ongoing access reviews. - icon: user-group - link: /accounts/organization/manage/user-access/ - - title: Information - description: Update your organization's general information and settings. - icon: pencil-square - link: /accounts/organization/manage/general-settings/ - - title: Members - description: Invite, manage, and assign roles to your organization members. - icon: user-plus - link: /accounts/organization/manage/members/ - - title: Teams - description: Create teams and manage repository access for groups of members. - icon: user-group - link: /accounts/organization/manage/manage-a-team/ - - title: Licenses - description: View your license inventory and assign licenses to teams or individual members. - icon: key - link: /accounts/organization/manage/manage-licenses/ - - title: Seats - description: Add or remove seats for Docker Team and Business subscriptions. - icon: user-circle - link: /accounts/organization/manage/manage-seats/ - - title: Products - description: Manage access and view usage for Docker products across your organization. - icon: squares-2x2 - link: /accounts/organization/manage/manage-products/ - - title: Deactivation - description: Deactivate an organization after completing the required steps. - icon: minus-circle - link: /accounts/organization/manage/deactivate-account/ - - title: Security - description: Configure single sign-on, provisioning, and access management. - icon: shield-check - link: /security/ - - title: Billing - description: Manage payment methods and view billing history. - icon: credit-card - link: /subscription-billing/ +description: Manage membership, teams, seats, licenses, and product access for your Docker organization from Docker Home. +keywords: manage organization, members, teams, roles, seats, licenses, product access, custom roles, docker home aliases: - /admin/organization/manage/ --- -As an organization owner, you manage your organization's membership, access, -product usage, and settings. You can invite members, group them into teams, -assign or revoke licenses and seats, change access to Docker products, update -organization information, and deactivate the organization. +Managing an organization is how you control who belongs to it and what each +member can use. Organization owners handle administration from +[Docker Home](https://app.docker.com). -## Managing your organization +## What organization management covers -You manage your organization from [Docker Home](https://app.docker.com) and -must be assigned the -[organization owner role](/manuals/security/roles-and-permissions/_index.md). +Organization management covers two things: membership and the products your +members can use. Running both from one place keeps access aligned with your +team as it changes, so you can grow, reorganize, or offboard without +rebuilding access each time. -## Seats and licenses - -Seats and licenses both control access, but they apply to different kinds of -plans. The following table summarizes the difference. - -| Entitlement | What it grants | Applies to | Managed from | -| ----------- | ------------------------------------------------------- | ------------------------------------------------ | ---------------------------- | -| Seat | Membership in your Docker Team or Business subscription | Docker Team or Business subscription | Billing | -| License | Access to a specific product or add-on | AI Governance, Docker Offload, and other add-ons | Licenses, Teams, and Members | - -For details, see [Seats](/manuals/accounts/organization/manage/manage-seats.md) -and [Manage licenses](/manuals/accounts/organization/manage/manage-licenses.md). +| To do this | Go here | +| --- | --- | +| Invite members, assign roles, and remove people who leave | [Members](/manuals/accounts/organization/manage/members.md) | +| Group members and grant shared repository access | [Teams](/manuals/accounts/organization/manage/manage-a-team.md) | +| Add or remove seats on your Team or Business subscription | [Seats](/manuals/accounts/organization/manage/manage-seats.md) | +| Assign add-on licenses for AI Governance, Docker Offload, and other products | [Licenses](/manuals/accounts/organization/manage/manage-licenses.md) | +| Control what members can use in each Docker product, and check usage | [Products](/manuals/accounts/organization/manage/manage-products.md) | +| Update the organization name, company, website, and avatar | [Information](/manuals/accounts/organization/manage/general-settings.md) | +| Deactivate the organization | [Deactivation](/manuals/accounts/organization/manage/deactivate-account.md) | ## Next steps -Explore the following sections to manage your organization. - -{{< grid >}} +- On a Docker Business subscription, +you can delegate specific actions by assigning +[custom roles](/manuals/security/roles-and-permissions/custom-roles/_index.md) +to members or teams. +- To configure single sign-on, SCIM provisioning, or domain verification +first, see +[Set up your organization](/manuals/accounts/organization/setup/_index.md). +- For a planning approach to roles, provisioning, and ongoing access reviews, +follow the +[User access workflow](/manuals/accounts/organization/manage/user-access.md). diff --git a/content/manuals/accounts/organization/manage/general-settings.md b/content/manuals/accounts/organization/manage/general-settings.md index 78f9363b634e..9af9cd0c6e8d 100644 --- a/content/manuals/accounts/organization/manage/general-settings.md +++ b/content/manuals/accounts/organization/manage/general-settings.md @@ -1,8 +1,10 @@ --- -title: Change general organization information +title: Update organization information linkTitle: Information weight: 10 -description: Learn how to manage settings for organizations. +description: >- + Update your organization's name, company, location, website, and + avatar in Docker Home. keywords: organization, settings, Docker Home, manage, Docker organization, Gravatar, SCIM, SSO setup, domain management, organization settings aliases: - /admin/organization/setup/general-settings/ @@ -10,12 +12,10 @@ aliases: - /accounts/organization/setup/general-settings/ --- -Learn how to update your organization information. +Update the details that appear on your organization landing page. ## Update organization information -General organization information appears on your organization landing page. - This information includes: - Organization Name @@ -29,7 +29,7 @@ To edit this information: 1. Sign in to [Docker Home](https://app.docker.com) and select your organization from the top-left account drop-down. 1. Select **Organization settings**. -1. Enter or update your organization’s details, then select **Save**. +1. Enter or update your organization's details, then select **Save**. ## Next steps @@ -38,4 +38,4 @@ After configuring your organization information, you can: - [Configure single sign-on (SSO)](/manuals/security/authentication/single-sign-on/connect.md) - [Set up SCIM provisioning](/manuals/security/provisioning/scim/_index.md) - [Manage domains](/manuals/security/provisioning/domain-management.md) -- [Create a company](/manuals/accounts/company/new-company.md) +- [Set up a company](/manuals/accounts/company/new-company.md) diff --git a/content/manuals/faqs/accounts.md b/content/manuals/faqs/accounts.md index 66b4efdca9c3..3c40afcc0ce0 100644 --- a/content/manuals/faqs/accounts.md +++ b/content/manuals/faqs/accounts.md @@ -117,10 +117,10 @@ Check the following: 1. The username is the Docker ID of the account that owns the token. Use an organization name only with an [organization access token](/manuals/security/access-tokens/organization-access-tokens.md). -2. You pasted the full token, with no spaces or line breaks. Docker +1. You pasted the full token, with no spaces or line breaks. Docker shows a token only once. If you no longer have it, [create a new personal access token](/manuals/security/access-tokens/personal-access-tokens.md#create). -3. On the **Personal access tokens** page, find the token and use its +1. On the **Personal access tokens** page, find the token and use its status: - **Expired:** Create a new token. You can't change the expiration date. @@ -204,7 +204,7 @@ for the full explanation. ### 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. +seats, even if that user hasn't accepted their invitation yet. To manage invites, see [Manage organization members](/manuals/accounts/organization/manage/members.md). @@ -263,17 +263,17 @@ domain](/manuals/security/provisioning/domain-management.md). ### Companies -#### Can I use a parent company if some of my organizations don’t have a Docker Business subscription? +#### Can I use a parent company if some of my organizations don't have a Docker Business subscription? Yes, but you can only add organizations with a Docker Business subscription -to a company. For more details, see [Add more organizations](/manuals/accounts/company/manage.md#add-more-organizations). +to a company. For more details, see [Add more organizations](/manuals/accounts/company/new-company.md#add-more-organizations). #### What happens if one of my organizations downgrades from Docker Business, but I still need access as a company owner? To access and manage a nested organization, it must have a Docker Business subscription. If an organization downgrades from Docker Business, its owner must manage it outside of the company. For more details, see -[Add more organizations](/manuals/accounts/company/manage.md#add-more-organizations). +[Add more organizations](/manuals/accounts/company/new-company.md#add-more-organizations). #### Do company owners occupy a subscription seat?