diff --git a/.github/labeler.yml b/.github/labeler.yml index d7a4a910758e..32796e097775 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -153,7 +153,7 @@ area/subscription: area/admin: - changed-files: - any-glob-to-any-file: - - content/manuals/admin/** + - content/manuals/accounts/organization/** area/extensions: - changed-files: @@ -175,6 +175,7 @@ area/accounts: - changed-files: - any-glob-to-any-file: - content/manuals/accounts/** + - content/manuals/faqs/** area/copilot: - changed-files: diff --git a/content/guides/admin-set-up.md b/content/guides/admin-set-up.md index 4978217bb01c..d55b544f7e7c 100644 --- a/content/guides/admin-set-up.md +++ b/content/guides/admin-set-up.md @@ -51,7 +51,7 @@ policies. This guide covers the following Docker features: -- [Organizations](/manuals/admin/organization/_index.md): The core structure +- [Organizations](/manuals/accounts/organization/_index.md): The core structure for managing your Docker environment, grouping users, teams, and image repositories. Your organization was created with your subscription and is managed by one or more owners. Users signed into the organization are @@ -130,7 +130,7 @@ files to be distributed to developer machines. Use MDM tools to deploy these con ### Identify Docker organizations Some companies may have more than one -[Docker organization](/manuals/admin/organization/_index.md) created. These +[Docker organization](/manuals/accounts/organization/_index.md) created. These organizations may have been created for specific purposes, or may not be needed anymore. @@ -185,8 +185,8 @@ settings, along with your chosen method for [enforcing sign-in](/manuals/enterpr ### Manage your organizations If you have more than one organization, consider either [consolidating them -into one organization](/manuals/admin/organization/setup/orgs.md) or creating a -[Docker company](/manuals/admin/company/_index.md) to manage multiple +into one organization](/manuals/accounts/organization/setup/orgs.md) or creating a +[Docker company](/manuals/accounts/organization/company/_index.md) to manage multiple organizations. ### Begin setup @@ -325,6 +325,6 @@ for Docker. To continue optimizing your Docker environment: -- Review your [organization's usage data](/manuals/admin/insights.md) to track adoption +- Review your [organization's usage data](/manuals/accounts/organization/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 diff --git a/content/guides/admin-user-management.md b/content/guides/admin-user-management.md index 84ff0adb7545..468cc0a25869 100644 --- a/content/guides/admin-user-management.md +++ b/content/guides/admin-user-management.md @@ -46,7 +46,7 @@ With the right configurations, you can ensure your developers have easy access t Before setting up roles and permissions, it's important to have a clear understanding of who in your organization requires Docker access. Focus on gathering a comprehensive view of active users, their roles within projects, and how they interact with Docker resources. This process can be supported by tools like device management software or manual assessments. Encourage all users to update their Docker accounts to use organizational email addresses, ensuring seamless integration with your subscription. -For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/admin/organization/setup/onboard.md). +For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/accounts/organization/setup/onboard.md). ### Assign roles strategically @@ -68,7 +68,7 @@ Teams in Docker provide a structured way to manage member access and they provid - Assign permissions at the team level rather than individually. For instance, a development team might have "Read & Write" access to certain repositories, while a QA team has "Read-only" access. - As teams grow or responsibilities shift, you can easily update permissions or add new members, maintaining consistency without reconfiguring individual settings. -For more information, see [Create and manage a team](/manuals/admin/organization/manage/manage-a-team.md). +For more information, see [Create and manage a team](/manuals/accounts/organization/manage/manage-a-team.md). #### Example scenarios @@ -103,7 +103,7 @@ Members are granted controlled access to resources and enjoy enhanced organizati - Access to enhanced features: Members benefit from organization-wide perks, such as increased pull limits and access to premium Docker features. - Security control: Apply and enforce security settings at an organizational level, reducing risks associated with unmanaged accounts. -For detailed information, see [Manage organization members](/manuals/admin/organization/manage/members.md). +For detailed information, see [Manage organization members](/manuals/accounts/organization/manage/members.md). ### Future-proof user management @@ -168,7 +168,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/activity-logs.md). +For more information, see [Activity logs](/manuals/accounts/organization/activity-logs.md). ### Insights @@ -186,13 +186,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/insights.md). +For more information, see [Insights](/manuals/accounts/organization/insights.md). ### Next steps Now that you've mastered user and access management in Docker, you can: -- 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 +- Review your [activity logs](/manuals/accounts/organization/activity-logs.md) regularly to maintain security awareness +- Check your [Insights dashboard](/manuals/accounts/organization/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 diff --git a/content/manuals/_index.md b/content/manuals/_index.md index 20c7a49c57b4..d22ce193851c 100644 --- a/content/manuals/_index.md +++ b/content/manuals/_index.md @@ -79,22 +79,22 @@ params: icon: /icons/Scout.svg link: /scout/ platform: - - title: Administration - description: Centralized observability for companies and organizations. - icon: shield-check - link: /admin/ + - title: Accounts + description: Manage Docker individual and organization accounts. + icon: user-circle + link: /accounts/ - title: Billing description: Manage billing and payment methods. icon: credit-card link: /billing/ - - title: Accounts - description: Manage your Docker account. - icon: user-circle - link: /accounts/ - title: Security description: Security guardrails for both administrators and developers. icon: lock-closed link: /security/ + - title: FAQs + description: Frequently asked questions about Docker accounts, organizations, and companies. + icon: question-mark-circle + link: /faqs/ - title: Subscription description: Commercial use licenses for Docker products. icon: credit-card diff --git a/content/manuals/accounts/_index.md b/content/manuals/accounts/_index.md index 67ffb1841983..d36e836c6684 100644 --- a/content/manuals/accounts/_index.md +++ b/content/manuals/accounts/_index.md @@ -1,63 +1,28 @@ --- -title: Docker accounts +title: Accounts description: > - Learn what a Docker account is, how Docker IDs, emails, and sign-in methods - relate, and how individual accounts connect to organizations -keywords: accounts, docker ID, username, email, Google, GitHub, sign-in, - authentication, account management, docker account, individual account, - organization account, account types, Docker Hub, SSO, deactivate account + Manage Docker individual accounts and organization administration, including + members, teams, and companies. +keywords: accounts, admin, Docker ID, organization, company, Docker Home, + account management weight: 10 params: sidebar: group: Platform grid: - - title: Create an account - description: Get started with Docker and create an account. - icon: finger-print - link: /accounts/create-account/ - - title: Manage account - description: Learn how to manage the settings for your account. - icon: cog - link: /accounts/manage-account/ - - title: Personal access tokens - description: Learn how to create and manage access tokens for your account. - icon: lock-closed - link: /security/access-tokens/ - - title: Set up two-factor authentication - description: Add an extra layer of authentication to your Docker account. - link: /security/2fa/ - icon: device-phone-mobile - - title: Organization overview - description: Learn how to create and manage Docker organizations. + - title: Docker individual accounts + description: Create and manage your Docker ID, email, and sign-in methods. + icon: user-circle + link: /accounts/individual/ + - title: Organization accounts + description: Manage organizations, companies, members, and teams. icon: building-storefront - link: /admin/organization/ - - title: Account FAQs - description: Explore frequently asked questions about Docker accounts. - icon: question-mark-circle - link: /accounts/general-faqs/ + link: /accounts/organization/ --- -A Docker account is how Docker identifies you. Use it to access products like -Docker Hub and Docker Desktop, manage settings, and join organizations. - -Docker has two primary account types: individual and organization. You create -and administer organizations with your individual account. For organization -accounts, see [Organizations](/manuals/admin/organization/_index.md). For -organizations and companies, see [Administration](/manuals/admin/_index.md). - -## Docker ID, email, and sign-in - -When you create an account, you choose a Docker ID and a sign-in method. -Docker also ties a verified email to the account. - -- Docker account: Associates your plans, Hub repositories, and account - settings. -- Docker ID: A unique username that identifies you. -- Email: How Docker contacts you for notifications and security-related - communications. -- Sign-in method: Email and password, - [single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/_index.md), - Google, or GitHub. +A Docker account identifies you and lets you access Docker products. Use an +individual account for your Docker ID and personal settings. Use an +organization account to manage members, teams, and company-wide settings. ## Next steps diff --git a/content/manuals/accounts/individual/_index.md b/content/manuals/accounts/individual/_index.md new file mode 100644 index 000000000000..33e5a40a46b1 --- /dev/null +++ b/content/manuals/accounts/individual/_index.md @@ -0,0 +1,62 @@ +--- +title: Docker individual accounts +linkTitle: Individual +description: > + Learn what a Docker account is, how Docker IDs, emails, and sign-in methods + relate, and how individual accounts connect to organizations +keywords: accounts, docker ID, username, email, Google, GitHub, sign-in, + authentication, account management, docker account, individual account, + organization account, account types, Docker Hub, SSO, deactivate account +weight: 10 +grid: + - title: Create an account + description: Get started with Docker and create an account. + icon: finger-print + link: /accounts/individual/create-account/ + - title: Manage account + description: Learn how to manage the settings for your account. + icon: cog + link: /accounts/individual/manage-account/ + - title: Personal access tokens + description: Learn how to create and manage access tokens for your account. + icon: lock-closed + link: /security/access-tokens/ + - title: Set up two-factor authentication + description: Add an extra layer of authentication to your Docker account. + link: /security/2fa/ + icon: device-phone-mobile + - title: Organization accounts + description: Learn how to create and manage Docker organizations. + icon: building-storefront + link: /accounts/organization/ + - title: Account FAQs + description: Explore frequently asked questions about Docker accounts. + icon: question-mark-circle + link: /faqs/general-faqs/ +--- + +A Docker account is how Docker identifies you. Use it to access products like +Docker Hub and Docker Desktop, manage settings, and join organizations. + +Docker has two primary account types: individual and organization. You create +and administer organizations with your individual account. For organization +accounts, including companies, see +[Organization accounts](/manuals/accounts/organization/_index.md). + +## Docker ID, email, and sign-in + +When you create an account, you choose a Docker ID and a sign-in method. +Docker also ties a verified email to the account. + +- Docker account: Associates your plans, Hub repositories, and account + settings. +- Docker ID: A unique username that identifies you. +- Email: How Docker contacts you for notifications and security-related + communications. +- Sign-in method: Email and password, + [single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/_index.md), + Google, or GitHub. + +## Next steps + +{{< grid >}} diff --git a/content/manuals/accounts/create-account.md b/content/manuals/accounts/individual/create-account.md similarity index 96% rename from content/manuals/accounts/create-account.md rename to content/manuals/accounts/individual/create-account.md index 5bdff24960c3..14cf4129d2fc 100644 --- a/content/manuals/accounts/create-account.md +++ b/content/manuals/accounts/individual/create-account.md @@ -8,6 +8,7 @@ keywords: create docker account, docker ID, sign up, sign in, email, Google, GitHub, verification, OTP, password, docker login, username requirements aliases: + - /accounts/create-account/ - /docker-hub/accounts/ - /docker-id/ --- @@ -85,5 +86,5 @@ basis: ## Next steps -- [Manage a Docker account](/manuals/accounts/manage-account.md) +- [Manage a Docker account](/manuals/accounts/individual/manage-account.md) - [Enable two-factor authentication](/manuals/security/2fa/_index.md) diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/individual/deactivate-user-account.md similarity index 95% rename from content/manuals/accounts/deactivate-user-account.md rename to content/manuals/accounts/individual/deactivate-user-account.md index e7203eb6b47c..31c80a2bd908 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/individual/deactivate-user-account.md @@ -7,13 +7,15 @@ keywords: deactivate docker account, delete docker account, close docker account, disable docker account, account management, leave organization, privacy request, personal data +aliases: + - /accounts/deactivate-user-account/ --- Learn how to deactivate an individual Docker account, including the prerequisites required for deactivation. For information on deactivating an organization, see -[Deactivate an organization](/manuals/admin/organization/deactivate-account.md). +[Deactivate an organization](/manuals/accounts/organization/manage/deactivate-account.md). > [!WARNING] > diff --git a/content/manuals/accounts/manage-account.md b/content/manuals/accounts/individual/manage-account.md similarity index 92% rename from content/manuals/accounts/manage-account.md rename to content/manuals/accounts/individual/manage-account.md index d75ab1ab4f35..08a6753a4cf1 100644 --- a/content/manuals/accounts/manage-account.md +++ b/content/manuals/accounts/individual/manage-account.md @@ -8,6 +8,8 @@ keywords: manage docker account, account settings, update email, change password, Gravatar, two-factor authentication, personal access tokens, Google, GitHub, connected accounts, convert account, deactivate account, Docker Home +aliases: + - /accounts/manage-account/ --- You can manage your Docker account in Docker Home, including administrative @@ -116,15 +118,15 @@ or GitHub. See Google or GitHub's documentation for more information: For information on converting your account into an organization, see [Convert an account into an -organization](/manuals/admin/organization/setup/convert-account.md). +organization](/manuals/accounts/organization/setup/convert-account.md). ## Deactivate your account For information on deactivating your account, see -[Deactivate a Docker account](/manuals/accounts/deactivate-user-account.md). +[Deactivate a Docker account](/manuals/accounts/individual/deactivate-user-account.md). ## Next steps -- [Docker accounts overview](/manuals/accounts/_index.md) -- [Create a Docker account](/manuals/accounts/create-account.md) +- [Docker individual accounts overview](/manuals/accounts/individual/_index.md) +- [Create a Docker account](/manuals/accounts/individual/create-account.md) - [Enable two-factor authentication](/manuals/security/2fa/_index.md) diff --git a/content/manuals/admin/_index.md b/content/manuals/accounts/organization/_index.md similarity index 50% rename from content/manuals/admin/_index.md rename to content/manuals/accounts/organization/_index.md index 780462e3d624..d63ee1ed2042 100644 --- a/content/manuals/admin/_index.md +++ b/content/manuals/accounts/organization/_index.md @@ -1,30 +1,34 @@ --- -title: Administration +title: Organization accounts +linkTitle: Organization description: Overview of administration features and roles in Docker Home -keywords: admin, administration, company, organization, Docker Home, user accounts, account management -weight: 10 -params: - sidebar: - group: Enterprise +keywords: admin, administration, company, organization, Docker Home, user + accounts, account management, organizations, manage teams, roles, members, + permissions, organization settings, organization account, individual account, + Docker ID, account types, owners, teams +weight: 15 grid: + - title: Set up your organization + description: Create, onboard, and configure your organization. + icon: magnifying-glass-plus + link: /accounts/organization/setup/ + - title: Manage your organization + description: Manage members, teams, seats, and product access. + icon: user-plus + link: /accounts/organization/manage/ - title: Company administration description: Explore how to manage a company. icon: building-office-2 - link: /admin/company/ - - title: Organization administration - description: Learn about organization administration. - icon: building-storefront - link: /admin/organization/ - - title: Onboard your organization - description: Learn how to onboard and secure your organization. - icon: magnifying-glass-plus - link: /admin/organization/setup/onboard + link: /accounts/organization/company/ - title: Security description: Explore security features for administrators. icon: shield-check link: /enterprise/security/ aliases: + - /admin/ - /docker-hub/admin-overview + - /admin/organization/ + - /accounts/organization/overview/ --- Organization and company owners can manage members, control access, and enforce @@ -32,6 +36,10 @@ security across their Docker environments. You perform these tasks in Docker Home, which provides centralized observability, access management, and security controls. +A Docker organization is a collection of teams and repositories under +centralized management. Organization administrators group members and +assign repository access at scale. + As an organization or company owner, you can: - Create and manage companies and organizations @@ -40,6 +48,36 @@ As an organization or company owner, you can: - Set company-wide policies, including SCIM provisioning and security enforcement +## Individual and organization accounts + +Docker has two primary account types: + +- Individual accounts that are identified by a Docker ID. +- Organization accounts that are shared workspaces for teams and + repositories. + +Every organization is created and administered by one or more individual +accounts. You always sign in with your individual account, then work in the +organizations you own or belong to. Organization owners and members are +individual accounts that hold a role in that organization. For individual +accounts, see [Docker individual accounts](/manuals/accounts/individual/_index.md). + +## Organization structure + +The following diagram shows how organizations relate to teams and members. + +![Diagram showing how teams and members relate within a Docker +organization](./images/org-structure.webp) + +An organization includes owners, members, and optional teams. Organization +owners have full administrator access to manage members, roles, and teams. A +team is an optional grouping of members that share the same repository +permissions. + +For details about each role and its permissions, see +[Roles and +permissions](/manuals/enterprise/security/roles-and-permissions/_index.md). + ## Company and organization hierarchy To provide centralized administration, Docker organizes companies and @@ -49,13 +87,10 @@ organizations into the following hierarchy and roles. ### Company -A company groups multiple Docker organizations for centralized configuration. A -company owner can view and manage every organization in the company and its -company-wide settings, with the same access rights as an organization owner. For -the company owner role and how it affects seats, see -[Company roles](/manuals/admin/company/_index.md#company-roles). - -Companies are only available for Docker Business subscribers. +A company groups multiple Docker organizations for centralized configuration. +Companies are only available for Docker Business subscribers. For company +structure, owners, and seats, see +[Company overview](/manuals/accounts/organization/company/_index.md). ### Organization @@ -65,7 +100,7 @@ subscriber has at least one organization. Organization owners hold the organization owner administrator role and manage organization settings, users, and access controls. Each owner occupies a -[seat](/manuals/admin/organization/organization-faqs.md#what-is-the-difference-between-user-invitee-seat-and-member). +[seat](/manuals/faqs/organization-faqs.md#what-is-the-difference-between-user-invitee-seat-and-member). [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. diff --git a/content/manuals/admin/activity-logs.md b/content/manuals/accounts/organization/activity-logs.md similarity index 99% rename from content/manuals/admin/activity-logs.md rename to content/manuals/accounts/organization/activity-logs.md index d4d97991d524..d4575f09d5d5 100644 --- a/content/manuals/admin/activity-logs.md +++ b/content/manuals/accounts/organization/activity-logs.md @@ -1,9 +1,10 @@ --- title: Activity logs -weight: 30 +weight: 40 description: Learn how to access and interpret Docker activity logs for organizations and repositories. keywords: audit log, organization activity, Docker business logs, repository activity, track changes Docker, security logs Docker, filter logs, log Docker events aliases: +- /admin/activity-logs/ - /docker-hub/audit-log/ - /admin/organization/activity-logs/ --- diff --git a/content/manuals/admin/company/_index.md b/content/manuals/accounts/organization/company/_index.md similarity index 77% rename from content/manuals/admin/company/_index.md rename to content/manuals/accounts/organization/company/_index.md index 55398a5b3474..c558d14e07c3 100644 --- a/content/manuals/admin/company/_index.md +++ b/content/manuals/accounts/organization/company/_index.md @@ -1,18 +1,18 @@ --- title: Company overview -linkTitle: Company -weight: 20 +linkTitle: Companies +weight: 30 description: Learn how to manage multiple organizations using companies, including managing users, owners, and security. keywords: company, multiple organizations, manage companies, Docker Home, Docker Business settings grid: - title: Create a company description: Get started by learning how to create a company. icon: building-office-2 - link: /admin/company/new-company/ + link: /accounts/organization/company/new-company/ - title: Manage your company description: Add organizations, manage company owners, and invite members. icon: building-storefront - link: /admin/company/manage/ + link: /accounts/organization/company/manage/ - title: Configure SSO and SCIM description: Set up single sign-on and SCIM provisioning for your company. icon: key @@ -23,16 +23,17 @@ grid: link: /enterprise/security/domain-management/ - title: FAQs description: Explore frequently asked questions about companies. - link: /faq/admin/company-faqs/ + link: /faqs/company-faqs/ icon: question-mark-circle aliases: + - /admin/company/ - /docker-hub/creating-companies/ --- {{< summary-bar feature_name="Company" >}} -A company provides a single point of visibility across multiple -organizations, for centralized organization and settings management. +A company groups multiple Docker organizations for centralized configuration +and provides a single point of visibility across those organizations. Organization owners with a Docker Business subscription can create a company and manage it through Docker Home. @@ -41,10 +42,10 @@ and manage it through Docker Home. The following diagram shows how a company relates to its associated organizations. -![Diagram showing how companies relate to Docker organizations](/admin/images/docker-admin-structure.webp) +![Diagram showing how companies relate to Docker organizations](/accounts/organization/images/docker-admin-structure.webp) -For the full administration hierarchy, see the -[administration overview](/manuals/admin/_index.md#company-and-organization-hierarchy). +For the full administration hierarchy, see +[Company and organization hierarchy](/manuals/accounts/organization/_index.md#company-and-organization-hierarchy). ## Company roles @@ -62,7 +63,7 @@ organization owners. automatically adds them as an organization member. To add or remove company owners, see -[Manage your company](/manuals/admin/company/manage.md#company-owners). +[Manage your company](/manuals/accounts/organization/company/manage.md#company-owners). ## Next steps diff --git a/content/manuals/admin/company/manage.md b/content/manuals/accounts/organization/company/manage.md similarity index 93% rename from content/manuals/admin/company/manage.md rename to content/manuals/accounts/organization/company/manage.md index 4b91db7a0e2b..d7a1d3898eb4 100644 --- a/content/manuals/admin/company/manage.md +++ b/content/manuals/accounts/organization/company/manage.md @@ -5,6 +5,7 @@ weight: 20 description: Learn how to manage your company, including its organizations, owners, and members, using Docker Home. keywords: company, manage company, multiple organizations, company owners, company members, Docker Home, add organization, resend invites aliases: + - /admin/company/manage/ - /admin/company/manage/organizations/ - /admin/company/manage/owners/ - /admin/company/manage/users/ @@ -46,7 +47,7 @@ longer manage it through the company, and its owner must manage it separately. A company can have multiple owners who manage the company and all of its organizations. For details about the company owner role and how it affects -seats, see [Company roles](/manuals/admin/company/_index.md#company-roles). +seats, see [Company roles](/manuals/accounts/organization/company/_index.md#company-roles). ### Add a company owner @@ -108,7 +109,7 @@ To bulk resend invitations: If you have a 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/admin/organization/manage/manage-seats.md#add-seats-to-your-subscription). +see [Manage seats](/manuals/accounts/organization/manage/manage-seats.md#add-seats-to-your-subscription). If you have a sales-assisted subscription, you must contact Docker support or sales to add seats. @@ -118,4 +119,4 @@ sales to add seats. Teams exist at the organization level, not the company level. After inviting members to an organization, you can add them to teams within that organization. For more details, see -[Manage members on a team](/manuals/admin/organization/manage/members.md#manage-members-on-a-team). +[Manage members on a team](/manuals/accounts/organization/manage/members.md#manage-members-on-a-team). diff --git a/content/manuals/admin/company/new-company.md b/content/manuals/accounts/organization/company/new-company.md similarity index 98% rename from content/manuals/admin/company/new-company.md rename to content/manuals/accounts/organization/company/new-company.md index 38cd05e04842..0d28f76e3ef6 100644 --- a/content/manuals/admin/company/new-company.md +++ b/content/manuals/accounts/organization/company/new-company.md @@ -5,6 +5,7 @@ weight: 10 description: Learn how to create a company to centrally manage multiple organizations. keywords: company, hub, organization, company owner, Docker Home, company management, Docker Business, create company aliases: + - /admin/company/new-company/ - /docker-hub/new-company/ --- diff --git a/content/manuals/admin/images/docker-admin-structure.webp b/content/manuals/accounts/organization/images/docker-admin-structure.webp similarity index 100% rename from content/manuals/admin/images/docker-admin-structure.webp rename to content/manuals/accounts/organization/images/docker-admin-structure.webp diff --git a/content/manuals/admin/images/org-structure.webp b/content/manuals/accounts/organization/images/org-structure.webp similarity index 100% rename from content/manuals/admin/images/org-structure.webp rename to content/manuals/accounts/organization/images/org-structure.webp diff --git a/content/manuals/admin/insights.md b/content/manuals/accounts/organization/insights.md similarity index 99% rename from content/manuals/admin/insights.md rename to content/manuals/accounts/organization/insights.md index 1b498cc8bbbc..de325a46c5da 100644 --- a/content/manuals/admin/insights.md +++ b/content/manuals/accounts/organization/insights.md @@ -1,8 +1,10 @@ --- title: Insights -weight: 40 +weight: 50 description: Gain insights about your organization's users and their Docker usage. keywords: organization, insights, Docker Desktop analytics, user usage statistics, Docker Business, track Docker activity +aliases: + - /admin/insights/ --- {{< summary-bar feature_name="Insights" >}} diff --git a/content/manuals/admin/organization/manage/_index.md b/content/manuals/accounts/organization/manage/_index.md similarity index 63% rename from content/manuals/admin/organization/manage/_index.md rename to content/manuals/accounts/organization/manage/_index.md index 5ccfc50fa17c..1a47434975df 100644 --- a/content/manuals/admin/organization/manage/_index.md +++ b/content/manuals/accounts/organization/manage/_index.md @@ -2,17 +2,25 @@ title: Manage your organization linkTitle: Manage weight: 20 -description: Learn how to manage your Docker organization, including members, teams, licenses, seats, and product access. -keywords: manage organization, members, teams, licenses, seats, product access, organization management, docker home +description: Learn how to manage your Docker organization, including members, teams, licenses, seats, product access, and settings. +keywords: manage organization, members, teams, licenses, seats, product access, organization management, docker home, organization settings, deactivate organization grid: - title: Members description: Invite, manage, and assign roles to your organization members. icon: user-plus - link: /admin/organization/manage/members/ + link: /accounts/organization/manage/members/ - title: Product access and usage description: Manage access and view usage for Docker products across your organization. icon: squares-2x2 - link: /admin/organization/manage/manage-products/ + link: /accounts/organization/manage/manage-products/ + - title: Change information + description: Update your organization's general information and settings. + icon: pencil-square + link: /accounts/organization/manage/general-settings/ + - title: Deactivate + description: Deactivate an organization after completing the required steps. + icon: minus-circle + link: /accounts/organization/manage/deactivate-account/ - title: Security description: Configure single sign-on, provisioning, and access management. icon: shield-check @@ -21,11 +29,14 @@ grid: description: Manage payment methods and view billing history. icon: credit-card link: /billing/ +aliases: + - /admin/organization/manage/ --- As an organization owner, you manage your organization's membership, access, -and product usage. You can invite members, group them into teams, assign or -revoke licenses and seats, and change access to Docker products. +product usage, and settings. You can invite members, group them into teams, +assign or revoke licenses and seats, change access to Docker products, update +organization information, and deactivate the organization. ## Managing your organization @@ -43,8 +54,8 @@ plans. The following table summarizes the difference. | Seat | Membership in your Docker Team or Business subscription | Docker Core subscription | Billing | | License | Access to a specific product or add-on | AI Governance, Docker Offload, and other add-ons | Members | -For details, see [Seats](/manuals/admin/organization/manage/manage-seats.md) -and [License assignment](/manuals/admin/organization/manage/manage-licenses.md). +For details, see [Seats](/manuals/accounts/organization/manage/manage-seats.md) +and [License assignment](/manuals/accounts/organization/manage/manage-licenses.md). ## Next steps diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/accounts/organization/manage/deactivate-account.md similarity index 92% rename from content/manuals/admin/organization/deactivate-account.md rename to content/manuals/accounts/organization/manage/deactivate-account.md index cd4b8cfaa8f5..638c0cb53c69 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/accounts/organization/manage/deactivate-account.md @@ -5,9 +5,11 @@ description: Learn how to deactivate a Docker organization and required prerequisite steps. keywords: deactivate organization, delete organization, organization management, Docker Home, cancel subscription, unlink GitHub, remove SSO -weight: 50 +weight: 70 aliases: + - /admin/organization/deactivate-account/ - /docker-hub/deactivate-account/ + - /accounts/organization/deactivate-account/ --- {{< summary-bar feature_name="General admin" >}} @@ -15,7 +17,7 @@ aliases: Learn how to deactivate a Docker organization, including required prerequisite steps. For information about deactivating user accounts, see [Deactivate a Docker -account](/manuals/accounts/deactivate-user-account.md). +account](/manuals/accounts/individual/deactivate-user-account.md). > [!WARNING] > diff --git a/content/manuals/admin/organization/setup/general-settings.md b/content/manuals/accounts/organization/manage/general-settings.md similarity index 88% rename from content/manuals/admin/organization/setup/general-settings.md rename to content/manuals/accounts/organization/manage/general-settings.md index 3c7d4c9b2e04..58f148956449 100644 --- a/content/manuals/admin/organization/setup/general-settings.md +++ b/content/manuals/accounts/organization/manage/general-settings.md @@ -1,11 +1,13 @@ --- title: Change general organization information linkTitle: Change information -weight: 30 +weight: 60 description: Learn how to manage settings for organizations. keywords: organization, settings, Docker Home, manage, Docker organization, Gravatar, SCIM, SSO setup, domain management, organization settings aliases: + - /admin/organization/setup/general-settings/ - /admin/organization/general-settings/ + - /accounts/organization/setup/general-settings/ --- Learn how to update your organization information. @@ -36,4 +38,4 @@ After configuring your organization information, you can: - [Configure single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/connect.md) - [Set up SCIM provisioning](/manuals/enterprise/security/provisioning/scim/_index.md) - [Manage domains](/manuals/enterprise/security/domain-management.md) -- [Create a company](/manuals/admin/company/new-company.md) +- [Create a company](/manuals/accounts/organization/company/new-company.md) diff --git a/content/manuals/admin/organization/manage/manage-a-team.md b/content/manuals/accounts/organization/manage/manage-a-team.md similarity index 98% rename from content/manuals/admin/organization/manage/manage-a-team.md rename to content/manuals/accounts/organization/manage/manage-a-team.md index 31fd9b53bfc7..aff3117860c9 100644 --- a/content/manuals/admin/organization/manage/manage-a-team.md +++ b/content/manuals/accounts/organization/manage/manage-a-team.md @@ -6,6 +6,7 @@ description: Learn how to create and manage teams for your organization keywords: docker, registry, teams, organizations, plans, Dockerfile, Docker Hub, docs, documentation, repository permissions, configure repository access, team management aliases: + - /admin/organization/manage/manage-a-team/ - /docker-hub/manage-a-team/ - /admin/organization/manage-a-team/ --- @@ -60,7 +61,7 @@ For more information on roles, see You must create a team before you are able to configure repository permissions. For more details, see [Create and manage a -team](/manuals/admin/organization/manage/manage-a-team.md). +team](/manuals/accounts/organization/manage/manage-a-team.md). To set team repository permissions: diff --git a/content/manuals/admin/organization/manage/manage-licenses.md b/content/manuals/accounts/organization/manage/manage-licenses.md similarity index 96% rename from content/manuals/admin/organization/manage/manage-licenses.md rename to content/manuals/accounts/organization/manage/manage-licenses.md index 4a1d142dc728..097684f50b06 100644 --- a/content/manuals/admin/organization/manage/manage-licenses.md +++ b/content/manuals/accounts/organization/manage/manage-licenses.md @@ -4,6 +4,8 @@ linkTitle: License assignment description: Manage product licenses for your organization, including invite-time assignment, revocation, and automatic assignment. keywords: licenses, organization, members, invite, invitation, Docker Core, Docker Offload, AI Governance, license assignment, docker home weight: 30 +aliases: + - /admin/organization/manage/manage-licenses/ --- Licenses let you choose which organization members can access supported Docker @@ -57,7 +59,7 @@ a member: For more about sending, resending, and removing invitations, including CSV file limits, see -[Manage organization members](/manuals/admin/organization/manage/members.md). +[Manage organization members](/manuals/accounts/organization/manage/members.md). ### Accept invites @@ -116,7 +118,7 @@ Explore Docker Core add-ons and products that need licenses: - [Docker plans](/manuals/subscription/plans/_index.md) to learn about different add-ons -- [Manage seats](/manuals/admin/organization/manage/manage-seats.md) to add more +- [Manage seats](/manuals/accounts/organization/manage/manage-seats.md) to add more seats to your Docker Core subscription - [AI Governance plan](/manuals/subscription/plans/ai-governance.md) to learn about AI Governance license usage and billing diff --git a/content/manuals/admin/organization/manage/manage-products.md b/content/manuals/accounts/organization/manage/manage-products.md similarity index 98% rename from content/manuals/admin/organization/manage/manage-products.md rename to content/manuals/accounts/organization/manage/manage-products.md index dd6afd68cb5f..a4522da83322 100644 --- a/content/manuals/admin/organization/manage/manage-products.md +++ b/content/manuals/accounts/organization/manage/manage-products.md @@ -5,6 +5,7 @@ weight: 50 description: Learn how to manage access and usage for Docker products for your organization keywords: organization, product access, product usage, access control, docker desktop, docker hub, docker scout, docker build cloud, docker offload, testcontainers cloud aliases: + - /admin/organization/manage/manage-products/ - /admin/organization/manage-products/ --- @@ -132,7 +133,7 @@ following table to learn where you can monitor organization usage: | Product | Monitor usage | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Docker Desktop | From [Docker Home](https://app.docker.com/), view the [**Insights**](../../insights.md) page. | +| Docker Desktop | From [Docker Home](https://app.docker.com/), view the [**Insights**](../insights.md) page. | | Docker Hub | From Docker Hub, view the [**Usage** page](https://hub.docker.com/usage). | | Docker Build Cloud | From [Docker Build Cloud](http://app.docker.com/build), view the **Build minutes** page. | | Docker Scout | From [Docker Home](https://app.docker.com/), select **Go to Scout** to view the [**Repository settings** page](https://scout.docker.com/settings/repos). | diff --git a/content/manuals/admin/organization/manage/manage-seats.md b/content/manuals/accounts/organization/manage/manage-seats.md similarity index 98% rename from content/manuals/admin/organization/manage/manage-seats.md rename to content/manuals/accounts/organization/manage/manage-seats.md index c67156f5224a..15747bf01854 100644 --- a/content/manuals/admin/organization/manage/manage-seats.md +++ b/content/manuals/accounts/organization/manage/manage-seats.md @@ -4,6 +4,7 @@ linkTitle: Seats description: Add or remove seats for Docker Team and Business subscriptions keywords: manage seats, add seats, remove seats, subscription billing, team members aliases: + - /admin/organization/manage/manage-seats/ - /docker-hub/billing/add-seats/ - /subscription/add-seats/ - /docker-hub/billing/remove-seats/ diff --git a/content/manuals/admin/organization/manage/members.md b/content/manuals/accounts/organization/manage/members.md similarity index 97% rename from content/manuals/admin/organization/manage/members.md rename to content/manuals/accounts/organization/manage/members.md index f8fe6cf014e2..26fe440ef048 100644 --- a/content/manuals/admin/organization/manage/members.md +++ b/content/manuals/accounts/organization/manage/members.md @@ -7,6 +7,7 @@ description: Manage organization members, including invitations, roles, teams, keywords: members, organization members, invitations, teams, manage team members, export member list, edit roles, user management aliases: + - /admin/organization/manage/members/ - /docker-hub/members/ - /admin/organization/members/ --- @@ -25,7 +26,7 @@ You can also select one or more product licenses for an invitee; Docker assigns available licenses when they accept. Unlike a seat, licenses aren't deducted from your organization's available licenses until the invitee accepts. See -[Licenses and invites](/manuals/admin/organization/manage/manage-licenses.md#licenses-and-invites). +[Licenses and invites](/manuals/accounts/organization/manage/manage-licenses.md#licenses-and-invites). ### Invite members via Docker ID or email address @@ -137,7 +138,7 @@ able to invite more members. > Need to manage more than 1,000 team members? > [Upgrade to Docker Business for unlimited user invites](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminMembers) > and advanced role management. You can also -> [add seats](/manuals/admin/organization/manage/manage-seats.md) to your +> [add seats](/manuals/accounts/organization/manage/manage-seats.md) to your > subscription. ### Resend an invitation diff --git a/content/manuals/admin/organization/setup/_index.md b/content/manuals/accounts/organization/setup/_index.md similarity index 71% rename from content/manuals/admin/organization/setup/_index.md rename to content/manuals/accounts/organization/setup/_index.md index eb36ef60da67..a22bdba48265 100644 --- a/content/manuals/admin/organization/setup/_index.md +++ b/content/manuals/accounts/organization/setup/_index.md @@ -2,38 +2,36 @@ title: Set up your organization linkTitle: Setup weight: 10 -description: Learn how to set up your Docker organization, including creating an organization, onboarding, and configuring settings. -keywords: set up organization, create organization, onboard, convert account, organization settings, docker home +description: Learn how to set up your Docker organization, including creating an organization, onboarding, and converting an account. +keywords: set up organization, create organization, onboard, convert account, docker home grid: - title: Create your organization description: Create an organization to group teams and members and assign access. icon: building-storefront - link: /admin/organization/setup/orgs/ + link: /accounts/organization/setup/orgs/ - title: Onboard your organization description: Onboard and secure your Docker Team or Business organization. icon: magnifying-glass-plus - link: /admin/organization/setup/onboard/ - - title: Change information - description: Update your organization's general information and settings. - icon: pencil-square - link: /admin/organization/setup/general-settings/ + link: /accounts/organization/setup/onboard/ - title: Convert account description: Convert an existing Docker user account into an organization. icon: arrows-right-left - link: /admin/organization/setup/convert-account/ + link: /accounts/organization/setup/convert-account/ - title: Manage your organization description: Add members, teams, licenses, and seats after setup. icon: user-group - link: /admin/organization/manage/ + link: /accounts/organization/manage/ - title: Security description: Configure single sign-on, provisioning, and access management. icon: shield-check link: /enterprise/security/ +aliases: + - /admin/organization/setup/ --- Before you manage members and access, set up your Docker organization. You can -create an organization, onboard and secure it, update its information, or convert -an existing user account into an organization. +create an organization, onboard and secure it, or convert an existing user +account into an organization. ## Setting up your organization @@ -48,7 +46,6 @@ Setting up an organization happens in broad phases: 1. After creating your organization, you must onboard it by inviting members, securing authentication, and enforcing sign-in. These steps build on each other, so follow them in order. -1. You can update your organization's general information whenever it changes. ## Next steps diff --git a/content/manuals/admin/organization/setup/convert-account.md b/content/manuals/accounts/organization/setup/convert-account.md similarity index 97% rename from content/manuals/admin/organization/setup/convert-account.md rename to content/manuals/accounts/organization/setup/convert-account.md index 7c5b856d5bfc..cbb23ee91d2c 100644 --- a/content/manuals/admin/organization/setup/convert-account.md +++ b/content/manuals/accounts/organization/setup/convert-account.md @@ -5,6 +5,7 @@ title: Convert an account into an organization keywords: docker hub, hub, organization, convert account, migrate account weight: 40 aliases: + - /admin/organization/setup/convert-account/ - /docker-hub/convert-account/ - /admin/organization/convert-account/ --- @@ -15,7 +16,7 @@ Learn how to convert an existing user account into an organization. This is useful if you need multiple users to access your account and the repositories it’s connected to. Converting it to an organization gives you better control over permissions for these users through -[teams](/manuals/admin/organization/manage/manage-a-team.md) and +[teams](/manuals/accounts/organization/manage/manage-a-team.md) and [roles](/manuals/enterprise/security/roles-and-permissions.md). When you convert a user account to an organization, the account is migrated to diff --git a/content/manuals/admin/organization/setup/onboard.md b/content/manuals/accounts/organization/setup/onboard.md similarity index 95% rename from content/manuals/admin/organization/setup/onboard.md rename to content/manuals/accounts/organization/setup/onboard.md index e71216f1bff7..b019a6bfdedc 100644 --- a/content/manuals/admin/organization/setup/onboard.md +++ b/content/manuals/accounts/organization/setup/onboard.md @@ -7,6 +7,7 @@ keywords: business, team, organizations, get started, onboarding, Docker Home, o toc_min: 1 toc_max: 3 aliases: + - /admin/organization/setup/onboard/ - /docker-hub/onboard/ - /docker-hub/onboard-team/ - /docker-hub/onboard-business/ @@ -40,7 +41,7 @@ Before you start onboarding your organization, ensure you: > When purchasing a self-serve subscription, the on-screen instructions > guide you through creating an organization. If you have purchased a > subscription through Docker Sales and you have not yet created an - > organization, see [Create an organization](/manuals/admin/organization/setup/orgs.md). + > organization, see [Create an organization](/manuals/accounts/organization/setup/orgs.md). - Familiarize yourself with Docker concepts and terminology in the [administration overview](../../_index.md). @@ -50,7 +51,7 @@ Before you start onboarding your organization, ensure you: Docker Home has a guided setup to help you onboard your organization. The guided setup's steps consist of basic onboarding tasks. If you want to onboard outside of the guided setup, -see [Recommended onboarding steps](/manuals/admin/organization/setup/onboard.md#recommended-onboarding-steps). +see [Recommended onboarding steps](/manuals/accounts/organization/setup/onboard.md#recommended-onboarding-steps). To onboard using the guided setup, navigate to [Docker Home](https://app.docker.com) and @@ -104,7 +105,7 @@ When you create an organization, you are the only owner. It is optional to add additional owners. To add an owner, invite a user and assign them the owner role. For more -details, see [Invite members](/manuals/admin/organization/manage/members.md) and +details, see [Invite members](/manuals/accounts/organization/manage/members.md) and [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md). ### Step three: Invite members @@ -115,7 +116,7 @@ receive increased pull limits and other organization wide benefits when they are signed in. To add a member, invite a user and assign them the member role. -For more details, see [Invite members](/manuals/admin/organization/manage/members.md) and +For more details, see [Invite members](/manuals/accounts/organization/manage/members.md) and [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md). ### Step four: Manage user access with SSO and SCIM diff --git a/content/manuals/admin/organization/setup/orgs.md b/content/manuals/accounts/organization/setup/orgs.md similarity index 94% rename from content/manuals/admin/organization/setup/orgs.md rename to content/manuals/accounts/organization/setup/orgs.md index 5cb67788393d..c2097d18713c 100644 --- a/content/manuals/admin/organization/setup/orgs.md +++ b/content/manuals/accounts/organization/setup/orgs.md @@ -5,6 +5,7 @@ weight: 10 description: Learn how to create an organization. keywords: docker organizations, organization, create organization, docker teams, organization management aliases: + - /admin/organization/setup/orgs/ - /docker-hub/orgs/ - /admin/organization/orgs/ --- @@ -19,9 +20,9 @@ There are multiple ways to create an organization. You can either: ## Prerequisites -- Before you create an organization, you need a [Docker ID](/manuals/accounts/create-account.md). +- Before you create an organization, you need a [Docker ID](/manuals/accounts/individual/create-account.md). - For prerequisites and detailed instructions on converting an existing user account to an organization, see - [Convert an account into an organization](/manuals/admin/organization/setup/convert-account.md). + [Convert an account into an organization](/manuals/accounts/organization/setup/convert-account.md). > [!TIP] > Need a different plan for your team's needs? Review different [Docker subscriptions and features](https://www.docker.com/pricing?ref=Docs&refAction=DocsAdminOrgs) to choose a subscription for your organization. @@ -36,7 +37,7 @@ There are multiple ways to create an organization. You can either: your organization in Docker Hub. - It's not possible to change the name of the organization after you've created it. - Your Docker ID and organization can't share the same name. - - If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/admin/organization/setup/convert-account.md). + - If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](/manuals/accounts/organization/setup/convert-account.md). 1. Enter your **Company name**. This is the full name of your company. - Docker displays the company name on your organization page and in the details of any public images you publish. diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md deleted file mode 100644 index 438bf56e5a69..000000000000 --- a/content/manuals/admin/organization/_index.md +++ /dev/null @@ -1,76 +0,0 @@ ---- -title: Docker organization overview -linkTitle: Organization -weight: 10 -description: > - Learn how Docker organization accounts relate to individual accounts, and how - to manage teams, members, permissions, and settings. -keywords: organizations, admin, overview, manage teams, roles, members, - permissions, organization settings, organization account, individual account, - Docker ID, account types, owners, teams -grid: - - title: Onboard your organization - description: Learn how to onboard and secure your organization. - icon: magnifying-glass-plus - link: /admin/organization/setup/onboard - - title: Manage members - description: Learn how to manage members. - icon: user-plus - link: /admin/organization/manage/members/ - - title: Activity logs - description: Learn how to audit the activities of your members. - icon: document-text - link: /admin/activity-logs/ - - title: Security - description: - Start here to manage security and access for your organization, including - single sign-on, provisioning, and image and registry access management. - icon: shield-check - link: /enterprise/security/ ---- - -A Docker organization is a collection of teams and repositories under -centralized management. Organization administrators group members and -assign repository access at scale. - -## Organization structure - -The following diagram shows how organizations relate to teams and members. - -![Diagram showing how teams and members relate within a Docker -organization](/admin/images/org-structure.webp) - -For how organizations fit into the broader company hierarchy, see -[Administration -overview](/manuals/admin/_index.md#company-and-organization-hierarchy). - -## Individual and organization accounts - -Docker has two primary account types: - -- Individual accounts that are identified by a Docker ID. -- Organization accounts that are shared workspaces for teams and - repositories. - -Every organization is created and administered by one or more individual -accounts. You always sign in with your individual account, then work in the -organizations you own or belong to. Organization owners and members are -individual accounts that hold a role in that organization. For individual -accounts, see [Accounts](/manuals/accounts/_index.md). - -## Organization roles - -An organization includes owners, members, and optional teams. Organization -owners have full administrator access to manage members, roles, and teams. A -team is an optional grouping of members that share the same repository -permissions. - -For details about each role and its permissions, see -[Roles and -permissions](/manuals/enterprise/security/roles-and-permissions/_index.md). - -## Next steps - -Learn how to create and manage your organization in the following sections. - -{{< grid >}} diff --git a/content/manuals/ai/sandboxes/governance/access-controls/organization.md b/content/manuals/ai/sandboxes/governance/access-controls/organization.md index 18d8eeb14cef..9e05f1eaa395 100644 --- a/content/manuals/ai/sandboxes/governance/access-controls/organization.md +++ b/content/manuals/ai/sandboxes/governance/access-controls/organization.md @@ -108,7 +108,7 @@ it only to members of the teams you select. ### Before you start Team scoping targets your organization's existing -[teams](/manuals/admin/organization/manage/manage-a-team.md), so a team must +[teams](/manuals/accounts/organization/manage/manage-a-team.md), so a team must exist before you can scope a policy to it. Create teams and manage their members in one of two ways: diff --git a/content/manuals/ai/sandboxes/governance/concepts.md b/content/manuals/ai/sandboxes/governance/concepts.md index d39cd47f128c..ed96c722a219 100644 --- a/content/manuals/ai/sandboxes/governance/concepts.md +++ b/content/manuals/ai/sandboxes/governance/concepts.md @@ -47,7 +47,7 @@ to specific teams: - Team-scoped: with one or more teams assigned, the policy applies only to members of those teams. -Teams are the same [teams](/manuals/admin/organization/manage/manage-a-team.md) +Teams are the same [teams](/manuals/accounts/organization/manage/manage-a-team.md) you manage for your organization; Docker matches a policy's teams against each user's team membership. Because an organization can mix org-wide and team-scoped policies, a single user is often subject to several at once. The policies that diff --git a/content/manuals/billing/3d-secure.md b/content/manuals/billing/3d-secure.md index eca8852ca43c..f6efae7e5e16 100644 --- a/content/manuals/billing/3d-secure.md +++ b/content/manuals/billing/3d-secure.md @@ -30,7 +30,7 @@ actions: - Starting a [paid subscription](../subscription/manage.md) - Changing your [billing cycle](/manuals/billing/details.md#billing-cycle) from monthly to annual - [Upgrading your subscription](../subscription/manage.md#upgrade-plans) -- [Adding seats](../admin/organization/manage/manage-seats.md) to an existing +- [Adding seats](../accounts/organization/manage/manage-seats.md) to an existing subscription If 3DS is required and your payment method supports it, the verification prompt diff --git a/content/manuals/build-cloud/_index.md b/content/manuals/build-cloud/_index.md index 80458665e99d..c7003a2a6c97 100644 --- a/content/manuals/build-cloud/_index.md +++ b/content/manuals/build-cloud/_index.md @@ -52,7 +52,7 @@ data between cloud builders. ## Get Docker Build Cloud To get started with Docker Build Cloud, -[create a Docker account](/accounts/create-account/). There are two options +[create a Docker account](/accounts/individual/create-account/). There are two options to get access to Docker Build Cloud: - Users with a free Personal account can opt-in to a 7-day free trial, with the option diff --git a/content/manuals/desktop/previous-versions/edge-releases-mac.md b/content/manuals/desktop/previous-versions/edge-releases-mac.md index 6ab358c1dcc6..a42c984f0f43 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-mac.md +++ b/content/manuals/desktop/previous-versions/edge-releases-mac.md @@ -1104,7 +1104,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Add daemon options validation - Diagnose can be cancelled & Improved help information. Fixes [docker/for-mac#1134](https://github.com/docker/for-mac/issues/1134), [docker/for-mac#1474](https://github.com/docker/for-mac/issues/1474) -- Support paging of Docker Cloud [repositories](../../docker-hub/repos/_index.md) and [organizations](../../admin/organization/setup/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538) +- Support paging of Docker Cloud [repositories](../../docker-hub/repos/_index.md) and [organizations](../../accounts/organization/setup/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538) ### Docker Community Edition 17.06.1-ce-mac20, 2017-07-18 diff --git a/content/manuals/desktop/setup/sign-in.md b/content/manuals/desktop/setup/sign-in.md index 01b04cab60d5..d8dd1ea49d59 100644 --- a/content/manuals/desktop/setup/sign-in.md +++ b/content/manuals/desktop/setup/sign-in.md @@ -38,7 +38,7 @@ In large enterprises where admin access is restricted, administrators can [enfor ## Signing in with Docker Desktop for Linux Docker Desktop for Linux relies on [`pass`](https://www.passwordstore.org/) to store credentials in GPG-encrypted files. -Before signing in to Docker Desktop with your [Docker ID](/accounts/create-account/), you must initialize `pass`. +Before signing in to Docker Desktop with your [Docker ID](/accounts/individual/create-account/), you must initialize `pass`. Docker Desktop displays a warning if `pass` is not configured. 1. Generate a GPG key. You can initialize pass by using a gpg key. To generate a gpg key, run: diff --git a/content/manuals/dhi/how-to/use.md b/content/manuals/dhi/how-to/use.md index 73bf38594ea0..adebb74bab4a 100644 --- a/content/manuals/dhi/how-to/use.md +++ b/content/manuals/dhi/how-to/use.md @@ -23,7 +23,7 @@ package manager, and may run as a non-root user by default. > pull DHI Community images. You can authenticate using either of the following: > > - **Docker ID and password:** Use your Docker Hub username and password. If -> you don't have a Docker account, [create one](../../accounts/create-account.md) +> you don't have a Docker account, [create one](../../accounts/individual/create-account.md > for free. > - **Access token:** Use a [personal access token > (PAT)](../../security/access-tokens.md) for personal accounts, or an diff --git a/content/manuals/dhi/how-to/verify.md b/content/manuals/dhi/how-to/verify.md index ab4602e0deb7..114385056004 100644 --- a/content/manuals/dhi/how-to/verify.md +++ b/content/manuals/dhi/how-to/verify.md @@ -27,7 +27,7 @@ attestation infrastructure. > You must authenticate to the Docker Hardened Images registry (`dhi.io`) to > pull images. Use your Docker ID credentials (the same username and password > you use for Docker Hub) when signing in. If you don't have a Docker account, -> [create one](../../accounts/create-account.md) for free. +> [create one](../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/examples/dotnet.md b/content/manuals/dhi/migration/examples/dotnet.md index 79cdee998e1a..129d2f937788 100644 --- a/content/manuals/dhi/migration/examples/dotnet.md +++ b/content/manuals/dhi/migration/examples/dotnet.md @@ -23,7 +23,7 @@ Hardened Images. Each example includes four variations: > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../../accounts/create-account.md) for free. +> one](../../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/examples/go.md b/content/manuals/dhi/migration/examples/go.md index 3a42bdc50a9d..b79ba0d407a6 100644 --- a/content/manuals/dhi/migration/examples/go.md +++ b/content/manuals/dhi/migration/examples/go.md @@ -24,7 +24,7 @@ Hardened Images. Each example includes five variations: > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../../accounts/create-account.md) for free. +> one](../../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/examples/java.md b/content/manuals/dhi/migration/examples/java.md index bfae595dc48a..2b26fbeb1d74 100644 --- a/content/manuals/dhi/migration/examples/java.md +++ b/content/manuals/dhi/migration/examples/java.md @@ -24,7 +24,7 @@ Hardened Images. Each example includes five variations: > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../../accounts/create-account.md) for free. +> one](../../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/examples/node.md b/content/manuals/dhi/migration/examples/node.md index 3019df3f8d16..23425e726437 100644 --- a/content/manuals/dhi/migration/examples/node.md +++ b/content/manuals/dhi/migration/examples/node.md @@ -24,7 +24,7 @@ Hardened Images. Each example includes five variations: > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../../accounts/create-account.md) for free. +> one](../../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/examples/python.md b/content/manuals/dhi/migration/examples/python.md index 4ee4d327551c..bf11e9bc4bfd 100644 --- a/content/manuals/dhi/migration/examples/python.md +++ b/content/manuals/dhi/migration/examples/python.md @@ -24,7 +24,7 @@ Hardened Images. Each example includes five variations: > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../../accounts/create-account.md) for free. +> one](../../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/migrate-from-doi.md b/content/manuals/dhi/migration/migrate-from-doi.md index 559967e003e2..5908e3a4c2c9 100644 --- a/content/manuals/dhi/migration/migrate-from-doi.md +++ b/content/manuals/dhi/migration/migrate-from-doi.md @@ -48,7 +48,7 @@ replaced by the new hardened image. > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../accounts/create-account.md) for free. +> one](../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/migrate-from-ubuntu.md b/content/manuals/dhi/migration/migrate-from-ubuntu.md index b061e791df46..b28d8cecdc18 100644 --- a/content/manuals/dhi/migration/migrate-from-ubuntu.md +++ b/content/manuals/dhi/migration/migrate-from-ubuntu.md @@ -43,7 +43,7 @@ replaced by the new DHI Debian image. > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../accounts/create-account.md) for free. +> one](../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/dhi/migration/migrate-from-wolfi.md b/content/manuals/dhi/migration/migrate-from-wolfi.md index d291653e2b40..59de5e0e3f1f 100644 --- a/content/manuals/dhi/migration/migrate-from-wolfi.md +++ b/content/manuals/dhi/migration/migrate-from-wolfi.md @@ -34,7 +34,7 @@ replaced by the new hardened image. > You must authenticate to `dhi.io` before you can pull Docker Hardened Images. > Use your Docker ID credentials (the same username and password you use for > Docker Hub). If you don't have a Docker account, [create -> one](../../accounts/create-account.md) for free. +> one](../../accounts/individual/create-account.md) for free. > > Run `docker login dhi.io` to authenticate. diff --git a/content/manuals/docker-hub/_index.md b/content/manuals/docker-hub/_index.md index da692cc9dc8d..59b549bbae3b 100644 --- a/content/manuals/docker-hub/_index.md +++ b/content/manuals/docker-hub/_index.md @@ -27,7 +27,7 @@ grid: - title: Organizations description: Learn about organization administration. icon: building-storefront - link: /admin/ + link: /accounts/organization/ - title: Usage and limits description: Explore usage limits and how to better utilize Docker Hub. icon: chart-bar diff --git a/content/manuals/docker-hub/release-notes.md b/content/manuals/docker-hub/release-notes.md index 4b45b5eb3b74..c6683ff07826 100644 --- a/content/manuals/docker-hub/release-notes.md +++ b/content/manuals/docker-hub/release-notes.md @@ -146,7 +146,7 @@ known issues for each Docker Hub release. ### Bug fixes and enhancements -- You can now [export a CSV file of members](../admin/organization/manage/members.md#export-members-csv-file) from organizations that you own. +- You can now [export a CSV file of members](../accounts/organization/manage/members.md#export-members-csv-file) from organizations that you own. ## 2022-07-22 @@ -239,7 +239,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/activity-logs.md). +For more information about this feature and for instructions on how to use it, see [Activity logs](../accounts/organization/activity-logs.md). ## 2020-11-10 diff --git a/content/manuals/docker-hub/repos/manage/access.md b/content/manuals/docker-hub/repos/manage/access.md index c88d3492cfb3..ce85c4ea4012 100644 --- a/content/manuals/docker-hub/repos/manage/access.md +++ b/content/manuals/docker-hub/repos/manage/access.md @@ -105,7 +105,7 @@ access. You must create a team before you are able to configure repository permissions. For more details, see [Create and manage a -team](/manuals/admin/organization/manage/manage-a-team.md). +team](/manuals/accounts/organization/manage/manage-a-team.md). To configure team repository permissions: diff --git a/content/manuals/docker-hub/usage/pulls.md b/content/manuals/docker-hub/usage/pulls.md index c04e64c82ec0..55a03a859084 100644 --- a/content/manuals/docker-hub/usage/pulls.md +++ b/content/manuals/docker-hub/usage/pulls.md @@ -41,7 +41,7 @@ A pull is defined as the following: ## Pull attribution Pulls from authenticated users can be attributed to either a personal or an -[organization namespace](/manuals/accounts/general-faqs.md#whats-an-organization-name-or-namespace). +[organization namespace](/manuals/faqs/general-faqs.md#whats-an-organization-name-or-namespace). Attribution is based on the following: @@ -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/company/company-faqs.md), + [company](../../faqs/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. diff --git a/content/manuals/enterprise/security/domain-management.md b/content/manuals/enterprise/security/domain-management.md index 767f58deaa27..560606ee42de 100644 --- a/content/manuals/enterprise/security/domain-management.md +++ b/content/manuals/enterprise/security/domain-management.md @@ -110,7 +110,7 @@ The CSV file contains the following columns: You can bulk invite uncaptured users to your organization using the exported CSV file. For more information on bulk inviting users, see -[Manage organization members](/manuals/admin/organization/manage/members.md). +[Manage organization members](/manuals/accounts/organization/manage/members.md). ## Auto-provisioning diff --git a/content/manuals/enterprise/security/provisioning/auto-provisioning.md b/content/manuals/enterprise/security/provisioning/auto-provisioning.md index a0ab4c209362..30b1b118d6b5 100644 --- a/content/manuals/enterprise/security/provisioning/auto-provisioning.md +++ b/content/manuals/enterprise/security/provisioning/auto-provisioning.md @@ -20,7 +20,7 @@ When auto-provisioning is enabled for a verified domain: - Auto-provisioning only adds existing Docker users to your organization, it doesn't create new accounts. - Users experience no changes to their sign-in process. - Company and organization owners receive email notifications when new users are added. -- You may need to [manage seats](/manuals/admin/organization/manage/manage-seats.md) to accommodate new users. +- You may need to [manage seats](/manuals/accounts/organization/manage/manage-seats.md) to accommodate new users. ### Enable auto-provisioning diff --git a/content/manuals/enterprise/security/provisioning/scim/_index.md b/content/manuals/enterprise/security/provisioning/scim/_index.md index ace0770e759d..cb2705d448fd 100644 --- a/content/manuals/enterprise/security/provisioning/scim/_index.md +++ b/content/manuals/enterprise/security/provisioning/scim/_index.md @@ -55,7 +55,7 @@ SCIM automates: > > To remove those users, delete them manually from your Docker organization. > For more information, see -> [Manage organization members](/manuals/admin/organization/manage/members.md). +> [Manage organization members](/manuals/accounts/organization/manage/members.md). ## Next steps diff --git a/content/manuals/enterprise/security/roles-and-permissions/core-roles.md b/content/manuals/enterprise/security/roles-and-permissions/core-roles.md index fe2036836c77..11898416d08e 100644 --- a/content/manuals/enterprise/security/roles-and-permissions/core-roles.md +++ b/content/manuals/enterprise/security/roles-and-permissions/core-roles.md @@ -35,7 +35,7 @@ Docker organizations have three core roles: A company owner has the same organization-management permissions as an organization owner. Content and registry permissions, such as repository pull and push, don't apply to company owners. For more information, see -[Company overview](/manuals/admin/company/_index.md). +[Company overview](/manuals/accounts/organization/company/_index.md). ## Permissions reference @@ -131,7 +131,7 @@ _\* If not part of a company_ - [Custom roles](/manuals/enterprise/security/roles-and-permissions/custom-roles/_index.md): Create tailored permission sets on a Docker Business plan -- [Manage organization members](/manuals/admin/organization/manage/members.md): +- [Manage organization members](/manuals/accounts/organization/manage/members.md): Invite users and assign roles -- [Company overview](/manuals/admin/company/_index.md): Understand company +- [Company overview](/manuals/accounts/organization/company/_index.md): Understand company owner permissions versus organization owner permissions diff --git a/content/manuals/enterprise/security/roles-and-permissions/custom-roles/manage.md b/content/manuals/enterprise/security/roles-and-permissions/custom-roles/manage.md index 3dbf85e77731..55cbda7c856b 100644 --- a/content/manuals/enterprise/security/roles-and-permissions/custom-roles/manage.md +++ b/content/manuals/enterprise/security/roles-and-permissions/custom-roles/manage.md @@ -160,5 +160,5 @@ To see which users and teams are assigned to roles: permissions you can grant to a custom role - [Core roles and permissions](/manuals/enterprise/security/roles-and-permissions/core-roles.md): Compare built-in Member, Editor, and Owner permissions -- [Manage organization members](/manuals/admin/organization/manage/members.md): +- [Manage organization members](/manuals/accounts/organization/manage/members.md): Invite and manage users in your organization diff --git a/content/manuals/enterprise/security/single-sign-on/FAQs/users-faqs.md b/content/manuals/enterprise/security/single-sign-on/FAQs/users-faqs.md index a89bbe4ca5f8..92edc89f2221 100644 --- a/content/manuals/enterprise/security/single-sign-on/FAQs/users-faqs.md +++ b/content/manuals/enterprise/security/single-sign-on/FAQs/users-faqs.md @@ -37,7 +37,7 @@ For detailed instructions, see [Configure single sign-on](/manuals/enterprise/se ## Is Docker SSO fully synced with the IdP? -Docker SSO provides Just-in-Time (JIT) provisioning by default. Users are provisioned when they authenticate with SSO. If users leave the organization, administrators must manually [remove the user](/manuals/admin/organization/manage/members.md#remove-members-from-teams) from the organization. +Docker SSO provides Just-in-Time (JIT) provisioning by default. Users are provisioned when they authenticate with SSO. If users leave the organization, administrators must manually [remove the user](/manuals/accounts/organization/manage/members.md#remove-members-from-teams) from the organization. [SCIM](/manuals/enterprise/security/provisioning/scim/_index.md) provides full synchronization with users and groups. When using SCIM, the recommended configuration is to turn off JIT so all auto-provisioning is handled by SCIM. diff --git a/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md b/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md index ebd616e7f6c4..f645bce3ae8a 100644 --- a/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md +++ b/content/manuals/enterprise/security/single-sign-on/troubleshoot-sso.md @@ -105,7 +105,7 @@ to re-enable it: **Manually invite users** When JIT is disabled, users are not automatically added to your organization when they authenticate through SSO. -To manually invite users, see [Invite members](/manuals/admin/organization/manage/members.md#invite-members). +To manually invite users, see [Invite members](/manuals/accounts/organization/manage/members.md#invite-members). **Configure SCIM provisioning** @@ -162,11 +162,11 @@ This error occurs when the organization has no available seats for the user when **Add more seats to the organization** -Purchase additional Docker Business subscription seats. For details, see [Manage subscription seats](/manuals/admin/organization/manage/manage-seats.md). +Purchase additional Docker Business subscription seats. For details, see [Manage subscription seats](/manuals/accounts/organization/manage/manage-seats.md). **Remove users or pending invitations** -Review your organization members and pending invitations. Remove inactive users or pending invitations to free up seats. For more details, see [Manage organization members](/manuals/admin/organization/manage/members.md). +Review your organization members and pending invitations. Remove inactive users or pending invitations to free up seats. For more details, see [Manage organization members](/manuals/accounts/organization/manage/members.md). ## Domain is not verified for SSO connection diff --git a/content/manuals/extensions/settings-feedback.md b/content/manuals/extensions/settings-feedback.md index c585fd009eaf..0b6e5e3ceb96 100644 --- a/content/manuals/extensions/settings-feedback.md +++ b/content/manuals/extensions/settings-feedback.md @@ -19,7 +19,7 @@ Docker Extensions is switched off by default. To change your settings: > [!NOTE] > -> If you are an [organization owner](/manuals/admin/organization/manage/manage-a-team.md#what-is-an-organization-owner), you can turn off extensions for your users. Open the `settings-store.json` file, and set `"extensionsEnabled"` to `false`. +> If you are an [organization owner](/manuals/accounts/organization/manage/manage-a-team.md#what-is-an-organization-owner), you can turn off extensions for your users. Open the `settings-store.json` file, and set `"extensionsEnabled"` to `false`. > The `settings-store.json` file is located at: > - `~/Library/Group Containers/group.com.docker/settings-store.json` on Mac > - `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings-store.json` on Windows diff --git a/content/manuals/faqs/_index.md b/content/manuals/faqs/_index.md new file mode 100644 index 000000000000..f0631e10501a --- /dev/null +++ b/content/manuals/faqs/_index.md @@ -0,0 +1,29 @@ +--- +title: FAQs +description: Frequently asked questions about Docker accounts, organizations, and companies. +keywords: FAQ, FAQs, accounts, organizations, companies, Docker ID, Docker Home +weight: 45 +params: + sidebar: + group: Platform +grid: + - title: Account FAQs + description: FAQs about Docker IDs, account creation, and organization names. + icon: question-mark-circle + link: /faqs/general-faqs/ + - title: Organization FAQs + description: FAQs about organization members, seats, and authentication. + icon: user-group + link: /faqs/organization-faqs/ + - title: Company FAQs + description: FAQs about companies, seats, and company owners. + icon: building-office-2 + link: /faqs/company-faqs/ +--- + +Answers to common questions about Docker accounts, organizations, and +companies. + +## Next steps + +{{< grid >}} diff --git a/content/manuals/admin/company/company-faqs.md b/content/manuals/faqs/company-faqs.md similarity index 84% rename from content/manuals/admin/company/company-faqs.md rename to content/manuals/faqs/company-faqs.md index 8ab054c97ce7..25eb1c714bd8 100644 --- a/content/manuals/admin/company/company-faqs.md +++ b/content/manuals/faqs/company-faqs.md @@ -1,27 +1,29 @@ --- title: Company FAQs -linkTitle: FAQs +linkTitle: Companies weight: 30 description: Frequently asked questions about Docker companies, including subscriptions, seats, company owners, and permissions. keywords: Docker, Docker Hub, SSO FAQs, single sign-on, company, administration, company management tags: [FAQ] aliases: + - /admin/company/company-faqs/ - /docker-hub/company-faqs/ - /faq/admin/company-faqs/ - /admin/faqs/company-faqs/ + - /accounts/organization/company/company-faqs/ --- ### Some of my organizations don’t have a Docker Business subscription. Can I still use a parent company? Yes, but you can only add organizations with a Docker Business subscription -to a company. For more details, see [Add more organizations](/manuals/admin/company/manage.md#add-more-organizations). +to a company. For more details, see [Add more organizations](/manuals/accounts/organization/company/manage.md#add-more-organizations). ### What happens if one of my organizations downgrades from Docker Business, but I still need access as a company owner? To access and manage a nested organization, it must have a Docker Business subscription. If an organization downgrades from Docker Business, its owner must manage it outside of the company. For more details, see -[Add more organizations](/manuals/admin/company/manage.md#add-more-organizations). +[Add more organizations](/manuals/accounts/organization/company/manage.md#add-more-organizations). ### Do company owners occupy a subscription seat? @@ -34,7 +36,7 @@ Company owners don't occupy a seat unless one of the following is true: When you first create a company, your account is both a company owner and an organization owner, so it occupies a seat as long as you remain an organization owner. To free up that seat, -[assign another user as the organization owner](/manuals/admin/organization/manage/members.md#update-a-member-role) +[assign another user as the organization owner](/manuals/accounts/organization/manage/members.md#update-a-member-role) and remove yourself from the organization. You keep full administrative access as a company owner without using a subscription seat. diff --git a/content/manuals/accounts/general-faqs.md b/content/manuals/faqs/general-faqs.md similarity index 78% rename from content/manuals/accounts/general-faqs.md rename to content/manuals/faqs/general-faqs.md index 8e00863d7881..452f725fb4fd 100644 --- a/content/manuals/accounts/general-faqs.md +++ b/content/manuals/faqs/general-faqs.md @@ -1,7 +1,7 @@ --- title: Docker account FAQs -linkTitle: FAQs -weight: 40 +linkTitle: Accounts +weight: 10 description: FAQs about Docker IDs, account creation, and organization names keywords: docker ID, docker account FAQ, change docker ID, username taken, trademark, @@ -9,6 +9,8 @@ keywords: deactivate docker ID tags: [FAQ] aliases: + - /accounts/general-faqs/ + - /accounts/individual/general-faqs/ - /docker-hub/general-faqs/ - /docker-hub/onboarding-faqs/ - /faq/admin/general-faqs/ @@ -28,7 +30,7 @@ Your Docker ID must be between 4 and 30 characters long, and can only contain numbers and lowercase letters. You can't use any special characters or spaces. For more information, see -[Create a Docker account](/manuals/accounts/create-account.md). +[Create a Docker account](/manuals/accounts/individual/create-account.md). ## Can I change my Docker ID? @@ -53,10 +55,10 @@ the organization ID, is the unique identifier of a Docker organization. The organization name can't be the same as an existing Docker ID. For more information, see -[Docker organization overview](/manuals/admin/organization/_index.md). +[Organization accounts](/manuals/accounts/organization/_index.md). ## Next steps -- [Create a Docker account](/manuals/accounts/create-account.md) -- [Manage a Docker account](/manuals/accounts/manage-account.md) -- [Docker organization overview](/manuals/admin/organization/_index.md) +- [Create a Docker account](/manuals/accounts/individual/create-account.md) +- [Manage a Docker account](/manuals/accounts/individual/manage-account.md) +- [Organization accounts](/manuals/accounts/organization/_index.md) diff --git a/content/manuals/admin/organization/organization-faqs.md b/content/manuals/faqs/organization-faqs.md similarity index 86% rename from content/manuals/admin/organization/organization-faqs.md rename to content/manuals/faqs/organization-faqs.md index e013e5539d7e..845ecde913a7 100644 --- a/content/manuals/admin/organization/organization-faqs.md +++ b/content/manuals/faqs/organization-faqs.md @@ -1,14 +1,16 @@ --- title: Organization FAQs -linkTitle: FAQs -weight: 60 +linkTitle: Organizations +weight: 20 description: Organization FAQs keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration, Docker Home, members, organization management, manage orgs tags: [FAQ] aliases: + - /admin/organization/organization-faqs/ - /docker-hub/organization-faqs/ - /faq/admin/organization-faqs/ - /admin/faqs/organization-faqs/ + - /accounts/organization/organization-faqs/ --- ### How can I see how many active users are in my organization? @@ -18,7 +20,7 @@ find out how many users have Docker Desktop installed. If your organization doesn't use this software, you can run an internal survey to find out who is using Docker Desktop. -For more information, see [Identify your Docker users and their Docker accounts](../../admin/organization/setup/onboard.md#step-one-identify-your-docker-users). +For more information, see [Identify your Docker users and their Docker accounts](/manuals/accounts/organization/setup/onboard.md#step-one-identify-your-docker-users). ### Do users need to authenticate with Docker before an owner can add them to an organization? @@ -43,14 +45,14 @@ convert a user account into an organization, it's not possible to revert it to a personal user account. For prerequisites and instructions, see -[Convert an account into an organization](setup/convert-account.md). +[Convert an account into an organization](/manuals/accounts/organization/setup/convert-account.md). ### Do organization invitees take up seats? Yes. A user invited to an organization will take up one of the provisioned seats, even if that user hasn’t accepted their invitation yet. -To manage invites, see [Manage organization members](/manuals/admin/organization/manage/members.md). +To manage invites, see [Manage organization members](/manuals/accounts/organization/manage/members.md). ### Do organization owners take a seat? diff --git a/content/manuals/offload/configuration.md b/content/manuals/offload/configuration.md index f0275bebbde5..83bf541a121c 100644 --- a/content/manuals/offload/configuration.md +++ b/content/manuals/offload/configuration.md @@ -17,7 +17,7 @@ settings when allowed by their organization. For organization owners, you can manage Docker Offload settings for all users in your organization. For more details, see [Manage Docker -products](../admin/organization/manage/manage-products.md). To view usage for Docker +products](../accounts/organization/manage/manage-products.md). To view usage for Docker Offload, see [Docker Offload usage](/offload/usage/). ## Configure settings in Docker Desktop diff --git a/content/manuals/offload/quickstart.md b/content/manuals/offload/quickstart.md index 27b864a2e132..a35e8b30b2ca 100644 --- a/content/manuals/offload/quickstart.md +++ b/content/manuals/offload/quickstart.md @@ -19,7 +19,7 @@ This quickstart covers the steps developers need to get started with Docker Offl > > If you're an organization owner, to get started you must contact sales and subscribe your > organization to use Docker Offload. After subscribing, see [Manage Docker -> products](../admin/organization/manage/manage-products.md) to learn how to manage +> products](../accounts/organization/manage/manage-products.md) to learn how to manage > access for the developers in your organization. diff --git a/content/manuals/platform-release-notes.md b/content/manuals/platform-release-notes.md index dc7026bcf64d..de7bd4366247 100644 --- a/content/manuals/platform-release-notes.md +++ b/content/manuals/platform-release-notes.md @@ -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/insights.md). +- Administrators can now view [organization Insights](/manuals/accounts/organization/insights.md). ## 2024-07-17 diff --git a/content/manuals/security/faqs/general.md b/content/manuals/security/faqs/general.md index 89ed07dfabde..8efe2e48d664 100644 --- a/content/manuals/security/faqs/general.md +++ b/content/manuals/security/faqs/general.md @@ -40,7 +40,7 @@ Docker activity logs are available for 90 days. You're responsible for exporting ## Can I export a list of users with their roles and privileges? -Yes, use the [Export Members](../../admin/organization/manage/members.md#export-members-csv-file) feature to export a CSV file containing your organization's users with role and team information. +Yes, use the [Export Members](../../accounts/organization/manage/members.md#export-members-csv-file) feature to export a CSV file containing your organization's users with role and team information. ## How does Docker Desktop handle authentication information? @@ -54,7 +54,7 @@ Docker Desktop uses the host operating system's secure key management to store a If SCIM isn't turned on, you must manually remove users from the organization. SCIM can automate user removal, but only for users added after SCIM is turned on. Users added before SCIM was turned on must be removed manually. -For more information, see [Manage organization members](/manuals/admin/organization/manage/members.md). +For more information, see [Manage organization members](/manuals/accounts/organization/manage/members.md). ## What metadata does Scout collect from container images? diff --git a/content/manuals/subscription/plans/ai-governance.md b/content/manuals/subscription/plans/ai-governance.md index 486e9f12a1be..986b6fc2e2d4 100644 --- a/content/manuals/subscription/plans/ai-governance.md +++ b/content/manuals/subscription/plans/ai-governance.md @@ -22,7 +22,7 @@ aliases: AI Governance lets organization owners enforce [organization policies](/manuals/ai/sandboxes/governance/access-controls/organization.md) for license-holding members. Organization policies override a license-holding member's local policies. -You can [assign AI Governance licenses](/manuals/admin/organization/manage/manage-licenses.md) to any organization member, even if they don't occupy a Docker Team or Docker Business seat. For best practice, review available licenses as you add new members since members without an AI Governance license can still use Docker AI products. +You can [assign AI Governance licenses](/manuals/accounts/organization/manage/manage-licenses.md) to any organization member, even if they don't occupy a Docker Team or Docker Business seat. For best practice, review available licenses as you add new members since members without an AI Governance license can still use Docker AI products. ## Billing cycle diff --git a/content/manuals/subscription/plans/docker.md b/content/manuals/subscription/plans/docker.md index bb72f83445c6..08c6b7bd4dab 100644 --- a/content/manuals/subscription/plans/docker.md +++ b/content/manuals/subscription/plans/docker.md @@ -36,7 +36,7 @@ Docker Personal and Docker Pro are Docker plans for individual account types whi > [!TIP] > If you're upgrading from a Personal plan to a Team plan > and want to keep your username, -> [convert your user account into an organization](/manuals/admin/organization/setup/convert-account.md). +> [convert your user account into an organization](/manuals/accounts/organization/setup/convert-account.md). ## Billing cycle @@ -58,11 +58,11 @@ For Docker Team and Docker Business, you can purchase more seats for new members 1. Verify your billing details, continue to payment, and complete checkout. To learn how to manage seats from Docker Home, see -[Manage seats](/manuals/admin/organization/manage/manage-seats.md). +[Manage seats](/manuals/accounts/organization/manage/manage-seats.md). ### Docker Offload licenses -[Docker Offload](/manuals/offload/_index.md) licenses are available for Docker Team and Docker Business plans. Once assigned to your account, organization owners can [manage license assignments](/manuals/admin/organization/manage/manage-licenses.md) in Docker Home. +[Docker Offload](/manuals/offload/_index.md) licenses are available for Docker Team and Docker Business plans. Once assigned to your account, organization owners can [manage license assignments](/manuals/accounts/organization/manage/manage-licenses.md) in Docker Home. To add Docker Offload licenses, you must contact sales.