-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Promoting upsells to callouts #24153
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
d0277da
079b3cf
0f4630d
d5444ef
8a3de25
084b94d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
| 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 | ||
| 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. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The information about invitation links expiring after 14 days was moved from DURING the step-by-step acceptance instructions (where it was a WARNING callout between steps 2-3) to AFTER the completion message. Users need to know about the 14-day deadline WHILE they're following the invitation steps, not after they've finished. This time-sensitive information has reduced visibility in its current location. Suggestion: Consider keeping this as a callout within or immediately before the acceptance steps, or at minimum, move it before the "After accepting an invitation" paragraph.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ignoring because if they're already following instructions to accept an invite, then they don't have to worry about the 14 day expiration. |
||
|
|
||
| ## 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. | ||
akristen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 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 | ||
akristen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| for your organization so you can edit your role. | ||
|
|
||
| ## Export members CSV file | ||
|
|
||
| {{< summary-bar feature_name="Admin orgs" >}} | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.