Skip to content

Commit 5dd8bad

Browse files
restore Enterprise docs changes (#23094)
Reverts #23091 to restore Enterprise doc changes
1 parent fa01136 commit 5dd8bad

File tree

95 files changed

+351
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+351
-283
lines changed

content/guides/admin-set-up/comms-and-info-gathering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ Some companies may have more than one [Docker organization](/manuals/admin/organ
2424

2525
## Step three: Gather requirements
2626

27-
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.
27+
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.
2828

29-
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).
29+
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).
3030

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

content/guides/admin-set-up/finalize-plans-and-setup.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ weight: 20
66

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

9-
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).
9+
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).
1010

11-
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).
11+
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).
1212

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

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

25-
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).
25+
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).
2626

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

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

content/guides/admin-set-up/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can test SSO and SCIM by signing in to Docker Desktop or Docker Hub with the
1717
> [!WARNING]
1818
> Be sure to communicate with your users before proceeding, as this step will impact all existing users signing into your Docker organization
1919
20-
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.
20+
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.
2121

2222
## Deploy settings and enforce sign in to test group
2323

content/guides/admin-user-management/onboard.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This page guides you through onboarding owners and members, and using tools like
1111

1212
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.
1313

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

1616
## Step 2: Invite members and assign roles
1717

@@ -47,11 +47,11 @@ SSO:
4747

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

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

5252
### Automate onboarding with SCIM and JIT provisioning
5353

54-
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).
54+
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).
5555

5656
With SCIM you can:
5757

@@ -77,4 +77,4 @@ It also:
7777

7878
- Help you scale permissions as teams grow or change.
7979

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

content/guides/admin-user-management/setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Docker’s predefined roles offer flexibility for various organizational needs.
2424
- Organization owner: Full organization administrative access. Organization owners can manage organization repositories, teams, members, settings, and billing.
2525
- Company owner: In addition to the permissions of an organization owner, company owners can configure settings for their associated organizations.
2626

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

2929
### Enhancing with teams
3030

content/guides/zscaler/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ necessary.
4646

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

5252
## Install root certificates in Docker images

content/manuals/_index.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ params:
1313
- AI
1414
- Products
1515
- Platform
16+
- Enterprise
1617
notoc: true
1718
open-source:
1819
- title: Docker Build
@@ -107,6 +108,11 @@ params:
107108
description: Commercial use licenses for Docker products.
108109
icon: card_membership
109110
link: /subscription/
111+
enterprise:
112+
- title: Deploy Docker Desktop
113+
description: Deploy Docker Desktop at scale within your company
114+
icon: download
115+
link: /enterprise/enterprise-deployment/
110116
---
111117

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

135141
Documentation related to the Docker platform, such as administration and
136-
subscription management for organizations.
142+
subscription management.
137143

138144
{{< grid items=platform >}}
145+
146+
## Enterprise
147+
148+
Targeted at IT administrators with help on deploying Docker Desktop at scale with configuration guidance on security related features.
149+
150+
{{< grid items=enterprise >}}

content/manuals/admin/faqs/company-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ subscription seat.
4646
Company owners can navigate to the **Organizations** page to view all their
4747
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.
4848

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

content/manuals/admin/faqs/general-faqs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ An organization owner is a member who has administrator permissions. They
5353
have full access to private repositories, all teams, billing information, and
5454
organization settings.
5555

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

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

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

6363
### What is a service account?
6464

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

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

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

content/manuals/admin/faqs/organization-faqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ assign them to a team during the invite process.
2727
### Can I force my organization's members to authenticate before using Docker Desktop and are there any benefits?
2828

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

3232
Some benefits of enforcing sign-in are:
3333

34-
- 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).
34+
- 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).
3535
- Administrators can ensure compliance by blocking Docker Desktop usage for
3636
users who don't sign in as members of the organization.
3737

0 commit comments

Comments
 (0)