Skip to content

Commit 4a5060d

Browse files
Merge pull request #22928 from docker/published-update
publish updates from main
2 parents 6f4e818 + c2fcd81 commit 4a5060d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+796
-665
lines changed

content/_index.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ grid:
1414
url: "/desktop/use-desktop/"
1515
- text: "Release notes"
1616
url: "/desktop/release-notes/"
17+
- title: Docker Hardened Images
18+
icon: /icons/dhi.svg
19+
description: |
20+
Secure, minimal images for trusted software delivery.
21+
links:
22+
- text: "Overview"
23+
url: "/dhi/"
24+
- text: "Quickstart"
25+
url: "/dhi/get-started/"
26+
- text: "Use an image"
27+
url: "/dhi/how-to/use/"
1728
- title: Docker Engine
1829
icon: developer_board
1930
description: |

content/manuals/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ params:
5050
icon: /icons/Whale.svg
5151
link: /desktop/
5252
- title: Docker Hardened Images
53-
description: Secure, minimal base images for trusted software delivery.
53+
description: Secure, minimal images for trusted software delivery.
5454
icon: /icons/dhi.svg
5555
link: /dhi/
5656
- title: Build Cloud

content/manuals/accounts/deactivate-user-account.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ Before deactivating your Docker account, ensure you meet the following requireme
1717

