Skip to content

Commit c9366f2

Browse files
cx: add deprecation alerts to hub org management docs (docker#22386)
## Description Core experiences is planning to deprecate org management in Docker Hub in a few months (~2ish months). This will remove org management from the following DH pages: - Members - Teams - Activity Logs - Settings - General - Settings - Security - Settings - Image Access - Settings Registry Access - Settings - Deactivate org This PR: - Adds an include for the hub management callouts - Adds the new include to all docs that mention deprecated flows/pages for hub org management (docs across Admin and Security mostly) - Restructuring docs w/ Admin Console vs. Docker Hub tabs, leading with Admin Console - Some other small nits while I was in this area _I am still waiting on confirmation about Team repo management. This is not currently in the Admin Console._ ## Related issues or tickets - [ENGDOCS-2516](https://docker.atlassian.net/browse/ENGDOCS-2516) ## Reviews - [ ] Editorial review - [ ] Product review [ENGDOCS-2516]: https://docker.atlassian.net/browse/ENGDOCS-2516?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
1 parent 11e8cb3 commit c9366f2

File tree

21 files changed

+224
-152
lines changed

21 files changed

+224
-152
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
> [!IMPORTANT]
2+
>
3+
> Organization management is moving to the Admin Console.
4+
>
5+
> Manage members, team, settings, and activity logs in the Docker Admin Console.
6+
> Access to these features in Docker Hub will end soon. Explore the [Admin Console](https://app.docker.com/admin).

content/manuals/admin/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ aliases:
3535
- /docker-hub/admin-overview
3636
---
3737

38-
Administrators can manage companies and organizations using the Docker Admin Console, or manage organizations in Docker Hub.
38+
Administrators can manage companies and organizations using the Docker Admin Console.
3939

40-
The Docker Admin Console is available for customers with a Docker Business subscription. 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.
40+
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.
4141

4242
![Docker hierarchy](./images/docker-admin-structure.webp)
4343

content/manuals/admin/organization/activity-logs.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ Owners can also see the activity logs for their repository if the repository is
2323
## Manage activity logs
2424

2525
{{< tabs >}}
26-
{{< tab name="Docker Hub" >}}
26+
{{< tab name="Admin Console" >}}
2727

28-
{{% admin-org-audit-log product="hub" %}}
28+
{{% admin-org-audit-log product="admin" %}}
2929

3030
{{< /tab >}}
31-
{{< tab name="Admin Console" >}}
31+
{{< tab name="Docker Hub" >}}
3232

33-
{{% admin-org-audit-log product="admin" %}}
33+
{{% include "hub-org-management.md" %}}
34+
35+
{{% admin-org-audit-log product="hub" %}}
3436

3537
{{< /tab >}}
3638
{{< /tabs >}}

content/manuals/admin/organization/convert-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Consider the following effects of converting your account:
5454

5555
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.
5656

57-
2. Sign in to your [Docker account](https://app.docker.com/login).
57+
2. Sign in to [Docker Home](https://app.docker.com/login).
5858

5959
3. In Docker Home, select your avatar in the top-right corner to open the drop-down.
6060

content/manuals/admin/organization/deactivate-account.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Once you have completed all the previous steps, you can deactivate your organiza
4949
{{< /tab >}}
5050
{{< tab name="Docker Hub" >}}
5151

52+
{{% include "hub-org-management.md" %}}
53+
5254
1. On Docker Hub, select **My Hub**.
5355
2. Choose the organization you want to deactivate.
5456
3. In **Settings**, select the **Deactivate org** and then **Deactivate organization**.

content/manuals/admin/organization/manage-a-team.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,22 @@ The organization owner can also add additional organization owners to help them
3535
## Create a team
3636

3737
{{< tabs >}}
38-
{{< tab name="Docker Hub" >}}
38+
{{< tab name="Admin Console" >}}
3939

40-
1. Sign in to [Docker Hub](https://hub.docker.com).
41-
2. Select **My Hub** and choose your organization.
42-
3. Select the **Teams** and then select **Create Team**.
40+
1. In Admin Console, select your organization.
41+
2. In the **User management** section, select **Teams**.
42+
3. Select **Create team**.
4343
4. Fill out your team's information and select **Create**.
4444
5. [Add members to your team](members.md#add-a-member-to-a-team).
4545

4646
{{< /tab >}}
47-
{{< tab name="Admin Console" >}}
47+
{{< tab name="Docker Hub" >}}
4848

49-
1. In Admin Console, select your organization.
50-
2. In the **User management** section, select **Teams**.
51-
3. Select **Create team**.
49+
{{% include "hub-org-management.md" %}}
50+
51+
1. Sign in to [Docker Hub](https://hub.docker.com).
52+
2. Select **My Hub** and choose your organization.
53+
3. Select the **Teams** and then select **Create Team**.
5254
4. Fill out your team's information and select **Create**.
5355
5. [Add members to your team](members.md#add-a-member-to-a-team).
5456

@@ -118,8 +120,19 @@ To view a team's permissions across all repositories:
118120
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.
119121

120122
{{< tabs >}}
123+
{{< tab name="Admin Console" >}}
124+
125+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
126+
2. In the **User management** section, select **Teams**.
127+
3. Select the **Actions** icon next to the name of the team you want to delete.
128+
4. Select **Delete team**.
129+
5. Review the confirmation message, then select **Delete**.
130+
131+
{{< /tab >}}
121132
{{< tab name="Docker Hub" >}}
122133

134+
{{% include "hub-org-management.md" %}}
135+
123136
1. Sign in to [Docker Hub](https://hub.docker.com).
124137
2. Select **My Hub** and choose your organization.
125138
3. Select **Teams**.
@@ -128,15 +141,6 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r
128141
6. Select **Delete Team**.
129142
7. Review the confirmation message, then select **Delete**.
130143

131-
{{< /tab >}}
132-
{{< tab name="Admin Console" >}}
133-
134-
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
135-
2. In the **User management** section, select **Teams**.
136-
3. Select the **Actions** icon next to the name of the team you want to delete.
137-
4. Select **Delete team**.
138-
5. Review the confirmation message, then select **Delete**.
139-
140144
{{< /tab >}}
141145
{{< /tabs >}}
142146

content/manuals/admin/organization/members.md

Lines changed: 89 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ Learn how to manage members for your organization in Docker Hub and the Docker A
1212
## Invite members
1313

1414
{{< tabs >}}
15-
{{< tab name="Docker Hub" >}}
15+
{{< tab name="Admin Console" >}}
1616

17-
{{% admin-users product="hub" %}}
17+
{{% admin-users product="admin" %}}
1818

1919
{{< /tab >}}
20-
{{< tab name="Admin Console" >}}
20+
{{< tab name="Docker Hub" >}}
2121

22-
{{% admin-users product="admin" %}}
22+
{{% include "hub-org-management.md" %}}
23+
24+
{{% admin-users product="hub" %}}
2325

2426
{{< /tab >}}
2527
{{< /tabs >}}
@@ -59,8 +61,20 @@ After inviting members, you can resend or remove invitations as needed.
5961
### Resend an invitation
6062

6163
{{< tabs >}}
64+
{{< tab name="Admin Console" >}}
65+
66+
To resend an invitation from the Admin Console:
67+
68+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
69+
2. Select **Members**.
70+
3. Select the **action menu** next to the invitee and select **Resend invitation**.
71+
4. Select **Invite** to confirm.
72+
73+
{{< /tab >}}
6274
{{< tab name="Docker Hub" >}}
6375

76+
{{% include "hub-org-management.md" %}}
77+
6478
To resend an invitation from Docker Hub:
6579

6680
1. Sign in to [Docker Hub](https://hub.docker.com/).
@@ -73,23 +87,25 @@ You can also resend an invitation using the Docker Hub API. For more information
7387
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.
7488

7589
{{< /tab >}}
90+
{{< /tabs >}}
91+
92+
### Remove an invitation
93+
94+
{{< tabs >}}
7695
{{< tab name="Admin Console" >}}
7796

78-
To resend an invitation from the Admin Console:
97+
To remove an invitation from the Admin Console:
7998

8099
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
81100
2. Select **Members**.
82-
3. Select the **action menu** next to the invitee and select **Resend invitation**.
83-
4. Select **Invite** to confirm.
101+
3. Select the **action menu** next to the invitee and select **Remove invitee**.
102+
4. Select **Remove** to confirm.
84103

85104
{{< /tab >}}
86-
{{< /tabs >}}
87-
88-
### Remove an invitation
89-
90-
{{< tabs >}}
91105
{{< tab name="Docker Hub" >}}
92106

107+
{{% include "hub-org-management.md" %}}
108+
93109
To remove a member's invitation from Docker Hub:
94110

95111
1. Sign in to [Docker Hub](https://hub.docker.com/).
@@ -100,16 +116,6 @@ To remove a member's invitation from Docker Hub:
100116
You can also remove an invitation using the Docker Hub API. For more information,
101117
see the [Cancel an invite](https://docs.docker.com/reference/api/hub/latest/#tag/invites/paths/~1v2~1invites~1%7Bid%7D/delete) API endpoint.
102118

103-
{{< /tab >}}
104-
{{< tab name="Admin Console" >}}
105-
106-
To remove an invitation from the Admin Console:
107-
108-
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
109-
2. Select **Members**.
110-
3. Select the **action menu** next to the invitee and select **Remove invitee**.
111-
4. Select **Remove** to confirm.
112-
113119
{{< /tab >}}
114120
{{< /tabs >}}
115121

@@ -120,8 +126,23 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization
120126
### Add a member to a team
121127

122128
{{< tabs >}}
129+
{{< tab name="Admin Console" >}}
130+
131+
To add a member to a team with the Admin Console:
132+
133+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
134+
2. Select the team name.
135+
3. Select **Add member**. You can add the member by searching for their email address or username.
136+
137+
> [!NOTE]
138+
>
139+
> An invitee must first accept the invitation to join the organization before being added to the team.
140+
141+
{{< /tab >}}
123142
{{< tab name="Docker Hub" >}}
124143

144+
{{% include "hub-org-management.md" %}}
145+
125146
To add a member to a team with Docker Hub:
126147

127148
1. Sign in to [Docker Hub](https://hub.docker.com).
@@ -137,19 +158,6 @@ To add a member to a team with Docker Hub:
137158
>
138159
> An invitee must first accept the invitation to join the organization before being added to the team.
139160
140-
{{< /tab >}}
141-
{{< tab name="Admin Console" >}}
142-
143-
To add a member to a team with the Admin Console:
144-
145-
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
146-
2. Select the team name.
147-
3. Select **Add member**. You can add the member by searching for their email address or username.
148-
149-
> [!NOTE]
150-
>
151-
> An invitee must first accept the invitation to join the organization before being added to the team.
152-
153161
{{< /tab >}}
154162
{{< /tabs >}}
155163

@@ -162,16 +170,6 @@ To add a member to a team with the Admin Console:
162170
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.
163171

164172
{{< tabs >}}
165-
{{< tab name="Docker Hub" >}}
166-
167-
To remove a member from a specific team with Docker Hub:
168-
169-
1. Sign in to [Docker Hub](https://hub.docker.com).
170-
2. Select **My Hub**, your organization, **Teams**, and then the team.
171-
3. Select the **X** next to the user’s name to remove them from the team.
172-
4. When prompted, select **Remove** to confirm.
173-
174-
{{< /tab >}}
175173
{{< tab name="Admin Console" >}}
176174

177175
To remove a member from a specific team with the Admin Console:
@@ -181,6 +179,18 @@ To remove a member from a specific team with the Admin Console:
181179
3. Select the **X** next to the user's name to remove them from the team.
182180
4. When prompted, select **Remove** to confirm.
183181

182+
{{< /tab >}}
183+
{{< tab name="Docker Hub" >}}
184+
185+
{{% include "hub-org-management.md" %}}
186+
187+
To remove a member from a specific team with Docker Hub:
188+
189+
1. Sign in to [Docker Hub](https://hub.docker.com).
190+
2. Select **My Hub**, your organization, **Teams**, and then the team.
191+
3. Select the **X** next to the user’s name to remove them from the team.
192+
4. When prompted, select **Remove** to confirm.
193+
184194
{{< /tab >}}
185195
{{< /tabs >}}
186196

@@ -190,19 +200,42 @@ Organization owners can manage [roles](/security/for-admins/roles-and-permission
190200
within an organization. If an organization is part of a company,
191201
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/).
192202

203+
{{< tabs >}}
204+
{{< tab name="Admin Console" >}}
205+
206+
To update a member role in the Admin Console:
207+
208+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
209+
2. Select the **Members** tab.
210+
3. Find the username of the member whose role you want to edit. Select the
211+
**Actions menu**, then **Edit role**.
212+
193213
> [!NOTE]
194214
>
195215
> If you're the only owner of an organization,
196216
> you need to assign a new owner before you can edit your role.
197217
198-
To update a member role:
218+
{{< /tab >}}
219+
{{< tab name="Docker Hub" >}}
220+
221+
{{% include "hub-org-management.md" %}}
222+
223+
To update a member role in Docker Hub:
199224

200225
1. Sign in to [Docker Hub](https://hub.docker.com).
201226
2. Select **My Hub**, your organization, and then **Members**.
202227
3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon.
203228
4. Select **Edit role**.
204229
5. Select their organization, select the role you want to assign, and then select **Save**.
205230

231+
> [!NOTE]
232+
>
233+
> If you're the only owner of an organization,
234+
> you need to assign a new owner before you can edit your role.
235+
236+
{{< /tab >}}
237+
{{< /tabs >}}
238+
206239
## Export members CSV file
207240

208241
{{< summary-bar feature_name="Admin orgs" >}}
@@ -216,22 +249,24 @@ Owners can export a CSV file containing all members. The CSV file for a company
216249
- Account Created: The time and date when the user account was created
217250

218251
{{< tabs >}}
219-
{{< tab name="Docker Hub" >}}
252+
{{< tab name="Admin Console" >}}
220253

221254
To export a CSV file of your members:
222255

223-
1. Sign in to [Docker Hub](https://hub.docker.com).
224-
2. Select **My Hub**, your organization, and then **Members**.
225-
3. Select the **Action** icon and then select **Export users as CSV**.
256+
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
257+
2. Select **Members**.
258+
3. Select the **download** icon to export a CSV file of all members.
226259

227260
{{< /tab >}}
228-
{{< tab name="Admin Console" >}}
261+
{{< tab name="Docker Hub" >}}
262+
263+
{{% include "hub-org-management.md" %}}
229264

230265
To export a CSV file of your members:
231266

232-
1. In the [Admin Console](https://app.docker.com/admin), select your organization.
233-
2. Select **Members**.
234-
3. Select the **download** icon to export a CSV file of all members.
267+
1. Sign in to [Docker Hub](https://hub.docker.com).
268+
2. Select **My Hub**, your organization, and then **Members**.
269+
3. Select the **Action** icon and then select **Export users as CSV**.
235270

236271
{{< /tab >}}
237272
{{< /tabs >}}

0 commit comments

Comments
 (0)