Skip to content
Draft
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
28 changes: 14 additions & 14 deletions content/guides/admin-set-up.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ This guide covers the following Docker features:
repositories. Your organization was created with your subscription and is
managed by one or more owners. Users signed into the organization are
assigned seats based on the purchased subscription.
- [Enforce sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md):
- [Enforce sign-in](/manuals/platform/security/authentication/enforce-sign-in/_index.md):
By default, Docker Desktop doesn't require sign-in. You can configure
settings to enforce this and ensure your developers sign in to your
Docker organization.
- [SSO](/manuals/enterprise/security/single-sign-on/_index.md): Without SSO,
- [SSO](/manuals/platform/security/authentication/single-sign-on/_index.md): Without SSO,
user management in a Docker organization is manual. Setting
up an SSO connection between your identity provider and Docker ensures
compliance with your security policy and automates user provisioning. Adding
Expand Down Expand Up @@ -142,7 +142,7 @@ If you suspect your company has multiple Docker organizations:

### Gather requirements

[Settings Management](/manuals/enterprise/security/hardened-desktop/settings-management/_index.md) lets you preset numerous configuration parameters for Docker Desktop.
[Settings Management](/manuals/enterprise/hardened-desktop/settings-management/_index.md) lets you preset numerous configuration parameters for Docker Desktop.

Work with the following stakeholders to establish your company's baseline
configuration:
Expand All @@ -154,11 +154,11 @@ configuration:
Review these areas together:

- Security features and
[enforcing sign-in](/manuals/enterprise/security/enforce-sign-in/_index.md)
[enforcing sign-in](/manuals/platform/security/authentication/enforce-sign-in/_index.md)
for Docker Desktop users
- Additional Docker products included in your subscriptions

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).
To view the parameters that can be preset, see [Configure Settings Management](/manuals/enterprise/hardened-desktop/settings-management/configure-json-file.md#step-two-configure-the-settings-you-want-to-lock-in).

### Optional: Meet with the Docker Implementation team

Expand All @@ -172,11 +172,11 @@ To schedule a meeting, email successteam@docker.com.
### 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 the previous section, configure Settings Management either via [Docker Home](/manuals/enterprise/security/hardened-desktop/settings-management/configure-admin-console.md) or with an
[`admin-settings.json` file](/manuals/enterprise/security/hardened-desktop/settings-management/configure-json-file.md).
security configurations as outlined in the previous section, configure Settings Management either via [Docker Home](/manuals/enterprise/hardened-desktop/settings-management/configure-admin-console.md) or with an
[`admin-settings.json` file](/manuals/enterprise/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/enterprise/security/enforce-sign-in/_index.md).
settings, along with your chosen method for [enforcing sign-in](/manuals/platform/security/authentication/enforce-sign-in/_index.md).

> [!IMPORTANT]
>
Expand All @@ -196,9 +196,9 @@ organizations.
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).
[documentation](/manuals/platform/security/authentication/single-sign-on/_index.md).

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

#### Set up Docker product entitlements included in the subscription
Expand Down Expand Up @@ -252,7 +252,7 @@ SSO and SCIM setup.
> [!IMPORTANT]
>
> Some users may need CLI based logins to Docker Hub, and for this they will
> need a [personal access token (PAT)](/manuals/security/access-tokens.md).
> need a [personal access token (PAT)](/manuals/platform/security/access-tokens/personal-access-tokens.md).

### Test Registry Access Management and Image Access Management

Expand All @@ -261,7 +261,7 @@ SSO and SCIM setup.
> 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/enterprise/security/hardened-desktop/registry-access-management.md) and/or [Image Access Management (IAM)](/manuals/enterprise/security/hardened-desktop/image-access-management.md):
If you plan to use [Registry Access Management (RAM)](/manuals/enterprise/hardened-desktop/registry-access-management.md) and/or [Image Access Management (IAM)](/manuals/enterprise/hardened-desktop/image-access-management.md):

