From 86d55386ab8973dc47ae587703bef164742cba22 Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 23 Apr 2026 14:35:52 -0500 Subject: [PATCH 1/2] table setting for admin fix --- content/manuals/admin/_index.md | 33 --------------- .../manuals/admin/organizations-companies.md | 40 +++++++++++++++++++ 2 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 content/manuals/admin/organizations-companies.md diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index 84132e0cf0e..df64852c6ad 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -35,39 +35,6 @@ aliases: - /docker-hub/admin-overview --- -Administrators can manage companies and organizations using the -[Docker Admin Console](https://app.docker.com/admin). The Admin Console -provides centralized observability, access management, and security controls -across Docker environments. - -## Company and organization hierarchy - -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. - -![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](./images/docker-admin-structure.webp) - -### Company - -A company groups multiple Docker organizations for centralized configuration. 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 - -Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/manuals/admin/faqs/organization-faqs.md#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. - -> [!TIP] -> [Upgrading to a Docker Business plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdmin) grants you the company owner role so you can manage multiple organizations. - ### Team Teams are optional and let you group members to assign repository permissions diff --git a/content/manuals/admin/organizations-companies.md b/content/manuals/admin/organizations-companies.md new file mode 100644 index 00000000000..25d2f12a181 --- /dev/null +++ b/content/manuals/admin/organizations-companies.md @@ -0,0 +1,40 @@ +--- +title: Organizations and companies overview +linkTitle: Organizations and companies +description: +keywords: +weight: 10 +--- + +Administrators can manage companies and organizations using the +[Docker Admin Console](https://app.docker.com/admin). The Admin Console +provides centralized observability, access management, and security controls +across Docker environments. + +## Company and organization hierarchy + +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. + +![Diagram showing Docker’s administration hierarchy with Company at the top, followed by Organizations, Teams, and Members](./images/docker-admin-structure.webp) + +### Company + +A company groups multiple Docker organizations for centralized configuration. 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 + +Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/manuals/admin/faqs/organization-faqs.md#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. + +> [!TIP] +> [Upgrading to a Docker Business plan](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdmin) grants you the company owner role so you can manage multiple organizations. From e9b65b8ecbae9debf5539ceeaa2aa92a79de5d64 Mon Sep 17 00:00:00 2001 From: Alexa Date: Thu, 23 Apr 2026 14:48:29 -0500 Subject: [PATCH 2/2] renaming admin category to be more focused on what the category is actually about --- content/manuals/admin/_index.md | 3 ++- content/manuals/admin/company/_index.md | 2 +- content/manuals/admin/organization/_index.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/content/manuals/admin/_index.md b/content/manuals/admin/_index.md index df64852c6ad..b49909896f1 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/admin/_index.md @@ -1,5 +1,6 @@ --- -title: Administration +title: Admin Console overview +linkTitle: Admin Console description: Overview of administration features and roles in the Docker Admin Console keywords: admin, administration, company, organization, Admin Console, user accounts, account management weight: 10 diff --git a/content/manuals/admin/company/_index.md b/content/manuals/admin/company/_index.md index 8d7750f1583..6fab3cbf1a9 100644 --- a/content/manuals/admin/company/_index.md +++ b/content/manuals/admin/company/_index.md @@ -1,7 +1,7 @@ --- title: Company overview linkTitle: Company -weight: 20 +weight: 30 description: Learn how to manage multiple organizations using companies, including managing users, owners, and security. keywords: company, multiple organizations, manage companies, admin console, Docker Business settings grid: diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md index 0e2ee314a83..d4c5e54626b 100644 --- a/content/manuals/admin/organization/_index.md +++ b/content/manuals/admin/organization/_index.md @@ -1,7 +1,7 @@ --- title: Organization overview linkTitle: Organization -weight: 10 +weight: 20 description: Learn how to manage your Docker organization, including teams, members, permissions, and settings. keywords: organizations, admin, overview, manage teams, roles grid: