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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions content/guides/admin-set-up/comms-and-info-gathering.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Some companies may have more than one [Docker organization](/manuals/admin/organ

## Step three: Gather requirements

Through [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md), Docker provides numerous configuration parameters that can be preset. The Docker organization owner, development lead, and infosec representative should review these settings to establish the company’s baseline configuration, including security features and [enforcing sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for Docker Desktop users. Additionally, they should decide whether to take advantage of other Docker products, such as [Docker Scout](/manuals/scout/_index.md), which is included in the subscription.
Through [Settings Management](/manuals/enterprise/security/hardened-desktop/settings-management/_index.md), Docker provides numerous configuration parameters that can be preset. The Docker organization owner, development lead, and infosec representative should review these settings to establish the company’s baseline configuration, including security features and [enforcing sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md) for Docker Desktop users. Additionally, they should decide whether to take advantage of other Docker products, such as [Docker Scout](/manuals/scout/_index.md), which is included in the subscription.

To view the parameters that can be preset, see [Configure Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md#step-two-configure-the-settings-you-want-to-lock-in).
To view the parameters that can be preset, see [Configure Settings Management](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md#step-two-configure-the-settings-you-want-to-lock-in).

## Optional step four: Meet with the Docker Implementation team

Expand Down
8 changes: 4 additions & 4 deletions content/guides/admin-set-up/finalize-plans-and-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ weight: 20

## Step one: Send finalized settings files to the MDM team

After reaching an agreement with the relevant teams about your baseline and security configurations as outlined in module one, configure Settings Management using either the [Docker Admin Console](/manuals/security/for-admins/hardened-desktop/settings-management/configure-admin-console.md) or an [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md).
After reaching an agreement with the relevant teams about your baseline and security configurations as outlined in module one, configure Settings Management using either the [Docker Admin Console](/manuals/enterprise/security/hardened-desktop/settings-management/configure-admin-console.md) or an [`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md).

Once the file is ready, collaborate with your MDM team to deploy your chosen settings, along with your chosen method for [enforcing sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md).
Once the file is ready, collaborate with your MDM team to deploy your chosen settings, along with your chosen method for [enforcing sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md).

> [!IMPORTANT]
>
Expand All @@ -22,9 +22,9 @@ If you have more than one organization, it’s recommended that you either conso

### Set up single sign-on SSO domain verification

Single sign-on (SSO) lets developers authenticate using their identity providers (IdPs) to access Docker. SSO is available for a whole company, and all associated organizations, or an individual organization that has a Docker Business subscription. For more information, see the [documentation](/manuals/security/for-admins/single-sign-on/_index.md).
Single sign-on (SSO) lets developers authenticate using their identity providers (IdPs) to access Docker. SSO is available for a whole company, and all associated organizations, or an individual organization that has a Docker Business subscription. For more information, see the [documentation](/manuals/enterprise/security/single-sign-on/_index.md).

You can also enable [SCIM](/manuals/security/for-admins/provisioning/scim.md) for further automation of provisioning and deprovisioning of users.
You can also enable [SCIM](/manuals/enterprise/security/provisioning/scim.md) for further automation of provisioning and deprovisioning of users.

### Set up Docker product entitlements included in the subscription

Expand Down
2 changes: 1 addition & 1 deletion content/guides/admin-set-up/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You can test SSO and SCIM by signing in to Docker Desktop or Docker Hub with the
> [!WARNING]
> Be sure to communicate with your users before proceeding, as this step will impact all existing users signing into your Docker organization

If you plan to use [Registry Access Management (RAM)](/manuals/security/for-admins/hardened-desktop/registry-access-management.md) and/or [Image Access Management (IAM)](/manuals/security/for-admins/hardened-desktop/image-access-management.md), ensure your test developer signs in to Docker Desktop using their organization credentials. Once authenticated, have them attempt to pull an unauthorized image or one from a disallowed registry via the Docker CLI. They should receive an error message indicating that the registry is restricted by the organization.
If you plan to use [Registry Access Management (RAM)](/manuals/enterprise/security/hardened-desktop/registry-access-management.md) and/or [Image Access Management (IAM)](/manuals/enterprise/security/hardened-desktop/image-access-management.md), ensure your test developer signs in to Docker Desktop using their organization credentials. Once authenticated, have them attempt to pull an unauthorized image or one from a disallowed registry via the Docker CLI. They should receive an error message indicating that the registry is restricted by the organization.

## Deploy settings and enforce sign in to test group

Expand Down
8 changes: 4 additions & 4 deletions content/guides/admin-user-management/onboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This page guides you through onboarding owners and members, and using tools like

When you create a Docker organization, you automatically become its sole owner. While optional, adding additional owners can significantly ease the process of onboarding and managing your organization by distributing administrative responsibilities. It also ensures continuity and does not cause a blocker if the primary owner is unavailable.

For detailed information on owners, see [Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md).
For detailed information on owners, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).

## Step 2: Invite members and assign roles

Expand Down Expand Up @@ -47,11 +47,11 @@ SSO:

- Simplifies onboarding as it works seamlessly with SCIM and group mapping for automated provisioning.

[SSO documentation](/manuals/security/for-admins/single-sign-on/_index.md).
[SSO documentation](/manuals/enterprise/security/single-sign-on/_index.md).

### Automate onboarding with SCIM and JIT provisioning

Streamline user provisioning and role management with [SCIM](/manuals/security/for-admins/provisioning/scim.md) and [Just-in-Time (JIT) provisioning](/manuals/security/for-admins/provisioning/just-in-time.md).
Streamline user provisioning and role management with [SCIM](/manuals/enterprise/security/provisioning/scim.md) and [Just-in-Time (JIT) provisioning](/manuals/enterprise/security/provisioning/just-in-time.md).

With SCIM you can:

Expand All @@ -77,4 +77,4 @@ It also:

- Help you scale permissions as teams grow or change.

For more information on how it works, see [Group mapping](/manuals/security/for-admins/provisioning/group-mapping.md).
For more information on how it works, see [Group mapping](/manuals/enterprise/security/provisioning/group-mapping.md).
2 changes: 1 addition & 1 deletion content/guides/admin-user-management/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Docker’s predefined roles offer flexibility for various organizational needs.
- Organization owner: Full organization administrative access. Organization owners can manage organization repositories, teams, members, settings, and billing.
- Company owner: In addition to the permissions of an organization owner, company owners can configure settings for their associated organizations.

For more information, see [Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md).
For more information, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).

### Enhancing with teams

Expand Down
2 changes: 1 addition & 1 deletion content/guides/zscaler/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ necessary.

If you are not using Zscaler as a system-level proxy, manually configure proxy
settings in Docker Desktop. Set up proxy settings for all clients in the
organization using [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md),
organization using [Settings Management](/manuals/enterprise/security/hardened-desktop/settings-management/_index.md),
or edit proxy configuration in the Docker Desktop GUI under [**Settings > Resources > Proxies**](/manuals/desktop/settings-and-maintenance/settings.md#proxies).

## Install root certificates in Docker images
Expand Down
14 changes: 13 additions & 1 deletion content/manuals/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ params:
- AI
- Products
- Platform
- Enterprise
notoc: true
open-source:
- title: Docker Build
Expand Down Expand Up @@ -107,6 +108,11 @@ params:
description: Commercial use licenses for Docker products.
icon: card_membership
link: /subscription/
enterprise:
- title: Deploy Docker Desktop
description: Deploy Docker Desktop at scale within your company
icon: download
link: /enterprise/enterprise-deployment/
---

This section contains user guides on how to install, set up, configure, and use
Expand All @@ -133,6 +139,12 @@ End-to-end developer solutions for innovative teams.
## Platform

Documentation related to the Docker platform, such as administration and
subscription management for organizations.
subscription management.

{{< grid items=platform >}}

## Enterprise

Targeted at IT administrators with help on deploying Docker Desktop at scale with configuration guidance on security related features.

{{< grid items=enterprise >}}
2 changes: 1 addition & 1 deletion content/manuals/admin/faqs/company-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ subscription seat.
Company owners can navigate to the **Organizations** page to view all their
nested organizations in a single location. They can also view or edit organization members and change single sign-on (SSO) and System for Cross-domain Identity Management (SCIM) settings. Changes to company settings impact all users in each organization under the company.

For more information, see [Roles and permissions](../../security/for-admins/roles-and-permissions.md).
For more information, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).
6 changes: 3 additions & 3 deletions content/manuals/admin/faqs/general-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ An organization owner is a member who has administrator permissions. They
have full access to private repositories, all teams, billing information, and
organization settings.

For more information on the organization owner role, see [Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md).
For more information on the organization owner role, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).

### Can I configure multiple SSO identity providers (IdPs) to authenticate users to a single org?

Yes. Docker SSO supports multiple IdP configurations. For more
information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../../security/faqs/single-sign-on/faqs.md).
information, see [Configure SSO](/manuals/enterprise/security/single-sign-on/configure.md) and [SSO FAQs](../../security/faqs/single-sign-on/faqs.md).

### What is a service account?

Expand All @@ -68,7 +68,7 @@ or renewals of service accounts are no longer available and customers must renew
under a new subscription.

For similar functionality,
transition to [Organization access tokens](/manuals/security/for-admins/access-tokens.md).
transition to [Organization access tokens](/manuals/enterprise/security/access-tokens.md).

### Can I delete or deactivate a Docker account for another user?

Expand Down
4 changes: 2 additions & 2 deletions content/manuals/admin/faqs/organization-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ assign them to a team during the invite process.
### Can I force my organization's members to authenticate before using Docker Desktop and are there any benefits?

Yes. You can
[enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md).
[enforce sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md).

Some benefits of enforcing sign-in are:

- Administrators can enforce features like [Image Access Management](/manuals/security/for-admins/hardened-desktop/image-access-management.md) and [Registry Access Management](../../security/for-admins/hardened-desktop/registry-access-management.md).
- Administrators can enforce features like [Image Access Management](/manuals/enterprise/security/hardened-desktop/image-access-management.md) and [Registry Access Management](/manuals/enterprise/security/hardened-desktop/registry-access-management.md).
- Administrators can ensure compliance by blocking Docker Desktop usage for
users who don't sign in as members of the organization.

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/admin/organization/convert-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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-a-team.md) and
[roles](/manuals/security/for-admins/roles-and-permissions.md).
[roles](/manuals/enterprise/security/roles-and-permissions.md).

When you convert a user account to an organization, the account is migrated to
a Docker Team subscription by default.
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/admin/organization/deactivate-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ organization:
- If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md).
- Remove all other members within the organization.
- Unlink your [GitHub and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account).
- For Business organizations, [remove your SSO connection](../../security/for-admins/single-sign-on/manage/#remove-an-organization).
- For Business organizations, [remove your SSO connection](/manuals/enterprise/security/single-sign-on/manage.md#remove-an-organization).

## Deactivate

Expand Down
6 changes: 3 additions & 3 deletions content/manuals/admin/organization/general-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ select your organization.

After configuring your organization information, you can:

- [Configure single sign-on (SSO)](../../security/for-admins/single-sign-on/configure/)
- [Set up SCIM provisioning](../../security/for-admins/provisioning/scim.md)
- [Manage domains](../../security/for-admins/domain-management.md)
- [Configure single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/configure.md)
- [Set up SCIM provisioning](/manuals/enterprise/security/provisioning/scim.md)
- [Manage domains](/manuals/enterprise/security/domain-management.md)
- [Create a company](new-company.md)
4 changes: 2 additions & 2 deletions content/manuals/admin/organization/insights.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ A Docker Desktop user export file contains the following data points:
- Username: User's Docker ID
- Email: User's email address associated with their Docker ID
- Type: User type
- Role: User [role](/manuals/security/for-admins/roles-and-permissions.md)
- Role: User [role](/manuals/enterprise/security/roles-and-permissions.md)
- Teams: Team(s) within your organization the user is a
member of
- Date Joined: The date the user joined your organization
Expand All @@ -185,7 +185,7 @@ their web browser (this includes Docker Hub and Docker Home)
installed
- Last Seen Date: The last date the user used the Docker Desktop application
- Opted Out Analytics: Whether the user has opted out of the
[Send usage statistics](/manuals/security/for-admins/hardened-desktop/settings-management/settings-reference.md#send-usage-statistics) setting in Docker Desktop
[Send usage statistics](/manuals/enterprise/security/hardened-desktop/settings-management/settings-reference.md#send-usage-statistics) setting in Docker Desktop

## Troubleshoot Insights

Expand Down
6 changes: 3 additions & 3 deletions content/manuals/admin/organization/manage-a-team.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ An organization owner is an administrator who has the following permissions:
organization settings
- Specify [permissions](#permissions-reference) for each team in the
organization
- Enable [SSO](../../security/for-admins/single-sign-on/_index.md) for the
- Enable [SSO](/manuals/enterprise/security/single-sign-on/_index.md) for the
organization

When SSO is enabled for your organization, the organization owner can
Expand All @@ -44,7 +44,7 @@ Organization owners can add others with the owner role to help them
manage users, teams, and repositories in the organization.

For more information on roles, see
[Roles and permissions](/manuals/security/for-admins/roles-and-permissions.md).
[Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).

## Create a team

Expand Down Expand Up @@ -92,7 +92,7 @@ access for.

Organization owners can also assign members the editor role to grant partial
administrative access. For more information on the editor role, see
[Roles and permissions](../../security/for-admins/roles-and-permissions.md).
[Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).

### Permissions reference

Expand Down
10 changes: 5 additions & 5 deletions content/manuals/admin/organization/manage-products.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ subscription, see

To manage Docker Desktop access:

1. [Enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md).
1. [Enforce sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md).
1. Manage members [manually](./members.md) or use
[provisioning](../../security/for-admins/provisioning/_index.md).
[provisioning](/manuals/enterprise/security/provisioning/_index.md).

With sign-in enforced, only users who are a member of your organization can
use Docker Desktop after signing in.
Expand All @@ -44,8 +44,8 @@ use Docker Desktop after signing in.
### Manage Docker Hub access

To manage Docker Hub access, sign in to
[Docker Home](https://app.docker.com/) and configure [Registry Access Management](../../security/for-admins/hardened-desktop/registry-access-management.md)
or [Image Access Management](../../security/for-admins/hardened-desktop/image-access-management.md).
[Docker Home](https://app.docker.com/) and configure [Registry Access Management](/manuals/enterprise/security/hardened-desktop/registry-access-management.md)
or [Image Access Management](/manuals/enterprise/security/hardened-desktop/image-access-management.md).

{{< /tab >}}
{{< tab name="Docker Build Cloud" >}}
Expand Down Expand Up @@ -80,7 +80,7 @@ owner.
**Repository settings**. For more information on,
see [repository settings](../../scout/explore/dashboard.md#repository-settings).
1. To manage access to Docker Scout for use on local images with Docker Desktop,
use [Settings Management](../../security/for-admins/hardened-desktop/settings-management/_index.md)
use [Settings Management](/manuals/enterprise/security/hardened-desktop/settings-management/_index.md)
and set `sbomIndexing` to `false` to disable, or to `true` to enable.

{{< /tab >}}
Expand Down
Loading