Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
384 changes: 384 additions & 0 deletions .agents/skills/migrate-content-ia/SKILL.md

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions .agents/skills/migrate-content-ia/scripts/scope-pr-files.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash
# List files changed on the current branch since merge-base with the target
# branch — suitable for PR_SCOPE_FILES in PR-scoped migrate-content-ia runs.
#
# Usage:
# ./scope-pr-files.sh [target-branch]
# Default target-branch: main
#
# Example (Bash / Git Bash, from repo root):
# bash .agents/skills/migrate-content-ia/scripts/scope-pr-files.sh
# Example (other base):
# bash .../scope-pr-files.sh upstream/main
set -euo pipefail

target="${1:-main}"

if ! base=$(git merge-base "$target" HEAD 2>/dev/null); then
echo "Error: could not merge-base with '$target'. Fetch remotes or pass a valid branch." >&2
exit 1
fi

git diff --name-only "$base"...HEAD
2 changes: 1 addition & 1 deletion content/guides/admin-set-up/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ for Docker.

To continue optimizing your Docker environment:

- Review your [organization's usage data](/manuals/admin/organization/insights.md) to track adoption
- Review your [organization's usage data](/manuals/admin/insights.md) to track adoption
- Monitor [Docker Scout findings](/manuals/scout/explore/analysis.md) for security insights
- Explore [additional security features](/manuals/enterprise/security/_index.md) to enhance your configuration
4 changes: 2 additions & 2 deletions content/guides/admin-user-management/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ params:
- title: Roles and permissions
url: /security/for-admins/roles-and-permissions/
- title: Insights
url: /admin/organization/insights/
url: /admin/insights/
- title: Activity logs
url: /admin/organization/activity-logs/
url: /admin/activity-logs/
---

Managing roles and permissions is key to securing your Docker environment while enabling easy collaboration and operational efficiency. This guide walks IT administrators through the essentials of user and access management, offering strategies for assigning roles, provisioning users, and using tools like activity logs and Insights to monitor and optimize Docker usage.
Expand Down
8 changes: 4 additions & 4 deletions content/guides/admin-user-management/audit-and-monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Activity logs are available for Docker Team or Docker Business plans, with data
- Team collaboration review: Logs show which team members pushed updates to a critical repository, ensuring accountability during a development sprint.
- Billing adjustments: Track who added or removed subscription seats to maintain budgetary control and compliance.

For more information, see [Activity logs](/manuals/admin/organization/activity-logs.md).
For more information, see [Activity logs](/manuals/admin/activity-logs.md).

## Insights

Expand All @@ -42,13 +42,13 @@ Insights provide data-driven views of Docker usage to improve team productivity
- Build efficiency: Track average build times and success rates to pinpoint bottlenecks in development processes.
- Container utilization: Analyze container activity across departments to ensure proper resource distribution and cost efficiency.

For more information, see [Insights](/manuals/admin/organization/insights.md).
For more information, see [Insights](/manuals/admin/insights.md).

## Next steps

Now that you've mastered user and access management in Docker, you can:

- Review your [activity logs](/manuals/admin/organization/activity-logs.md) regularly to maintain security awareness
- Check your [Insights dashboard](/manuals/admin/organization/insights.md) to identify opportunities for optimization
- Review your [activity logs](/manuals/admin/activity-logs.md) regularly to maintain security awareness
- Check your [Insights dashboard](/manuals/admin/insights.md) to identify opportunities for optimization
- Explore [advanced security features](/manuals/enterprise/security/_index.md) to further enhance your Docker environment
- Share best practices with your team to ensure consistent adoption of security policies
4 changes: 2 additions & 2 deletions content/manuals/admin/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ 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
- Does 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).
Organization owners have the organization owner administrator role available. They can manage organization settings, users, and access controls, but occupy a [seat](/manuals/admin/organization/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.
Expand Down
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: would you consider grouping activity logs and insights under a 'Monitoring?'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a rly good idea. I have another PR for this area coming up next week and I'll do that ^

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ description: Learn how to access and interpret Docker activity logs for organiza
keywords: audit log, organization activity, Docker business logs, repository activity, track changes Docker, security logs Docker, filter logs, log Docker events
aliases:
- /docker-hub/audit-log/
- /admin/organization/activity-logs/
---

{{< summary-bar feature_name="Activity logs" >}}
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/admin/company/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ grid:
Learn how to add and manage organizations as well as seats within your
company.
icon: store
link: /admin/company/organizations/
link: /admin/company/manage/organizations/
- title: Manage company owners
description: Find out more about company owners and how to manage them.
icon: supervised_user_circle
link: /admin/company/owners/
link: /admin/company/manage/owners/
- title: Manage users
description: Explore how to manage users in all organizations.
icon: group_add
link: /admin/company/users/
link: /admin/company/manage/users/
- title: Configure single sign-on
description: Discover how to configure SSO for your entire company.
icon: key
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
---
title: FAQs on companies
linkTitle: Company
title: Company FAQs
linkTitle: FAQs
weight: 30
description: Company FAQs
keywords: Docker, Docker Hub, SSO FAQs, single sign-on, company, administration, company management
tags: [FAQ]
aliases:
- /docker-hub/company-faqs/
- /faq/admin/company-faqs/
- /admin/faqs/company-faqs/
---

### Some of my organizations don’t have a Docker Business subscription. Can I still use a parent company?
Expand Down
6 changes: 6 additions & 0 deletions content/manuals/admin/company/manage/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
build:
render: never
title: Manage
weight: 20
---
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Manage company organizations
linkTitle: Manage organizations
linkTitle: Organizations
description: Learn how to manage organizations in a company.
keywords: company, multiple organizations, manage organizations, Docker Admin Console, organization settings, add organization, company management
aliases:
- /admin/company/organizations/
---

{{< summary-bar feature_name="Company" >}}
Expand All @@ -12,14 +14,14 @@ Learn to manage the organizations in a company using the Docker Admin Console.
## View all organizations

1. Sign in to the [Docker Home](https://app.docker.com) and choose
your company.
your company.
1. Select **Admin Console**, then **Organizations**.

The **Organizations** view displays all organizations under your company.

## Add seats to an organization

If you have a [self-serve](../../subscription/details.md#self-serve)
If you have a [self-serve](../../../subscription/details.md#self-serve)
subscription that has no pending subscription changes, you can add seats using
Docker Home. For more information about adding seats,
see [Manage seats](/manuals/subscription/manage-seats.md#add-seats).
Expand All @@ -39,10 +41,10 @@ To add an organization to a company, ensure the following:
> [!IMPORTANT]
>
> Once you add an organization to a company, you can't remove it from the
company.
> company.

1. Sign in to [Docker Home](https://app.docker.com) and select your company from
the top-left account drop-down.
the top-left account drop-down.
1. Select **Admin Console**, then **Organizations**.
1. Select **Add organization**.
1. Choose the organization you want to add from the drop-down menu.
Expand All @@ -51,12 +53,12 @@ the top-left account drop-down.
## Manage an organization

1. Sign in to [Docker Home](https://app.docker.com) and select your company from
the top-left account drop-down.
the top-left account drop-down.
1. Select **Admin Console**, then **Organizations**.
1. Select the organization you want to manage.

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

## More resources

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
title: Manage company owners
linkTitle: Manage owners
linkTitle: Owners
description: Learn how to add and remove company owners.
keywords: company, owners, add company owner, remove company owner, company manageemnt, company owner permissions
keywords: company, owners, add company owner, remove company owner, company management, company owner permissions
aliases:
- /admin/company/owners/
- /docker-hub/company-owner/
---

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Manage company members
linkTitle: Manage users
linkTitle: Users
description: Learn how to manage company members in the Docker Admin Console.
keywords: company, company members, members, admin, Admin Console, member management, organization management, company management, bulk invite, resend invites
aliases:
- /admin/company/users/
---

{{< summary-bar feature_name="Company" >}}
Expand Down Expand Up @@ -142,4 +144,4 @@ see the [Bulk create invites](https://docs.docker.com/reference/api/hub/latest/#
## Manage members on a team

Use Docker Hub to add a member to a team or remove a member from a team. For
more details, see [Manage members](../organization/manage/members.md#manage-members-on-a-team).
more details, see [Manage members](../../organization/manage/members.md#manage-members-on-a-team).
23 changes: 12 additions & 11 deletions content/manuals/admin/company/new-company.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
title: Create a company
title: Create new company
linkTitle: Create
weight: 10
description: Learn how to create a company to centrally manage multiple organizations.
keywords: company, hub, organization, company owner, Admin Console, company management, Docker Business, create company, Docker Admin Console
aliases:
- /docker-hub/new-company/
- /docker-hub/new-company/
---

{{< summary-bar feature_name="Company" >}}
Expand All @@ -24,26 +25,26 @@ Before you begin, you must:
To create a new company:

1. Sign in to [Docker Home](https://app.docker.com/) and select your
organization.
organization.
1. Select **Admin Console**, then **Company management**.
1. Select **Create a company**.
1. Enter a unique name for your company, then select **Continue**.

> [!TIP]
>
> The name for your company can't be the same as an existing user,
organization, or company namespace.
> [!TIP]
>
> The name for your company can't be the same as an existing user,
> organization, or company namespace.

1. Review the migration details and then select **Create company**.

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).
see [Add organizations to a company](./manage/organizations.md#add-organizations-to-a-company).

## Next steps

- [Manage organizations](./organizations.md)
- [Manage company members](./users.md)
- [Manage company owners](./owners.md)
- [Manage organizations](./manage/organizations.md)
- [Manage company members](./manage/users.md)
- [Manage company owners](./manage/owners.md)

## More resources

Expand Down
7 changes: 0 additions & 7 deletions content/manuals/admin/faqs/_index.md

This file was deleted.

2 changes: 1 addition & 1 deletion content/manuals/admin/organization/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ grid:
- title: Activity logs
description: Learn how to audit the activities of your members.
icon: text_snippet
link: /admin/organization/activity-logs/
link: /admin/activity-logs/
- title: Image Access Management
description: Control which types of images your developers can pull.
icon: photo_library
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ reference](/manuals/enterprise/security/hardened-desktop/settings-management/set

To view usage for Docker products:

- Docker Desktop: View the **Insights** page in [Docker Home](https://app.docker.com/). For more details, see [Insights](../insights.md).
- Docker Desktop: View the **Insights** page in [Docker Home](https://app.docker.com/). For more details, see [Insights](../../insights.md).
- Docker Hub: View the [**Usage** page](https://hub.docker.com/usage) in Docker Hub.
- Docker Build Cloud: View the **Build minutes** page in [Docker Build Cloud](http://app.docker.com/build).
- Docker Scout: View the [**Repository settings** page](https://scout.docker.com/settings/repos) in Docker Scout.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
---
title: Organization FAQs
linkTitle: FAQs
weight: 60
description: Organization FAQs
linkTitle: Organization
weight: 20
keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration, Admin Console, members, organization management, manage orgs
title: FAQs on organizations
tags: [FAQ]
aliases:
- /docker-hub/organization-faqs/
- /faq/admin/organization-faqs/
- /admin/faqs/organization-faqs/
---

### How can I see how many active users are in my organization?
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/docker-hub/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Docker introduces the Advanced Image Management dashboard that enables you to vi

Docker introduces Audit logs, a new feature that allows team owners to view a list of activities that occur at organization and repository levels. This feature begins tracking the activities from the release date, that is, **from 25 January 2021**.

For more information about this feature and for instructions on how to use it, see [Activity logs](../admin/organization/activity-logs.md).
For more information about this feature and for instructions on how to use it, see [Activity logs](../admin/activity-logs.md).

## 2020-11-10

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/docker-hub/usage/pulls.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Attribution is based on the following:
- Single organization membership:
- If the owner of the verified domain is a company and the user is part of
only one organization within that
[company](../../admin/faqs/company-faqs.md#what-features-are-supported-at-the-company-level),
[company](../../admin/company/company-faqs.md),
the pull is attributed to that specific organization.
- If the user is part of only one organization, the pull is attributed to
that specific organization.
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/platform-release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ This page provides details on new features, enhancements, known issues, and bug

### New

- Administrators can now view [organization Insights](/manuals/admin/organization/insights.md).
- Administrators can now view [organization Insights](/manuals/admin/insights.md).

## 2024-07-17

Expand Down
10 changes: 5 additions & 5 deletions content/reference/api/hub/latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ tags:
description: |
The Audit Logs API endpoints allow you to query audit log events across a namespace.

For more information, see [Audit Logs](https://docs.docker.com/admin/organization/activity-logs/).
For more information, see [Audit Logs](https://docs.docker.com/admin/activity-logs/).
- name: org-settings
x-displayName: Org Settings
description: |
Expand Down Expand Up @@ -1533,7 +1533,7 @@ paths:
- `last_seen_at`
- `last_desktop_version`

To make visible, please see [View Insights for organization users](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users).
To make visible, please see [View Insights for organization users](https://docs.docker.com/admin/insights/#view-insights-for-organization-users).

<span class="oat"></span>
tags:
Expand Down Expand Up @@ -3639,20 +3639,20 @@ components:
format: date-time
description: |
Last time the user logged in. To access this field, you must have insights visible for your organization. See
[Insights](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users).
[Insights](https://docs.docker.com/admin/insights/#view-insights-for-organization-users).
example: "2021-01-05T21:06:53.506400Z"
last_seen_at:
type: string
format: date-time
description: |
Last time the user was seen. To access this field, you must have insights visible for your organization. See
[Insights](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users).
[Insights](https://docs.docker.com/admin/insights/#view-insights-for-organization-users).
example: "2021-01-05T21:06:53.506400Z"
last_desktop_version:
type: string
description: |
Last desktop version the user used. To access this field, you must have insights visible for your organization. See
[Insights](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users).
[Insights](https://docs.docker.com/admin/insights/#view-insights-for-organization-users).
example: 4.29.0

org_member_paginated:
Expand Down