diff --git a/content/includes/admin-org-overview.md b/content/includes/admin-org-overview.md deleted file mode 100644 index 3aff83bc2fea..000000000000 --- a/content/includes/admin-org-overview.md +++ /dev/null @@ -1,14 +0,0 @@ -An organization in Docker is a collection of teams and repositories -that can be managed together. A team is a group of Docker members that belong to an organization. -An organization can have multiple teams. Members don't have to be added to a team to be part of an organization. - -Docker users become members of an organization once they're associated with that organization by an organization owner. An organization owner is a user with administrative access to the organization. - -Owners can invite users, assign them roles, create new teams, and add -members to an existing team using their Docker ID or email address. An organization owner can also add -additional owners to help them manage users, teams, and repositories in the -organization. - -The following diagram depicts the setup of an organization and how it relates to teams. Teams are an optional feature that owners can use to group members and assign permissions. - -![organization-hierarchy](/admin/images/org-structure.webp) diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index cf5274bfd919..fb7c17897d6e 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -1,6 +1,6 @@ --- title: Administration -description: Discover manuals on administration for accounts, organizations, and companies. +description: Overview of administration features and roles in the Docker Admin Console keywords: admin, administration, company, organization, Admin Console, user accounts, account management weight: 10 params: @@ -35,17 +35,64 @@ aliases: - /docker-hub/admin-overview --- -Administrators can manage companies and organizations using the Docker Admin Console. +Administrators can manage companies and organizations using the +[Docker Admin Console](https://app.docker.com/admin). The Admin Console +provides centralized observability, access management, and security controls +across Docker environments. -The [Docker Admin Console](https://admin.docker.com) provides administrators with centralized observability, access management, and controls for their company and organizations. To provide these features, Docker uses the following hierarchy and roles. +## Company and organization hierarchy -![Docker hierarchy](./images/docker-admin-structure.webp) +![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](./images/docker-admin-structure.webp) -- Company: A company simplifies the management of Docker organizations and settings. Creating a company is optional and only available to Docker Business subscribers. - - Company owner: A company can have multiple owners. Company owners have company-wide observability and can manage company-wide settings that apply to all associated organizations. In addition, company owners have the same access as organization owners for all associated organizations. -- Organization: An organization is a collection of teams and repositories. Docker Team and Business subscribers must have at least one organization. - - Organization owner: An organization can have multiple owners. Organization owners have observability into their organization and can manage its users and settings. -- Team: A team is a group of Docker members that belong to an organization. Organization and company owners can group members into additional teams to configure repository permissions on a per-team basis. Using teams to group members is optional. -- Member: A member is a Docker user that's a member of an organization. Organization and company owners can assign roles to members to define their permissions. +### Company + +A company groups multiple Docker organizations for centralized configuration. +Companies are only available for Docker Business subscribers. + +Companies have the following administrator role available: + +- Company owner: Can view and manage all organizations within the company. +Has full access to company-wide settings and inherits the same permissions as +organization owners. + +### Organization + +An organization contains teams and repositories. All Docker Team and Business +subscribers must have at least one organization. + +Organizations have the following administrator role available: + +- Organization owner: Can manage organization settings, users, and access +controls. + +### Team + +Teams are optional and let you group members to assign repository permissions +collectively. Teams simplify permission management across projects +or functions. + +### Member + +A member is any Docker user added to an organization. Organization and company +owners can assign roles to members to define their level of access. + +> [!NOTE] +> +> Creating a company is optional, but organizations are required for Team and +Business subscriptions. + +## Admin Console features + +Docker's [Admin Console](https://app.docker.com/admin) allows you to: + +- Create and manage companies and organizations +- Assign roles and permissions to members +- Group members into teams to manage access by project or role +- Set company-wide policies, including SCIM provisioning and security +enforcement + +## Manage companies and organizations + +Learn how to manage companies and organizations in the following sections. {{< grid >}} diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md index 0cbef4d6d0bb..8610338e3291 100644 --- a/content/manuals/admin/organization/_index.md +++ b/content/manuals/admin/organization/_index.md @@ -2,8 +2,8 @@ title: Organization administration overview linkTitle: Organization administration weight: 10 -description: Learn about managing organizations in Docker including how they relate to teams, how to onboard, and more -keywords: organizations, admin, overview +description: Learn how to manage your Docker organization, including teams, members, permissions, and settings. +keywords: organizations, admin, overview, manage teams, roles grid: - title: Onboard your organization description: Learn how to onboard and secure your organization. @@ -45,10 +45,26 @@ grid: icon: help --- -{{% include "admin-org-overview.md" %}} +A Docker organization is a collection of teams and repositories with centralized +management. It helps administrators group members and assign access in a +streamlined, scalable way. -To create an organization, see [Create your organization](../organization/orgs.md). +## Organization structure -Learn how to administer an organization in the following sections. +The following diagram shows how organizations relate to teams and members. + +![Diagram showing how teams and members relate within a Docker organization](/admin/images/org-structure.webp) + +## Organization members + +Organization owners have full administrator access to manage members, roles, +and teams across the organization. + +An organization includes members and optional teams. Teams help group members +and simplify permission management. + +## Create and manage your organization + +Learn how to create and manage your organization in the following sections. {{< grid >}} diff --git a/content/manuals/admin/organization/convert-account.md b/content/manuals/admin/organization/convert-account.md index ef77881f9341..cc1458e1e505 100644 --- a/content/manuals/admin/organization/convert-account.md +++ b/content/manuals/admin/organization/convert-account.md @@ -9,67 +9,78 @@ aliases: {{< summary-bar feature_name="Admin orgs" >}} -You can convert an existing user account to an organization. This is useful if you need multiple users to access your account and the repositories that it’s connected to. Converting it to an organization gives you better control over permissions for these users through [teams](manage-a-team.md) and [roles](roles-and-permissions.md). +Learn how to convert an existing user account into an organization. This is +useful if you need multiple users to access your account and the repositories +it’s connected to. Converting it to an organization gives you better control +over permissions for these users through +[teams](/manuals/admin/organization/manage-a-team.md) and +[roles](/manuals/security/for-admins/roles-and-permissions.md). -When you convert a user account to an organization, the account is migrated to a Docker Team subscription. - -> [!IMPORTANT] -> -> Once you convert your account to an organization, you can’t revert it to a user account. +When you convert a user account to an organization, the account is migrated to +a Docker Team subscription by default. ## Prerequisites -Before you convert a user account to an organization, ensure that you meet the following requirements: - -- The user account that you want to convert 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 **My Hub** and then select the organization you need to leave. - 2. Find your username in the **Members** tab. - 3. Select the **More options** menu and then select **Leave organization**. - - If the user account is the sole owner of any organization or company, assign another user the owner role and then remove yourself from the organization or company. - -- You must have a separate Docker ID ready to assign as the owner of the organization during conversion. - - If you want to convert your user account into an organization account and you don't have any other user accounts, you need to create a new user account to assign it as the owner of the new organization. With the owner role assigned, this user account has full administrative access to configure and manage the organization. You can assign more users the owner role after the conversion. - -## Effects of converting an account into an organization - -Consider the following effects of converting your account: - -- This process removes the email address for the account, and organization owners will receive notification emails instead. You'll be able to reuse the removed email address for another account after converting. - -- The current subscription will cancel and your new subscription will start. - -- Repository namespaces and names won't change, but converting your account removes any repository collaborators. Once you convert the account, you'll need to add those users as team members. - -- Existing automated builds will appear as if they were set up by the first owner added to the organization. See [Convert an account into an organization](#convert-an-account-into-an-organization) for steps on adding the first owner. - -- The user account that you add as the first owner will have full administrative access to configure and manage the organization. - -- To transfer a user's personal access tokens (PATs) to your converted organization, -you must designate the user as an organization owner. This will ensure any PATs associated with the user's account are transferred to the organization owner. +Before you convert a user account to an organization, you must meet +the following requirements: + +- The user account that you want to convert can not be a member of a company, +any existing teams, or another organization. You must remove the account from +all teams, organizations, or companies. +- You must have a separate Docker ID ready to assign as the owner of the +organization during conversion. + + If you want to convert your user account into an organization account and + you don't have any other user accounts, you need to create a new user + account to assign it as the owner of the new organization. The assigned + owner has full administrative access to manage the organization. You can + assign more users the owner role after the conversion. + +## What happens when you convert your account + +The following happens when you convert your account into +an organization: + +- This process removes the email address for the account. Notifications are +instead sent to organization owners. You'll be able to reuse the +removed email address for another account after converting. +- The current subscription will automatically cancel and your new subscription +will start. +- Repository namespaces and names won't change, but converting your account +removes any repository collaborators. Once you convert the account, you'll need +to add repository collaborators as team members. +- Existing automated builds appear as if they were set up by the first owner +added to the organization. +- The user account that you add as the first owner will have full +administrative access to configure and manage the organization. +- To transfer a user's personal access tokens (PATs) to your converted +organization, you must designate the user as an organization owner. This will +ensure any PATs associated with the user's account are transferred to the +organization owner. > [!TIP] > -> To avoid potentially disrupting service of personal access tokens when converting an account or changing ownership, it is recommended to use [organization access tokens](/manuals/security/for-admins/access-tokens.md). Organization access tokens are -associated with an organization, not a single user account. +> To avoid potentially disrupting service of personal access tokens when +converting an account or changing ownership, it is recommended to +use [organization access tokens](/manuals/security/for-admins/access-tokens.md). +Organization access tokens are associated with an organization, not a +single user account. ## Convert an account into an organization -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. Sign in to [Docker Home](https://app.docker.com/login). - -3. In Docker Home, select your avatar in the top-right corner to open the drop-down. - -4. Select **Account settings**. - -5. Select **Convert**. - -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 **Username of new owner** 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**. The new owner receives a notification email. Use that owner account to sign in and manage the new organization. +> [!IMPORTANT] +> +> Converting an account into an organization is permanent. Back up any data + or settings you want to retain. + +1. Sign in to [Docker Home](https://app.docker.com/). +1. Select your avatar in the top-right corner to open the drop-down. +1. From **Account settings**, select **Convert**. +1. Review the warning displayed about converting a user account. This action +cannot be undone and has considerable implications for your assets and the +account. +1. Enter a **Username of new owner** to set an organization owner. The new +Docker ID you specify becomes the organization’s owner. You cannot use the +same Docker ID as the account you are trying to convert. +1. Select **Confirm**. The new owner receives a notification email. Use that +owner account to sign in and manage the new organization. diff --git a/content/manuals/admin/organization/manage-a-team.md b/content/manuals/admin/organization/manage-a-team.md index 1491f77edea7..374983292183 100644 --- a/content/manuals/admin/organization/manage-a-team.md +++ b/content/manuals/admin/organization/manage-a-team.md @@ -2,46 +2,62 @@ title: Create and manage a team weight: 40 description: Learn how to create and manage teams for your organization -keywords: Docker, docker, registry, teams, organizations, plans, Dockerfile, Docker - Hub, docs, documentation, repository permissions +keywords: docker, registry, teams, organizations, plans, Dockerfile, Docker + Hub, docs, documentation, repository permissions, configure repository access, team management aliases: - /docker-hub/manage-a-team/ --- {{< summary-bar feature_name="Admin orgs" >}} -You can create teams for your organization in Docker Hub and the Docker Admin Console. You can [configure repository access for a team](#configure-repository-permissions-for-a-team) in Docker Hub. +You can create teams for your organization in the Admin Console or Docker Hub. +You can [configure repository access for a team](#configure-repository-permissions-for-a-team) +in Docker Hub. -A team is a group of Docker users that belong to an organization. An organization can have multiple teams. An organization owner can then create new teams and add members to an existing team using their Docker ID or email address and by selecting a team the user should be part of. Members aren't required to be part of a team to be associated with an organization. +A team is a group of Docker users that belong to an organization. An +organization can have multiple teams. An organization owner can create new +teams and add members to an existing team using their Docker ID or email +address. Members aren't required to be part of a team to be associated with an +organization. -The organization owner can add additional organization owners to help them manage users, teams, and repositories in the organization by assigning them the owner role. +The organization owner can add additional organization owners to help them +manage users, teams, and repositories in the organization by assigning them +the owner role. -## Organization owner +## What is an organization owner? An organization owner is an administrator who has the following permissions: -- Manage repositories and add team members to the organization. -- Access private repositories, all teams, billing information, and organization settings. -- Specify [permissions](#permissions-reference) for each team in the organization. -- Enable [SSO](../../security/for-admins/single-sign-on/_index.md) for the organization. +- Manage repositories and add team members to the organization +- Access private repositories, all teams, billing information, and +organization settings +- Specify [permissions](#permissions-reference) for each team in the +organization +- Enable [SSO](../../security/for-admins/single-sign-on/_index.md) for the +organization When SSO is enabled for your organization, the organization owner can also manage users. Docker can auto-provision Docker IDs for new end-users or users who'd like to have a separate Docker ID for company use through SSO enforcement. -The organization owner can also add additional organization owners to help them manage users, teams, and repositories in the organization. +Organization owners can add others with the owner role to help them +manage users, teams, and repositories in the organization. + +For more information on roles, see +[Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md). ## Create a team {{< tabs >}} {{< tab name="Admin Console" >}} -1. In Admin Console, select your organization. -2. In the **User management** section, select **Teams**. -3. Select **Create team**. -4. Fill out your team's information and select **Create**. -5. [Add members to your team](members.md#add-a-member-to-a-team). +1. Sign in to the [Admin Console](https://app.docker.com) and select your +organization. +1. In the **User management** section, select **Teams**. +1. 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 >}} {{< tab name="Docker Hub" >}} @@ -49,42 +65,53 @@ The organization owner can also add additional organization owners to help them {{% include "hub-org-management.md" %}} 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select the **Teams** and then select **Create Team**. -4. Fill out your team's information and select **Create**. -5. [Add members to your team](members.md#add-a-member-to-a-team). +1. Select **My Hub** and choose your organization. +1. In the **Teams** section, 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 >}} -## Configure repository permissions for a team +## Set team repository permissions Organization owners can configure repository permissions on a per-team basis. -For example, you can specify that all teams within an organization have "Read and -Write" access to repositories A and B, whereas only specific teams have "Admin" -access. Note that organization owners have full administrative access to all repositories within the organization. +For example, you can specify that all teams within an organization have +"Read and Write" access to repositories A and B, whereas only specific +teams have "Admin" access. + +Note that organization owners have full administrative access to all +repositories within the organization. To give a team access to a repository: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select the **Teams** and select the team that you'd like to configure repository access to. -4. Select the **Permissions** tab and select a repository from the - **Repository** drop-down. -5. Choose a permission from the **Permissions** drop-down list and select - **Add**. - -Organization owners can also assign members the editor role to grant partial administrative access. See [Roles and permissions](../../security/for-admins/roles-and-permissions.md) for more about the editor role. +1. Select **My Hub** and choose your organization. +1. In the **Teams** section, select the team you want to configure repository +access for. +1. Select the **Permissions** tab and select a repository from the +**Repository** drop-down. +1. Choose a permission from the **Permissions** drop-down list and select +**Add**. + +Organization owners can also assign members the editor role to grant partial +administrative access. For more information on the editor role, see +[Roles and permissions](../../security/for-admins/roles-and-permissions.md). ### Permissions reference -- `Read-only` access lets users view, search, and pull a private repository in the same way as they can a public repository. -- `Read & Write` access lets users pull, push, and view a repository. In addition, it lets users view, cancel, retry or trigger builds +- `Read-only` access lets users view, search, and pull a private repository +in the same way as they can a public repository. +- `Read & Write` access lets users pull, push, and view a repository. In +addition, it lets users view, cancel, retry or trigger builds. - `Admin` access lets users pull, push, view, edit, and delete a - repository. You can also edit build settings, and update the repositories description, collaborators rights, public/private visibility, and delete. + repository. You can also edit build settings and update the repository’s + description, collaborator permissions, public/private visibility, and delete. Permissions are cumulative. For example, if you have "Read & Write" permissions, -you automatically have "Read-only" permissions: +you automatically have "Read-only" permissions. + +The following table shows what each permission level allows users to do: | Action | Read-only | Read & Write | Admin | |:------------------:|:---------:|:------------:|:-----:| @@ -102,31 +129,35 @@ you automatically have "Read-only" permissions: > [!NOTE] > -> A user who hasn't verified their email address only has -> `Read-only` access to the repository, regardless of the rights their team -> membership has given them. +> A user who hasn't verified their email address only has `Read-only` access to +the repository, regardless of the rights their team membership has given them. -## View a team's permissions for all repositories +## View team permissions for all repositories To view a team's permissions across all repositories: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select **Teams** and choose your team name. -4. Select the **Permissions** tab, where you can view the repositories this team can access. +1. Select **My Hub** and choose your organization. +1. Select **Teams** and choose your team name. +1. Select the **Permissions** tab, where you can view the repositories this +team can access. ## Delete a team -Organization owners can delete a team in Docker Hub or Admin Console. When you remove a team from your organization, this action revokes the members' access to the team's permitted resources. It won't remove users from other teams that they belong to, nor will it delete any resources. +Organization owners can delete a team. When you remove a team from your +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. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. In the **User management** section, select **Teams**. -3. Select the **Actions** icon next to the name of the team you want to delete. -4. Select **Delete team**. -5. Review the confirmation message, then select **Delete**. +1. Sign in to the [Admin Console](https://app.docker.com/admin) +and select your organization. +1. In the **User management** section, select **Teams**. +1. Select the **Actions** icon next to the name of the team you want to delete. +1. Select **Delete team**. +1. Review the confirmation message, then select **Delete**. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -134,12 +165,12 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r {{% include "hub-org-management.md" %}} 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub** and choose your organization. -3. Select **Teams**. -4. Select the name of the team that you want to delete. -5. Select **Settings**. -6. Select **Delete Team**. -7. Review the confirmation message, then select **Delete**. +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 >}} diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 536de693e38b..fe3e154c263c 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -2,7 +2,7 @@ title: Manage organization members weight: 30 description: Learn how to manage organization members in Docker Hub and Docker Admin Console. -keywords: members, teams, organizations, invite members, manage team members +keywords: members, teams, organizations, invite members, manage team members, export member list, edit roles, organization teams, user management aliases: - /docker-hub/members/ --- @@ -34,7 +34,7 @@ To accept an invitation: 1. Navigate to your email inbox and open the Docker email with an invitation to join the Docker organization. -2. To open the link to Docker Hub, select the **click here** link. +1. To open the link to Docker Hub, select the **click here** link. > [!WARNING] > @@ -43,14 +43,16 @@ join the Docker organization. > address the link was sent to and accept the invitation from the > **Notifications** panel. -3. The Docker create an account page will open. If you already have an account, select **Already have an account? Sign in**. +1. The Docker account creation page opens. If you already have an account, +select **Already have an account? Sign in**. If you do not have an account yet, create an account using the same email address you received the invitation through. -4. Optional. If you do not have an account and created one, you must navigate -back to your email inbox and verify your email address using the Docker verification -email. -5. Once you are signed in to Docker Hub, select **My Hub** from the top-level navigation menu. -6. Select **Accept** on your invitation. +1. Optional. If you just created an account, you must navigate +back to your email inbox and verify your email address using the Docker +verification email. +1. Once you are signed in to Docker Hub, select **My Hub** from the top-level +navigation menu. +1. Select **Accept** on your invitation. After accepting an invitation, you are now a member of the organization. @@ -66,9 +68,9 @@ After inviting members, you can resend or remove invitations as needed. To resend an invitation from the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **Members**. -3. Select the **action menu** next to the invitee and select **Resend invitation**. -4. Select **Invite** to confirm. +1. Select **Members**. +1. Select the **action menu** next to the invitee and select **Resend invitation**. +1. Select **Invite** to confirm. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -78,10 +80,10 @@ To resend an invitation from the Admin Console: To resend an invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **My Hub**, your organization, and then **Members**. -3. In the table, locate the invitee, select the **Actions** icon, and then select +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**. -4. Select **Invite** to confirm. +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. @@ -97,9 +99,9 @@ see the [Resend an invite](https://docs.docker.com/reference/api/hub/latest/#tag To remove an invitation from the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **Members**. -3. Select the **action menu** next to the invitee and select **Remove invitee**. -4. Select **Remove** to confirm. +1. Select **Members**. +1. Select the **action menu** next to the invitee and select **Remove invitee**. +1. Select **Remove** to confirm. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -109,9 +111,9 @@ To remove an invitation from the Admin Console: To remove a member's invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **My Hub**, your organization, and then **Members**. -3. In the table, select the **Action** icon, and then select **Remove member** or **Remove invitee**. -4. Follow the on-screen instructions to remove the member or invitee. +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. @@ -131,8 +133,8 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization To add a member to a team with the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select the team name. -3. Select **Add member**. You can add the member by searching for their email address or username. +1. Select the team name. +1. Select **Add member**. You can add the member by searching for their email address or username. > [!NOTE] > @@ -146,13 +148,13 @@ To add a member to a team with the Admin Console: To add a member to a team with Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub**, your organization, and then **Members**. -3. Select the **Action** icon, and then select **Add to team**. +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. -4. Select the team and then select **Add**. +1. Select the team and then select **Add**. > [!NOTE] > @@ -161,7 +163,7 @@ To add a member to a team with Docker Hub: {{< /tab >}} {{< /tabs >}} -### Remove a member from a team +### Remove members from teams > [!NOTE] > @@ -175,9 +177,9 @@ Organization owners can remove a member from a team in Docker Hub or Admin Conso To remove a member from a specific team with the Admin Console: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select the team name. -3. Select the **X** next to the user's name to remove them from the team. -4. When prompted, select **Remove** to confirm. +1. Select the team name. +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" >}} @@ -187,9 +189,9 @@ To remove a member from a specific team with the Admin Console: To remove a member from a specific team with Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub**, your organization, **Teams**, and then the team. -3. Select the **X** next to the user’s name to remove them from the team. -4. When prompted, select **Remove** to confirm. +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 >}} @@ -200,21 +202,21 @@ Organization owners can manage [roles](/security/for-admins/roles-and-permission within an organization. If an organization is part of a company, the company owner can also manage that organization's roles. If you have SSO enabled, you can use [SCIM for role mapping](/security/for-admins/provisioning/scim/). +> [!NOTE] +> +> 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. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select the **Members** tab. -3. Find the username of the member whose role you want to edit. Select the +1. Select the **Members** tab. +1. Find the username of the member whose role you want to edit. Select the **Actions menu**, then **Edit role**. -> [!NOTE] -> -> If you're the only owner of an organization, -> you need to assign a new owner before you can edit your role. - {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -223,15 +225,10 @@ To update a member role in the Admin Console: To update a member role in Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub**, your organization, and then **Members**. -3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon. -4. Select **Edit role**. -5. 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. +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**. {{< /tab >}} {{< /tabs >}} @@ -254,8 +251,8 @@ Owners can export a CSV file containing all members. The CSV file for a company To export a CSV file of your members: 1. In the [Admin Console](https://app.docker.com/admin), select your organization. -2. Select **Members**. -3. Select the **download** icon to export a CSV file of all members. +1. Select **Members**. +1. Select the **download** icon to export a CSV file of all members. {{< /tab >}} {{< tab name="Docker Hub" >}} @@ -265,8 +262,8 @@ To export a CSV file of your members: To export a CSV file of your members: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **My Hub**, your organization, and then **Members**. -3. Select the **Action** icon and then select **Export users as CSV**. +1. Select **My Hub**, your organization, and then **Members**. +1. Select the **Action** icon and then select **Export users as CSV**. {{< /tab >}} -{{< /tabs >}} \ No newline at end of file +{{< /tabs >}} diff --git a/content/manuals/admin/organization/onboard.md b/content/manuals/admin/organization/onboard.md index 6fa0cf1936d1..197f7b56cadd 100644 --- a/content/manuals/admin/organization/onboard.md +++ b/content/manuals/admin/organization/onboard.md @@ -2,7 +2,7 @@ title: Onboard your organization weight: 20 description: Get started onboarding your Docker Team or Business organization. -keywords: business, team, organizations, get started, onboarding +keywords: business, team, organizations, get started, onboarding, Admin Console, organization management, toc_min: 1 toc_max: 3 aliases: @@ -13,33 +13,40 @@ aliases: {{< summary-bar feature_name="Admin orgs" >}} -Learn how to onboard your organization using Docker Hub or the Docker Admin Console. +Learn how to onboard your organization using the Admin Console or Docker Hub. -Onboarding your organization lets administrators gain visibility into user activity and enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits. For more details, see [Docker subscriptions and features](../../subscription/details.md). +Onboarding your organization includes: -In this guide, you'll learn how to do the following: - -- Identify your users to help you efficiently allocate your subscription seats +- Identifying users to help you allocate your subscription seats - Invite members and owners to your organization -- Secure authentication and authorization for your organization using Single Sign-On (SSO) and System for Cross-domain Identity Management (SCIM) -- Enforce sign-on for Docker Desktop to ensure security best practices +- Secure authentication and authorization for your organization +- Enforce sign-in for Docker Desktop to ensure security best practices + +These actions help administrators gain visibility into user activity and +enforce security settings. Organization memebers also receive increased pull +limits and other benefits when they are signed in. ## Prerequisites -Before you start onboarding your organization, ensure that you: +Before you start onboarding your organization, ensure you: -- Have a Docker Team or Business subscription. See [Docker Pricing](https://www.docker.com/pricing/) for details. +- Have a Docker Team or Business subscription. For more details, see +[Docker subscriptions and features](/manuals/subscription/details.md). > [!NOTE] > - > When purchasing a self-serve subscription, the on-screen instructions guide you through creating an organization. If you have purchased a subscription through Docker Sales and you have not yet created an organization, see [Create an organization](/admin/organization/orgs). + > When purchasing a self-serve subscription, the on-screen instructions + guide you through creating an organization. If you have purchased a + subscription through Docker Sales and you have not yet created an + organization, see [Create an organization](/manuals/admin/organization/orgs.md). -- Familiarize yourself with Docker concepts and terminology in the [administration overview](../_index.md) and [FAQs](/faq/admin/general-faqs/). +- Familiarize yourself with Docker concepts and terminology in +the [administration overview](../_index.md). ## Onboard with guided setup -The Admin Console has a guided setup to help you easily -onboard your organization. The guided setup steps consist of basic onboarding +The Admin Console has a guided setup to help you +onboard your organization. The guided setup's steps consist of basic onboarding tasks. If you want to onboard outside of the guided setup, see [Recommended onboarding steps](/manuals/admin/organization/onboard.md#recommended-onboarding-steps). @@ -52,8 +59,8 @@ The guided setup walks you through the following onboarding steps: - **Invite your team**: Invite owners and members. - **Manage user access**: Add and verify a domain, manage users with SSO, and enforce Docker Desktop sign-in. -- **Docker Desktop security**: Configure image access management, registry access -management, and settings management. +- **Docker Desktop security**: Configure image access management, registry +access management, and settings management. ## Recommended onboarding steps @@ -63,56 +70,93 @@ Identifying your users helps you allocate seats efficiently and ensures they receive your Docker subscription benefits. 1. Identify the Docker users in your organization. - - If your organization uses device management software, like MDM or Jamf, you can use the device management software to help identify Docker users. See your device management software's documentation for details. You can identify Docker users by checking if Docker Desktop is installed at the following location on each user's machine: + - If your organization uses device management software, like MDM or Jamf, + you can use the device management software to help identify Docker users. + See your device management software's documentation for details. You can + identify Docker users by checking if Docker Desktop is installed at the + following location on each user's machine: - Mac: `/Applications/Docker.app` - Windows: `C:\Program Files\Docker\Docker` - Linux: `/opt/docker-desktop` - - If your organization doesn't use device management software or your users haven't installed Docker Desktop yet, you can survey your users. -2. Ask users to update their Docker account email to one in your organization’s domain, or create a new account with that email. - - To update an account's email address, instruct your users to sign in to [Docker Hub](https://hub.docker.com), and update the email address to their email address in your organization's domain. - - To create a new account, instruct your users to go [sign up](https://hub.docker.com/signup) using their email address in your organization's domain. -3. Ask your Docker sales representative or [contact sales](https://www.docker.com/pricing/contact-sales/) to get a list of Docker accounts that use an email address in your organization's domain. + - If your organization doesn't use device management software or your + users haven't installed Docker Desktop yet, you can survey your users to + identify who is using Docker Desktop. +1. Ask users to update their Docker account's email address to one associated +with your organization's domain, or create a new account with that email. + - To update an account's email address, instruct your users to sign in + to [Docker Hub](https://hub.docker.com), and update the email address to + their email address in your organization's domain. + - To create a new account, instruct your users to + [sign up](https://hub.docker.com/signup) using their email address associated + with your organization's domain. +1. Identify Docker accounts associated with your organization's domain: + - Ask your Docker sales representative or + [contact sales](https://www.docker.com/pricing/contact-sales/) to get a list + of Docker accounts that use an email address in your organization's domain. + - Use [domain audit](/manuals/security/for-admins/domain-audit.md) to + identify uncapture users in your organization. ### Step two: Invite owners -When you create an organization, you are the only owner. It is optional to add additional owners. Owners can help you onboard and manage your organization. +Owners can help you onboard and manage your organization. + +When you create an organization, you are the only owner. It is optional to +add additional owners. -To add an owner, invite a user and assign them the owner role. For more details, see [Invite members](/admin/organization/members/). +To add an owner, invite a user and assign them the owner role. For more +details, see [Invite members](/manuals/admin/organization/members.md) and +[Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md). ### Step three: Invite members -When you add users to your organization, you gain visibility into their activity and you can enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits. +When you add users to your organization, you gain visibility into their +activity and you can enforce security settings. Your members also +receive increased pull limits and other organization wide benefits when +they are signed in. -To add a member, invite a user and assign them the member role. For more details, see [Invite members](/admin/organization/members/). +To add a member, invite a user and assign them the member role. +For more details, see [Invite members](/manuals/admin/organization/members.md) and +[Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md). ### Step four: Manage user access with SSO and SCIM -Configuring SSO and SCIM is optional and only available to Docker Business subscribers. To upgrade a Docker Team subscription to a Docker Business subscription, see [Upgrade your subscription](/subscription/upgrade/). +Configuring SSO and SCIM is optional and only available to Docker Business +subscribers. To upgrade a Docker Team subscription to a Docker Business +subscription, see [Change your subscription](/manuals/subscription/change.md). Use your identity provider (IdP) to manage members and provision them to Docker automatically via SSO and SCIM. See the following for more details: - - [Configure SSO](/manuals/security/for-admins/single-sign-on/configure.md) to authenticate and add members when they sign in to Docker through your identity provider. - - Optional. [Enforce SSO](/manuals/security/for-admins/single-sign-on/connect.md) to ensure that when users sign in to Docker, they must use SSO. + - [Configure SSO](/manuals/security/for-admins/single-sign-on/configure.md) + to authenticate and add members when they sign in to Docker through your + identity provider. + - Optional. + [Enforce SSO](/manuals/security/for-admins/single-sign-on/connect.md) to + ensure that when users sign in to Docker, they must use SSO. > [!NOTE] > > Enforcing single sign-on (SSO) and enforcing Docker Desktop sign in are different features. For more details, see - > [Enforcing sign-in versus enforcing single sign-on (SSO)](/security/for-admins/enforce-sign-in/#enforcing-sign-in-versus-enforcing-single-sign-on-sso). + > [Enforcing sign-in versus enforcing single sign-on (SSO)](/manuals/security/for-admins/enforce-sign-in.md#enforcing-sign-in-versus-enforcing-single-sign-on-sso). - - [Configure SCIM](/security/for-admins/provisioning/scim/) to automatically provision, add, and de-provision members to Docker through your identity provider. + - [Configure SCIM](/manuals/security/for-admins/provisioning/scim.md) to + automatically provision, add, and de-provision members to Docker through + your identity provider. ### Step five: Enforce sign-in for Docker Desktop By default, members of your organization can use Docker Desktop without signing in. When users don’t sign in as a member of your organization, they don’t -receive the [benefits of your organization’s subscription](../../subscription/details.md) and they can circumvent [Docker’s security features](/security/for-admins/hardened-desktop/). +receive the +[benefits of your organization’s subscription](../../subscription/details.md) +and they can circumvent [Docker’s security features](/manuals/security/for-admins/hardened-desktop/_index.md). -There are multiple ways you can enforce sign-in, depending on your company's setup and preferences: -- [Registry key method (Windows only)](/security/for-admins/enforce-sign-in/methods/#registry-key-method-windows-only) -- [`.plist` method (Mac only)](/security/for-admins/enforce-sign-in/methods/#plist-method-mac-only) -- [`registry.json` method (All)](/security/for-admins/enforce-sign-in/methods/#registryjson-method-all) +There are multiple ways you can enforce sign-in, depending on your organization's +Docker configuration: +- [Registry key method (Windows only)](/manuals/security/for-admins/enforce-sign-in/methods.md#registry-key-method-windows-only) +- [`.plist` method (Mac only)](/manuals/security/for-admins/enforce-sign-in/methods.md#plist-method-mac-only) +- [`registry.json` method (All)](/manuals/security/for-admins/enforce-sign-in/methods.md#registryjson-method-all) ### Step six: Manage Docker Desktop security @@ -125,8 +169,12 @@ security posture: ## What's next -- [Manage Docker products](./manage-products.md) to configure access and view usage. -- Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development. -- [Audit your domains](/docker-hub/domain-audit/) to ensure that all Docker users in your domain are part of your organization. +- [Manage Docker products](./manage-products.md) to configure access and view +usage. +- Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve +your organization’s security posture for containerized development. +- [Audit your domains](/docker-hub/domain-audit/) to ensure that all Docker +users in your domain are part of your organization. -Your Docker subscription provides many more additional features. To learn more, see [Docker subscriptions and features](/subscription/details/). \ No newline at end of file +Your Docker subscription provides many more additional features. To learn more, +see [Docker subscriptions and features](/subscription/details/). \ No newline at end of file diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 712b8b76fb84..034cfabb6b4f 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -2,23 +2,29 @@ title: Create your organization weight: 10 description: Learn how to create an organization. -keywords: Docker, docker, registry, teams, organizations, plans, Dockerfile, Docker - Hub, docs, documentation +keywords: docker organizations, organization, create organization, docker teams, docker admin console, organization management aliases: -- /docker-hub/orgs/ + - /docker-hub/orgs/ --- {{< summary-bar feature_name="Admin orgs" >}} -This section describes how to create an organization. Before you begin: +This page describes how to create an organization. + +## Prerequisites + +Before you begin creating an organization: - You need a [Docker ID](/accounts/create-account/) -- Review the [Docker subscriptions and features](../../subscription/details.md) to determine what subscription to choose for your organization +- Review the [Docker subscriptions and features](../../subscription/details.md) + to determine what subscription to choose for your organization ## Create an organization There are multiple ways to create an organization. You can either: -- Create a new organization using the **Create Organization** option in Docker Hub + +- Create a new organization using the **Create Organization** option in the +Admin Console or Docker Hub - Convert an existing user account to an organization The following section contains instructions on how to create a new organization. For prerequisites and @@ -31,54 +37,61 @@ detailed instructions on converting an existing user account to an organization, To create an organization: 1. Sign in to [Docker Home](https://app.docker.com/). -2. Under Settings and administration, select **Go to Admin Console**. -3. Select the **Organization** drop-down in the left-hand navigation and then **Create Organization**. -4. 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. -5. Select **Continue to profile**. -6. 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. +1. Under **Settings and administration**, select **Go to Admin Console**. +1. Select the organization drop-down, then **Create 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 Docker's subscriptions. +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). - -7. 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. -8. Select **Continue to billing** to continue. -9. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. -10. Provide your card details and select **Purchase**. - -You've now created an organization. + > 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 payment details and select **Purchase**. {{< /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. -2. Select **My Hub**, select the account drop-down, and then **Create Organization** to create a new organization. -3. 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. -4. Select **Continue to profile**. -5. 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. +1. Sign in to [Docker Hub](https://hub.docker.com/) using your Docker ID, +your email address, or your social provider. +1. Select the organization drop-down, then **Create 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 Docker's subscriptions. +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). - -6. 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. -7. Select **Continue to billing** to continue. -8. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. -9. Provide your card details and select **Purchase**. - -You've now created an organization. + > 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 payment details and select **Purchase**. {{< /tab >}} {{< /tabs >}} @@ -91,25 +104,22 @@ You've now created an organization. To view an organization in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com). -2. Under Settings and administration, select **Go to Admin Console**. -3. Select your organization from the **Organization** drop-down in the left-hand navigation. +1. Under Settings and administration, select **Go to Admin Console**. +1. Select your organization from the organization drop-down in the +left-hand navigation. The Admin Console 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. - - **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. - - **Security and access**: Manage security settings. For more information, see [Security](/manuals/security/_index.md). - - **Organization settings**: Update organization information or [deactivate your organization](/manuals/admin/organization/deactivate-account.md). {{< /tab >}} @@ -119,49 +129,38 @@ configure your organization. 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. +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. - -2. Select **My Hub** in the top navigation bar, then choose your - organization from the list. + > [!NOTE] + > + > You can't sign in directly to an organization. After converting from + > a user to an organization, sign in with the owner or team member + > account. If you don’t see the org, you may not be a member or owner. +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/security/for-admins/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. - + 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). + [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 >}} @@ -170,21 +169,29 @@ configure your organization. > [!WARNING] > -> If you are merging organizations, it is recommended to do so at the *end* of +> If you are merging organizations, it is recommended to do so at the _end_ of > your billing cycle. When you merge an organization and downgrade another, you > will lose seats on your downgraded organization. Docker does not offer > refunds for downgrades. -If you have multiple organizations that you want to merge into one, complete the following: +If you have multiple organizations that you want to merge into one, complete +the following steps: -1. Based on the number of seats from the secondary organization, [purchase additional seats](../../subscription/manage-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/change.md) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle. +1. Based on the number of seats from the secondary organization, +[purchase additional seats](../../subscription/manage-seats.md) for the +primary organization account that you want to keep. +1. Manually add users to the primary organization and remove existing users +from the secondary organization. +1. Manually move over your data, including all repositories. +1. Once you're done moving all of your users and data, +[downgrade](../../subscription/change.md) the secondary account to a free +subscription. Note that Docker does not offer refunds for downgrading +organizations mid-billing cycle. > [!TIP] > -> If your organization has a Docker Business subscription with a purchase order, contact Support or your Account Manager at Docker. +> If your organization has a Docker Business subscription with a purchase +order, contact Support or your Account Manager at Docker. ## More resources diff --git a/hugo_stats.json b/hugo_stats.json index eb013ca65696..b27eebefe79e 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -2,7 +2,6 @@ "htmlElements": { "tags": null, "classes": [ - "!mt-0", "--mount", "--tmpfs", "-mr-8", @@ -33,13 +32,15 @@ "Command-Prompt-CLI", "Compliant", "Custom-builder", + "DNS-resolution", "Debian", "Debian-GNU/Linux", "Diff", "Docker-Desktop", + "Docker-Engine", "Docker-Hub", "Docker-Scout-Dashboard", - "Docker-plan", + "Docker-subscription", "Download", "Entra-ID", "Entra-ID-SAML-2.0", @@ -47,6 +48,8 @@ "Fedora", "For-Mac-with-Apple-silicon", "For-Mac-with-Intel-chip", + "From-Docker-Desktop", + "From-the-Docker-CLI", "From-the-GUI", "From-the-command-line", "GUI", @@ -65,8 +68,8 @@ "JavaScript", "Jenkins", "Latest", - "Legacy-Docker-plan", "Legacy-Docker-plans", + "Legacy-Docker-subscription", "Linux", "Local-or-Hub-storage", "MDM", @@ -80,6 +83,7 @@ "Mac-with-Intel-chip", "Manually-create-assets", "NetworkManager", + "Networking-mode", "Node", "Non-compliant", "Okta", @@ -146,8 +150,8 @@ "bg-amber-500", "bg-background-light", "bg-background-toc", + "bg-black/100", "bg-black/50", - "bg-black/70", "bg-blue", "bg-blue-400", "bg-blue-500", @@ -445,7 +449,6 @@ "overflow-x-auto", "overflow-x-hidden", "overflow-y-auto", - "p-1", "p-2", "p-3", "p-4", @@ -513,7 +516,6 @@ "sm:hidden", "sm:items-center", "sm:w-full", - "space-x-2", "space-y-2", "space-y-4", "sticky", @@ -523,6 +525,9 @@ "svg-container", "syntax-light", "systemd-networkd", + "tab-item", + "tablist", + "tabs", "text-2xl", "text-base", "text-black",