diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index 9e45ad9f1f6b..c984c63809d9 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -48,23 +48,26 @@ The [Docker Admin Console](https://app.docker.com/admin) provides administrators ### Company -A company groups multiple Docker organizations for centralized configuration. -Companies are only available for Docker Business subscribers. +A company groups multiple Docker organizations for centralized configuration. Companies have the company owner administrator role available. -Companies have the company owner administrator role available: +The 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 - Do not occupy a seat +Companies are only available for Docker Business subscribers. + ### Organization -An organization contains teams and repositories. All Docker Team and Business -subscribers must have at least one organization. +Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/admin/faqs/organization-faqs/#what-is-the-difference-between-user-invitee-seat-and-member). + +- An organization contains teams and repositories. +- All Docker Team and Business subscribers must have at least one organization. -Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/admin/faqs/organization-faqs/#what-is-the-difference-between-user-invitee-seat-and-member). If you want to [upgrade to a Docker Business plan](https://www.docker.com/pricing/), you can access the company owner role. -While creating a company is optional, organizations are required for Team and Business subscriptions. +> [!TIP] +> [Upgrading to a Docker Business plan](https://www.docker.com/pricing/) grants you the company owner role so you can manage multiple organizations. ### Team diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 0d29918d7849..bbb869a07782 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -22,9 +22,7 @@ Use the following steps to invite members to your organization via Docker ID or 1. Select **Emails or usernames**. 1. Follow the on-screen instructions to invite members. Invite a maximum of 1000 members and separate multiple entries by comma, semicolon, or space. -> [!NOTE] -> -> When you invite members, you assign them a role. See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md) for +When you invite members, you assign them a role. See [Roles and permissions](/enterprise/security/roles-and-permissions) for details about the access permissions for each role. Pending invitations appear in the table. Invitees receive an email with a link to Docker Hub where they can accept or decline the invitation. @@ -33,49 +31,26 @@ Pending invitations appear in the table. Invitees receive an email with a link t To invite multiple members to an organization via a CSV file containing email addresses: -1. Sign in to [Docker Home](https://app.docker.com) and select your organization from the top-left account drop-down. -1. Select **Members**, then **Invite**. -1. Select **CSV upload**. -1. Optional. Select **Download the template CSV file** to download an example CSV file. The following is an example of the contents of a valid CSV file. - -```text -email -docker.user-0@example.com -docker.user-1@example.com -``` +1. Sign in to [Docker Home](https://app.docker.com) and select your organization from the top-left account drop-down. Select **Members** > **Invite** > **CSV upload**. +1. Optional. Select **Download the template CSV file** to download an example CSV file. The following is an example of the contents of a valid CSV file: -CSV file requirements: + ```text + email + docker.user-0@example.com + docker.user-1@example.com + ``` -- The file must contain a header row with at least one heading named email. Additional columns are allowed and are ignored in the import. -- The file must contain a maximum of 1000 email addresses (rows). To invite more than 1000 users, create multiple CSV files and perform all steps in this task for each file. + The example file demonstrates CSV file requirements: + - The file must contain a header row with at least one heading named email. Additional columns are allowed and are ignored in the import. + - The file must contain a maximum of 1000 email addresses (rows). To invite more than 1000 users, create multiple CSV files and perform all steps in this task for each file. 1. Create a new CSV file or export a CSV file from another application. - -- To export a CSV file from another application, see the application’s documentation. -- To create a new CSV file, open a new file in a text editor, type email on the first line, type the user email addresses one per line on the following lines, and then save the file with a .csv extension. - + - To export a CSV file from another application, see the application’s documentation. + - To create a new CSV file, open a new file in a text editor, type email on the first line, type the user email addresses one per line on the following lines, and then save the file with a .csv extension. 1. Select **Browse files** and then select your CSV file, or drag and drop the CSV file into the **Select a CSV file to upload** box. You can only select one CSV file at a time. - -> [!NOTE] -> -> If the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you cannot continue to invite members. To invite members, you can purchase more seats, or remove some email addresses from the CSV file and re-select the new file. To purchase more seats, see [Add seats](/manuals/subscription/manage-seats.md) to your subscription or [Contact sales](https://www.docker.com/pricing/contact-sales/). - -1. After the CSV file has been uploaded, select **Review**. - -Valid email addresses and any email addresses that have issues appear. Email addresses may have the following issues: - -- Invalid email: The email address is not a valid address. The email address will be ignored if you send invites. You can correct the email address in the CSV file and re-import the file. -- Already invited: The user has already been sent an invite email and another invite email will not be sent. -- Member: The user is already a member of your organization and an invite email will not be sent. -- Duplicate: The CSV file has multiple occurrences of the same email address. The user will be sent only one invite email. - +1. After the CSV file has been uploaded, select **Review** to identify any invalid email addresses, already invited users, invited users who are already members, or duplicated email addresses within the same CSV file. 1. Follow the on-screen instructions to invite members. -> [!NOTE] -> -> When you invite members, you assign them a role. See [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md) for -details about the access permissions for each role. - Pending invitations appear in the table. The invitees receive an email with a link to Docker Hub where they can accept or decline the invitation. ### Invite members via API @@ -84,21 +59,14 @@ You can bulk invite members using the Docker Hub API. For more information, see ## Accept invitation -When an invitation is to a user's email address, they receive -a link to Docker Hub where they can accept or decline the invitation. +After receiving an email invitation, users can access +a link to Docker Hub where they can accept or decline the invitation. + To accept an invitation: 1. Check your email inbox and open the Docker email with an invitation to join the Docker organization. 1. To open the link to Docker Hub, select the **click here** link. - - > [!WARNING] - > - > Invitation email links expire after 14 days. If your email link has expired, - > you can sign in to [Docker Hub](https://hub.docker.com/) with the email - > address the link was sent to and accept the invitation from the - > **Notifications** panel. - 1. The Docker create an account page will open. 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. @@ -110,9 +78,14 @@ email. After accepting an invitation, you are now a member of the organization. +Invitation email links expire after 14 days. If your email link has expired, you can sign in to [Docker Hub](https://hub.docker.com/) with the email address the link was sent to and accept the invitation from the **Notifications** panel. + ## Manage invitations -After inviting members, you can resend or remove invitations as needed. Need to manage more than 1,000 team members? [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing/) and advanced role management. +After inviting members, you can resend or remove invitations as needed. Each invitee occupies one seat, so if the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you won't be able to invite more members. + +> [!TIP] +> Need to manage more than 1,000 team members? [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing/) and advanced role management. You can also [add seats](/subscription/manage-seats) to your subscription. ### Resend an invitation @@ -163,18 +136,13 @@ An invitee must first accept the invitation to join the organization before bein ### Remove members from teams -> [!NOTE] -> -> If your organization uses single sign-on (SSO) with [SCIM](/manuals/enterprise/security/provisioning/scim.md) enabled, you should remove members from your identity provider (IdP). This will automatically remove members from Docker. If SCIM is disabled, you must manually manage members in Docker. +If your organization uses single sign-on (SSO) with [SCIM](/enterprise/security/provisioning/scim) enabled, you should remove members from your identity provider (IdP). This automatically removes members from Docker. If SCIM is disabled, follow procedures in this doc to remove members manually in Docker. -Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources. - -To remove a member from a specific team with the Admin Console: +Organization owners can remove a member from a team in Docker Hub or Admin Console. Removing the member from the team will revoke their access to the permitted resources. To remove a member from a specific team with the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com/) and select your organization. -1. Select **Teams**. -1. Select the team name. +1. Select **Teams**, then choose the name of the team member you want to remove. 1. Select the **X** next to the user's name to remove them from the team. 1. When prompted, select **Remove** to confirm. @@ -184,11 +152,6 @@ 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. - To update a member role in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com/) and select your @@ -197,6 +160,9 @@ organization. 1. Find the username of the member whose role you want to edit. Select the **Actions** menu, then **Edit role**. +If you're the only owner of an organization and you want to edit your role, assign a new owner +for your organization so you can edit your role. + ## Export members CSV file {{< summary-bar feature_name="Admin orgs" >}} diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 5e14d5253bbf..a325509fd137 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -9,49 +9,39 @@ aliases: {{< summary-bar feature_name="Admin orgs" >}} -This page describes how to create an organization. - -## Prerequisites - -Before you create an organization, you need a [Docker ID](/accounts/create-account/). - -Need a different plan for your team's needs? Review different [Docker subscriptions and features](https://www.docker.com/pricing/) - to choose a subscription 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 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 -detailed instructions on converting an existing user account to an organization, see +These procedures walk you through creating an organization from the Admin Console. + +## Prerequisites + +* Before you create an organization, you need a [Docker ID](/accounts/create-account/). +* For prerequisites and detailed instructions on converting an existing user account to an organization, see [Convert an account into an organization](/manuals/admin/organization/convert-account.md). -To create an organization: +> [!TIP] +> Need a different plan for your team's needs? Review different [Docker subscriptions and features](https://www.docker.com/pricing/) to choose a subscription for your organization. + +## Create an organization 1. Sign in to [Docker Home](https://app.docker.com/) and navigate to the bottom -of the organization list. -1. Select **Create new organization**. +of the organization list. Select **Create new organization**. 1. Choose a subscription for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business subscription. -1. Select **Continue to profile**. -1. Select **Create an organization** to create a new one. +1. Select **Continue to profile**, then **Create an organization** to create a new organization. 1. Enter an **Organization namespace**. This is the official, unique name for -your organization in Docker Hub. It's not possible to change the name of the -organization after you've created it. - - > [!NOTE] - > - > You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/admin/organization/convert-account.md). - -1. Enter your **Company name**. This is the full name of your company. Docker -displays the company name on your organization page and in the details of any -public images you publish. You can update the company name anytime by navigating -to your organization's **Settings** page. -1. Select **Continue to billing** to continue. -1. Enter your organization's billing information and select **Continue to payment** to continue to the billing portal. +your organization in Docker Hub. + * It's not possible to change the name of the organization after you've created it. + * Your Docker ID and organization can't share the same name. + * 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, then enter your organization's billing information. Select **Continue to payment** to continue to the billing portal. 1. Provide your payment details and select **Purchase**. You've now created an organization. @@ -84,9 +74,7 @@ the following steps: 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 +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/content/manuals/billing/payment-method.md b/content/manuals/billing/payment-method.md index 0c6afd14795f..699c03cc1283 100644 --- a/content/manuals/billing/payment-method.md +++ b/content/manuals/billing/payment-method.md @@ -182,7 +182,8 @@ organization. 1. Confirm your billing contact details. If you need to change them, select **Change** and enter your new details. -If you want to pay by invoice, [upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing/). +> [!TIP] +> Do you need to pay by invoice? [Upgrade to a Docker Business or Docker Team plan](https://www.docker.com/pricing/) and choose the annual subscription. ## Verify a bank account