1818
- For owners, you must leave your organization or company before deactivating your Docker account.
1919
To do this:
20-
1. Sign in to [Docker Home](https://app.docker.com/admin) and choose
21-
your organization.
22-
1. Select **Admin Console**.
23-
1. Select **Members** and find your username.
24-
1. Select the **Actions** menu and then select **Leave organization**.
20+
1. Sign in to the [Docker Admin Console](https://app.docker.com/admin).
21+
2. Select the organization you need to leave from the **Choose profile** page.
22+
3. Find your username in the **Members** tab.
23+
4. Select the **More options** menu and then select **Leave organization**.
2524

2625
- If you are the sole owner of an organization, you must assign the owner role to another member of the organization and then remove yourself from the organization, or deactivate the organization. Similarly, if you are the sole owner of a company, either add someone else as a company owner and then remove yourself, or deactivate the company.
2726

@@ -40,8 +39,8 @@ Once you have completed all the previous steps, you can deactivate your account.
4039
> This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it.
4140
4241
1. Sign in to [Docker Home](https://app.docker.com/login).
43-
1. Select your avatar to open the drop-down menu.
44-
1. Select **Account settings**.
45-
1. Select **Deactivate**.
46-
1. Select **Deactivate account**.
47-
1. To confirm, select **Deactivate account**.
42+
2. Select your avatar to open the drop-down menu.
43+
3. Select **Account settings**.
44+
4. Select **Deactivate**.
45+
5. Select **Deactivate account**.
46+
6. To confirm, select **Deactivate account**.

content/manuals/accounts/manage-account.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ account security.
1818
## Update general settings
1919

2020
1. Sign in to your [Docker account](https://app.docker.com/login).
21-
2. Select your avatar in the top-right corner and select **Account settings**.
21+
2. In Docker Home, select your avatar in the top-right corner to open the
22+
drop-down.
23+
3. Select **Account settings**.
2224

2325
From the Account settings page, you can take any of the following actions.
2426

content/manuals/admin/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ aliases:
3737

3838
Administrators can manage companies and organizations using the Docker Admin Console.
3939

40-
The [Docker Admin Console](https://app.docker.com/admin) 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/company/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ grid:
3333
- title: Domain management
3434
description: Add and verify your domains.
3535
icon: domain_verification
36-
link: /security/for-admins/domain-management/
36+
link: /admin/company/settings/domains/
3737
- title: FAQs
3838
description: Explore common company FAQs.
3939
link: /faq/admin/company-faqs/

content/manuals/admin/company/new-company.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ You can create a new company in the Docker Admin Console. Before you begin, you
1616

1717
To create a new company:
1818

19-
1. Sign in to [Docker Home](https://app.docker.com/) and select your
20-
organization.
21-
1. Select **Admin Console**, then **Company management**.
22-
1. Select **Create a company**.
23-
1. Enter a unique name for your company, then select **Continue**.
19+
1. Sign in to the [Admin Console](https://app.docker.com/admin).
20+
2. Select your organization you want to add to your company from the **Choose profile** page.
21+
3. Under **Organization settings**, select **Company management**.
22+
4. Select **Create a company**.
23+
5. Enter a unique name for your company, then select **Continue**.
2424

2525
> [!TIP]
2626
>
2727
> The name for your company can't be the same as an existing user, organization, or company namespace.
2828
29-
1. Review the company migration details and then select **Create company**.
29+
6. Review the company migration details and then select **Create company**.
3030

3131
For more information on how you can add organizations to your company, see [Add organizations to a company](./organizations.md#add-organizations-to-a-company).
3232

content/manuals/admin/company/organizations.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ You can manage the organizations in a company in the Docker Admin Console.
1010

1111
## View all organizations
1212

13-
1. Sign in to the [Docker Home](https://app.docker.com) and choose
14-
your company.
15-
1. Select **Admin Console**, then **Organizations**.
13+
1. Sign in to the [Admin Console](https://admin.docker.com).
14+
2. Select your company on the **Choose profile** page.
15+
3. Under **Organizations**, select **Overview**.
1616

17-
The **Organizations** view displays all organizations under your company.
17+
The organization overview page displays all organizations under your company.
1818

1919
## Add seats to an organization
2020

@@ -30,17 +30,18 @@ You must be a company owner to add an organization to a company. You must also b
3030
>
3131
> Once you add an organization to a company, you can't remove it from the company.
3232
33-
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
34-
1. Select **Admin Console**, then **Organizations**.
35-
1. Select **Add organization**.
36-
1. Choose the organization you want to add from the drop-down menu.
37-
1. Select **Add organization** to confirm.
33+
1. Sign in to the [Admin Console](https://admin.docker.com).
34+
2. Select your company on the **Choose profile** page.
35+
3. Select **Organizations**, then **Overview**.
36+
4. Select **Add organization**.
37+
5. Choose the organization you want to add from the drop-down menu.
38+
6. Select **Add organization** to confirm.
3839

3940
## Manage an organization
4041

41-
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
42-
1. Select **Admin Console**, then **Organizations**.
43-
1. Select the organization you want to manage.
42+
1. Sign in to the [Admin Console](https://admin.docker.com).
43+
2. Select your company on the **Choose profile** page.
44+
3. Select the organization that you want to manage.
4445

4546
For more details about managing an organization, see [Organization administration](../organization/_index.md).
4647

content/manuals/admin/company/owners.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ owners don't need to be member of an organization.
2323
2424
## Add a company owner
2525

26-
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
27-
1. Select **Admin Console**, then **Company owners**.
28-
1. Select **Add owner**.
29-
1. Specify the user's Docker ID to search for the user.
30-
1. After you find the user, select **Add company owner**.
26+
1. Sign in to the [Admin Console](https://admin.docker.com).
27+
2. Select your company on the **Choose profile** page.
28+
3. Select **Company owners**.
29+
4. Select **Add owner**.
30+
5. Specify the user's Docker ID to search for the user.
31+
6. After you find the user, select **Add company owner**.
3132

3233
## Remove a company owner
3334

34-
1. Sign in to [Docker Home](https://app.docker.com) and select your company.
35-
1. Select **Admin Console**, then **Company owners**.
36-
1. Locate the company owner you want to remove and select the **Actions** menu.
37-
1. Select **Remove as company owner**.
35+
1. Sign in to the [Admin Console](https://admin.docker.com).
36+
2. Select your company on the **Choose profile** page.
37+
3. Select **Company owners**.
38+
4. Select the **Action** icon in the row of the company owner that your want to remove.
39+
5. Select **Remove as company owner**.

content/manuals/admin/faqs/company-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You can manage domain verification, SSO, and SCIM at the company level. The foll
6262
- User management
6363
- Billing
6464

65-
To view and manage users across all the organizations under your company, you can [manage users at the company level](../../admin/company/users.md) when you use the [Admin Console](https://app.docker.com/admin).
65+
To view and manage users across all the organizations under your company, you can [manage users at the company level](../../admin/company/users.md) when you use the [Admin Console](https://admin.docker.com).
6666

6767
Domain audit isn't supported for companies or organizations within a company.
6868

0 commit comments

Comments
 (0)