Skip to content

Commit 2b6f23a

Browse files
sarahsanders-dockersarahsanders-docker
authored
Merge pull request #21386 from docker/published-update
publish updates from main
2 parents 8ff0f39 + 5ffcf87 commit 2b6f23a

File tree

2 files changed

+133
-72
lines changed

2 files changed

+133
-72
lines changed

‎content/manuals/admin/organization/members.md‎

Lines changed: 124 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ aliases:
99

1010
Learn how to manage members for your organization in Docker Hub and the Docker Admin Console.
1111

12+
## Invite members
13+
1214
{{< tabs >}}
1315
{{< tab name="Docker Hub" >}}
1416

@@ -24,18 +26,97 @@ Learn how to manage members for your organization in Docker Hub and the Docker A
2426
{{< /tab >}}
2527
{{< /tabs >}}
2628

29+
## Accept invitation
30+
31+
When an invitation is to a user's email address, they receive
32+
a link to Docker Hub where they can accept or decline the invitation.
33+
To accept an invitation:
34+
35+
1. Navigate to your email inbox and open the Docker email with an invitation to
36+
join the Docker organization.
37+
2. To open the link to Docker Hub, select the **click here** link.
38+
3. The Docker create an account page will open. If you already have an account, select **Already have an account? Sign in**.
39+
If you do not have an account yet, create an account using the same email
40+
address you received the invitation through.
41+
4. Optional. If you do not have an account and created one, you must navigate
42+
back to your email inbox and verify your email address using the Docker verification
43+
email.
44+
5. Once you are signed in to Docker Hub, select **Organizations** from the top-level navigation menu.
45+
6. The organizations page will display your invitation. Select **Accept**.
46+
47+
After accepting an invitation, you are now a member of the organization.
48+
49+
## Manage invitations
50+
51+
After inviting members, you can resend or remove invitations as needed.
52+
53+
### Resend an invitation
54+
55+
{{< tabs >}}
56+
{{< tab name="Docker Hub" >}}
57+
58+
To resend an invitation from Docker Hub:
59+
60+
1. Sign in to [Docker Hub](https://hub.docker.com/).
61+
2. Select **Organizations**, your organization, and then **Members**.
62+
3. In the table, locate the invitee, select the **Actions** icon, and then select
63+
**Resend invitation**.
64+
4. Select **Invite** to confirm.
65+
66+
{{< /tab >}}
67+
{{< tab name="Admin Console" >}}
68+
69+
{{< include "admin-early-access.md" >}}
70+
71+
To resend an invitation from the Admin Console:
72+
73+
1. Open the [Admin Console](https://app.docker.com/admin) and select your organization from
74+
top-left drop-down menu.
75+
2. Select **Members**.
76+
3. Select the **action menu** next to the invitee and select **Resend invitation**.
77+
4. Select **Invite** to confirm.
78+
79+
{{< /tab >}}
80+
{{< /tabs >}}
81+
82+
### Remove an invitation
83+
84+
{{< tabs >}}
85+
{{< tab name="Docker Hub" >}}
86+
87+
To remove a member's invitation from Docker Hub:
88+
89+
1. Sign in to [Docker Hub](https://hub.docker.com/).
90+
2. Select **Organizations**, your organization, and then **Members**.
91+
3. In the table, select the **Action** icon, and then select **Remove member** or **Remove invitee**.
92+
4. Follow the on-screen instructions to remove the member or invitee.
93+
94+
{{< /tab >}}
95+
{{< tab name="Admin Console" >}}
96+
97+
{{< include "admin-early-access.md" >}}
98+
99+
To remove an invitation from the Admin Console:
100+
101+
1. Open the [Admin Console](https://app.docker.com/admin) and select your organization from
102+
top-left drop-down menu.
103+
2. Select **Members**.
104+
3. Select the **action menu** next to the invitee and select **Remove invitee**.
105+
4. Select **Remove** to confirm.
106+
107+
{{< /tab >}}
108+
{{< /tabs >}}
109+
27110
## Manage members on a team
28111

29-
Use Docker Hub to add a member to a team or remove a member from a team.
112+
Use Docker Hub or the Admin Console to add or remove team members. Organization owners can add a member to one or more teams within an organization.
30113

31114
### Add a member to a team
32115

33-
Organization owners can add a member to one or more teams within an organization.
34-
35116
{{< tabs >}}
36117
{{< tab name="Docker Hub" >}}
37118

38-
To add a member to a team:
119+
To add a member to a team with Docker Hub:
39120

40121
1. Sign in to [Docker Hub](https://hub.docker.com).
41122
2. Select **Organizations**, your organization, and then **Members**.
@@ -55,9 +136,9 @@ To add a member to a team:
55136

56137
{{< include "admin-early-access.md" >}}
57138

58-
To add a member to a team:
139+
To add a member to a team with the Admin Console:
59140

60-
1. In the Admin Console, select your organization.
141+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
61142
2. Select the team name.
62143
3. Select **Add member**. You can add the member by searching for their email address or username.
63144

@@ -75,9 +156,7 @@ Organization owners can remove a member from a team in Docker Hub or Admin Conso
75156
{{< tabs >}}
76157
{{< tab name="Docker Hub" >}}
77158

78-
To add a member to a team:
79-
80-
To remove a member from a specific team:
159+
To remove a member from a specific team with Docker Hub:
81160

82161
1. Sign in to [Docker Hub](https://hub.docker.com).
83162
2. Select **Organizations**, your organization, **Teams**, and then the team.
@@ -89,12 +168,46 @@ To remove a member from a specific team:
89168

90169
{{< include "admin-early-access.md" >}}
91170

92-
To remove a member from a specific team:
171+
To remove a member from a specific team with the Admin Console:
93172

94-
1. In the Admin Console, select your organization.
173+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
95174
2. Select the team name.
96175
3. Select the **X** next to the user's name to remove them from the team.
97176
4. When prompted, select **Remove** to confirm.
98177

99178
{{< /tab >}}
100179
{{< /tabs >}}
180+
181+
### Update a member role
182+
183+
Organization owners can manage [roles](/security/for-admins/roles-and-permissions/)
184+
within an organization. If an organization is part of a company,
185+
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/).
186+
187+
> [!NOTE]
188+
>
189+
> If you're the only owner of an organization,
190+
> you need to assign a new owner before you can edit your role.
191+
192+
To update a member role:
193+
194+
1. Sign in to [Docker Hub](https://hub.docker.com).
195+
2. Select **Organizations**, your organization, and then **Members**.
196+
3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon.
197+
4. Select **Edit role**.
198+
5. Select their organization, select the role you want to assign, and then select **Save**.
199+
200+
## Export members CSV file
201+
202+
Owners can export a CSV file containing all members. The CSV file for a company contains the following fields:
203+
- Name: The user's name
204+
- Username: The user's Docker ID
205+
- Email: The user's email address
206+
- Member of Organizations: All organizations the user is a member of within a company
207+
- Invited to Organizations: All organizations the user is an invitee of within a company
208+
- Account Created: The time and date when the user account was created
209+
210+
To export a CSV file of the members:
211+
1. Sign in to [Docker Hub](https://hub.docker.com).
212+
2. Select **Organizations**, your organization, and then **Members**.
213+
3. Select the **Action** icon and then select **Export users as CSV**.

‎layouts/shortcodes/admin-users.html‎

Lines changed: 9 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{{ $member_navigation := "Select **Organizations**, your organization, and then **Members**." }}
44
{{ $remove_button := "**Remove member**" }}
55
{{ $product_link := "[Docker Hub](https://hub.docker.com)" }}
6-
{{ $update_role := "Select the role you want to assign, then select **Save**." }}
76
{{ $role_mapping_link := "[SCIM for role mapping](/security/for-admins/provisioning/scim/)" }}
87
{{ $export_fields := `The CSV file for an organization contains the following fields:
98
* **Name**: The user's name.
@@ -32,16 +31,13 @@
3231
* **Account Created**: The time and date when the user account was created.` }}
3332
{{ $member_navigation = "Select your company in the left navigation drop-down menu, and then select **Users**." }}
3433
{{ $remove_button = "**Remove user**" }}
35-
{{ $update_role = "Select their organization, select the role you want to assign, and then select **Save**." }}
3634
{{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/provisioning/scim/)"}}
3735
{{ end }}
3836
{{ end }}
3937

40-
## Invite members
41-
42-
Owners can invite new members to an organization via Docker ID, email address, or via a CSV file containing email
38+
Owners can invite new members to an organization via Docker ID, email address, or with a CSV file containing email
4339
addresses. If an invitee does not have a Docker account, they must create an account and verify their email address
44-
before they can accept the invitation to join the organization. When inviting members, their pending invitation occupies
40+
before they can accept an invitation to join the organization. When inviting members, their pending invitation occupies
4541
a seat.
4642

4743
### Invite members via Docker ID or email address
@@ -56,7 +52,7 @@
5652
5. Follow the on-screen instructions to invite members.
5753
Invite a maximum of 1000 members and separate multiple entries by comma, semicolon, or space.
5854

59-
> **Note**
55+
> [!NOTE]
6056
>
6157
> When you invite members, you assign them a role.
6258
> See [Roles and permissions](/security/for-admins/roles-and-permissions/)
@@ -98,7 +94,7 @@
9894
7. Select **Browse files** and then select your CSV file, or drag and drop the CSV file into the **Select a CSV file to
9995
upload** box. You can only select one CSV file at a time.
10096

101-
> **Note**
97+
> [!NOTE]
10298
>
10399
> If the amount of email addresses in your CSV file exceeds the number of available seats in your organization, you
104100
> cannot continue to invite members. To invite members, you can purchase more seats, or remove some email addresses from
@@ -110,69 +106,21 @@
110106
Valid email addresses and any email addresses that have issues appear.
111107
Email addresses may have the following issues:
112108

113-
- **Invalid email**: The email address is not a valid address.
109+
- Invalid email: The email address is not a valid address.
114110
The email address will be ignored if you send invites.
115111
You can correct the email address in the CSV file and re-import the file.
116-
- **Already invited**: The user has already been sent an invite email and another invite email will not be sent.
117-
- **Member**: The user is already a member of your organization and an invite email will not be sent.
118-
- **Duplicate**: The CSV file has multiple occurrences of the same email address.
112+
- Already invited: The user has already been sent an invite email and another invite email will not be sent.
113+
- Member: The user is already a member of your organization and an invite email will not be sent.
114+
- Duplicate: The CSV file has multiple occurrences of the same email address.
119115
The user will be sent only one invite email.
120116

121117
9. Follow the on-screen instructions to invite members.
122118

123-
> **Note**
119+
> [!NOTE]
124120
>
125121
> When you invite members, you assign them a role.
126122
> See [Roles and permissions](/security/for-admins/roles-and-permissions/)
127123
> for details about the access permissions for each role.
128124

129125
Pending invitations appear in the table. The invitees receive an email with a link to Docker Hub where they can accept
130126
or decline the invitation.
131-
132-
## Resend invitations
133-
134-
To resend an invitation if the invite is pending or declined:
135-
136-
1. Sign in to {{ $product_link }}.
137-
2. {{ $member_navigation }}
138-
3. In the table, locate the invitee, select the **Action** icon, and then select **Resend invitation**.
139-
4. Select **Invite** to confirm.
140-
141-
## Remove a member or invitee
142-
143-
To remove a member from an organization:
144-
145-
1. Sign in to {{ $product_link }}.
146-
2. {{ $member_navigation }}
147-
3. In the table, select the **Action** icon, and then select {{ $remove_button }} or **Remove invitee**.
148-
4. Follow the on-screen instructions to remove the member or invitee.
149-
150-
## Update a member role
151-
152-
Organization owners can manage [roles](/security/for-admins/roles-and-permissions/)
153-
within an organization. If an organization is part of a company,
154-
the company owner can also manage that organization's roles. If you have SSO enabled, you can use {{ $role_mapping_link }}.
155-
156-
> **Note**
157-
>
158-
> If you're the only owner of an organization,
159-
> you need to assign a new owner before you can edit your role.
160-
161-
To update a member role:
162-
163-
1. Sign in to {{ $product_link }}.
164-
2. {{ $member_navigation }}
165-
3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon.
166-
4. Select **Edit role**.
167-
5. {{ $update_role }}
168-
169-
## Export members
170-
171-
Owners can export a CSV file containing all members.
172-
{{ $export_fields }}
173-
174-
To export a CSV file of the members:
175-
176-
1. Sign in to {{ $product_link }}.
177-
2. {{ $member_navigation }}
178-
3. Select {{ $export_button }}.

0 commit comments

Comments
 (0)