1. Ensure your test developer signs in to Docker Desktop using their
organization credentials
Expand Down Expand Up @@ -312,7 +312,7 @@ that matches your verified domain must sign in using your SSO connection. Make
sure the Identity provider groups associated with your SSO connection cover all
the developer groups that you want to have access to the Docker subscription.

For instructions on how to enforce SSO, see [Enforce SSO](/manuals/enterprise/security/single-sign-on/connect.md).
For instructions on how to enforce SSO, see [Enforce SSO](/manuals/platform/security/authentication/single-sign-on/connect.md).

### Deploy configuration settings and enforce sign-in to users

Expand All @@ -327,4 +327,4 @@ To continue optimizing your Docker environment:

- Review your [organization's usage data](/manuals/admin/insights.md) to track adoption
- Monitor [Docker Scout findings](/manuals/scout/explore/analysis.md) for security insights
- Explore [additional security features](/manuals/enterprise/security/_index.md) to enhance your configuration
- Explore [additional security features](/manuals/enterprise/hardened-desktop/_index.md) to enhance your configuration
12 changes: 6 additions & 6 deletions content/guides/admin-user-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Docker's predefined roles offer flexibility for various organizational needs. As
- Editor: Partial administrative access to the organization. Editors can create, edit, and delete repositories. They can also edit an existing team's access permissions.
- Owner: Full organization administrative access. Owners can manage organization repositories, teams, members, settings, and billing.

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

#### Enhance with teams

Expand Down Expand Up @@ -89,7 +89,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 prevents blockers if the primary owner is unavailable.

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

### Invite members and assign roles

Expand Down Expand Up @@ -119,11 +119,11 @@ SSO:
- Reduces password-related vulnerabilities.
- Simplifies onboarding as it works seamlessly with SCIM and group mapping for automated provisioning.

For more information, see the [SSO documentation](/manuals/enterprise/security/single-sign-on/_index.md).
For more information, see the [SSO documentation](/manuals/platform/security/authentication/single-sign-on/_index.md).

#### Automate onboarding with SCIM and JIT provisioning

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

With SCIM you can:

Expand All @@ -145,7 +145,7 @@ It also:
- Ensures consistent access control policies.
- Help you scale permissions as teams grow or change.

For more information on how it works, see [Group mapping](/manuals/enterprise/security/provisioning/scim/group-mapping.md).
For more information on how it works, see [Group mapping](/manuals/platform/security/provisioning/scim/group-mapping.md).

## Monitoring and insights

Expand Down Expand Up @@ -194,5 +194,5 @@ 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
- Explore [advanced security features](/manuals/enterprise/security/_index.md) to further enhance your Docker environment
- Explore [advanced security features](/manuals/enterprise/hardened-desktop/_index.md) to further enhance your Docker environment
- Share best practices with your team to ensure consistent adoption of security policies
2 changes: 1 addition & 1 deletion content/guides/genai-claude-code-mcp.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Make sure you have:
1. Select the **Docker Hub**MCP server
1. Add the MCP server, then open the **Configuration** tab
1. Enter your Docker Hub username
1. [Create a read-only personal access token](/security/access-tokens/#create-a-personal-access-token) and enter your access token under **Secrets**
1. [Create a read-only personal access token](/platform/security/access-tokens/personal-access-tokens/#create-a-personal-access-token) and enter your access token under **Secrets**
1. Save the configuration

![Docker Hub](images/genai-claude-code-mcp-catalog-docker-hub.avif "Docker Hub")
Expand Down
2 changes: 1 addition & 1 deletion content/guides/gha.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ that, you must authenticate with your Docker credentials (username and access
token) as part of the GitHub Actions workflow.

For instructions on how to create a Docker access token, see
[Create and manage access tokens](/manuals/security/access-tokens.md).
[Create and manage access tokens](/manuals/platform/security/access-tokens/personal-access-tokens.md).

Once you have your Docker credentials ready, add the credentials to your GitHub
repository so you can use them in GitHub Actions:
Expand Down
2 changes: 1 addition & 1 deletion content/guides/zscaler.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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/enterprise/security/hardened-desktop/settings-management/_index.md),
organization using [Settings Management](/manuals/enterprise/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
6 changes: 5 additions & 1 deletion content/manuals/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ params:
- title: Security
description: Security guardrails for both administrators and developers.
icon: lock-closed
link: /security/
link: /platform/security/
- title: Subscription
description: Commercial use licenses for Docker products.
icon: credit-card
Expand All @@ -104,6 +104,10 @@ params:
description: Deploy Docker Desktop at scale within your company
icon: arrow-down-tray
link: /enterprise/enterprise-deployment/
- title: Hardened Docker Desktop
description: Security features that strengthen developer environments.
icon: shield-check
link: /enterprise/hardened-desktop/
---

This section contains user guides on how to install, set up, configure, and use
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/accounts/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ grid:
- title: Personal access tokens
description: Learn how to create and manage access tokens for your account.
icon: lock-closed
link: /security/access-tokens/
link: /platform/security/access-tokens/personal-access-tokens/
- title: Set up two-factor authentication
description: Add an extra layer of authentication to your Docker account.
link: /security/2fa/
link: /platform/security/authentication/2fa/
icon: device-phone-mobile
- title: Organization overview
description: Learn how to create and manage Docker organizations.
Expand Down Expand Up @@ -56,7 +56,7 @@ Docker also ties a verified email to the account.
- 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),
[single sign-on (SSO)](/manuals/platform/security/authentication/single-sign-on/_index.md),
Google, or GitHub.

## Next steps
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/accounts/create-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ basis:
## Next steps

- [Manage a Docker account](/manuals/accounts/manage-account.md)
- [Enable two-factor authentication](/manuals/security/2fa/_index.md)
- [Enable two-factor authentication](/manuals/platform/security/authentication/2fa/_index.md)
6 changes: 3 additions & 3 deletions content/manuals/accounts/manage-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ To update your two-factor authentication (2FA) settings:
1. Select **2FA**.

For more information, see
[Enable two-factor authentication](/manuals/security/2fa/_index.md).
[Enable two-factor authentication](/manuals/platform/security/authentication/2fa/_index.md).

## Manage personal access tokens

Expand All @@ -88,7 +88,7 @@ To manage personal access tokens:
1. Select **Personal access tokens**.

For more information, see
[Create and manage access tokens](/manuals/security/access-tokens.md).
[Create and manage access tokens](/manuals/platform/security/access-tokens/personal-access-tokens.md).

## Manage connected accounts

Expand Down Expand Up @@ -127,4 +127,4 @@ For information on deactivating your account, see

- [Docker accounts overview](/manuals/accounts/_index.md)
- [Create a Docker account](/manuals/accounts/create-account.md)
- [Enable two-factor authentication](/manuals/security/2fa/_index.md)
- [Enable two-factor authentication](/manuals/platform/security/authentication/2fa/_index.md)
2 changes: 1 addition & 1 deletion content/manuals/admin/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ grid:
- title: Security
description: Explore security features for administrators.
icon: shield-check
link: /enterprise/security/
link: /platform/security/
aliases:
- /docker-hub/admin-overview
---
Expand Down
4 changes: 2 additions & 2 deletions content/manuals/admin/company/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ grid:
- title: Configure SSO and SCIM
description: Set up single sign-on and SCIM provisioning for your company.
icon: key
link: /enterprise/security/single-sign-on/
link: /platform/security/authentication/single-sign-on/
- title: Domain management
description: Add and verify your company's domains.
icon: check-badge
link: /enterprise/security/domain-management/
link: /platform/security/provisioning/domain-management/
- title: FAQs
description: Explore frequently asked questions about companies.
link: /faq/admin/company-faqs/
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/admin/company/company-faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ 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](/manuals/enterprise/security/roles-and-permissions.md).
For more information, see [Roles and permissions](/manuals/platform/security/roles-and-permissions.md).
Loading