Skip to content

Commit 1d79ee2

Browse files
craig-osterhoutcraig-osterhout
authored
Merge pull request #22342 from docker/published-update
publish updates from main
2 parents edb0e0c + 256da1a commit 1d79ee2

File tree

9 files changed

+123
-13
lines changed

9 files changed

+123
-13
lines changed

‎content/get-started/_index.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ params:
2828
description: Get guided through a 45-minute workshop to learn about Docker.
2929
link: /get-started/workshop/
3030
icon: desk
31+
aliases:
32+
- /get-started/what-is-a-container
3133
---
3234

3335
If you're new to Docker, this section guides you through the essential resources to get started.

‎content/get-started/workshop/02_our_app.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ aliases:
1313
- /get-started/part2/
1414
- /get-started/02_our_app/
1515
- /guides/workshop/02_our_app/
16+
- /guides/walkthroughs/containerize-your-app/
1617
---
1718

1819
For the rest of this guide, you'll be working with a simple todo

‎content/manuals/build/ci/github-actions/_index.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,22 @@ The following GitHub Actions are available:
1717

1818
- [Build and push Docker images](https://github.com/marketplace/actions/build-and-push-docker-images):
1919
build and push Docker images with BuildKit.
20+
- [Docker Buildx Bake](https://github.com/marketplace/actions/docker-buildx-bake):
21+
enables using high-level builds with [Bake](../../bake/_index.md).
2022
- [Docker Login](https://github.com/marketplace/actions/docker-login):
2123
sign in to a Docker registry.
2224
- [Docker Setup Buildx](https://github.com/marketplace/actions/docker-setup-buildx):
23-
initiates a BuildKit builder.
25+
creates and boots a BuildKit builder.
2426
- [Docker Metadata action](https://github.com/marketplace/actions/docker-metadata-action):
25-
extracts metadata from Git reference and GitHub events.
27+
extracts metadata from Git reference and GitHub events to generate tags,
28+
labels, and annotations.
29+
- [Docker Setup Compose](https://github.com/marketplace/actions/docker-setup-compose):
30+
installs and sets up [Compose](../../../compose).
31+
- [Docker Setup Docker](https://github.com/marketplace/actions/docker-setup-docker):
32+
installs Docker CE.
2633
- [Docker Setup QEMU](https://github.com/marketplace/actions/docker-setup-qemu):
27-
installs [QEMU](https://github.com/qemu/qemu) static binaries for multi-arch
28-
builds.
29-
- [Docker Buildx Bake](https://github.com/marketplace/actions/docker-buildx-bake):
30-
enables using high-level builds with [Bake](../../bake/_index.md).
34+
installs [QEMU](https://github.com/qemu/qemu) static binaries for
35+
multi-platform builds.
3136
- [Docker Scout](https://github.com/docker/scout-action):
3237
analyze Docker images for security vulnerabilities.
3338

‎content/manuals/docker-hub/_index.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ grid:
3232
description: Find out about new features, improvements, and bug fixes.
3333
icon: note_add
3434
link: /docker-hub/release-notes
35+
aliases:
36+
- /docker-hub/overview/
3537
---
3638

3739
Docker Hub simplifies development with the world's largest container registry

‎content/manuals/docker-hub/repos/manage/trusted-content/_index.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ description: Learn how to manage and contribute to trusted content.
33
keywords: Docker Hub, Hub, trusted content
44
title: Trusted content
55
weight: 100
6+
aliases:
7+
- /trusted-content/
68
---
79

810
Docker's trusted content programs ensure that container images meet the highest

‎content/manuals/security/for-admins/access-tokens.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ description: Learn how to create and manage organization access tokens
44
to securely push and pull images programmatically.
55
keywords: docker hub, security, OAT, organization access token
66
linkTitle: Organization access tokens
7-
params:
8-
sidebar:
9-
badge:
10-
color: blue
11-
text: Beta
127
---
138

149
{{< summary-bar feature_name="OATs" >}}

‎content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
---
2+
description: Understand how to use the Desktop settings reporting dashboard
3+
keywords: Settings Management, docker desktop, hardened desktop, reporting, compliance
4+
title: Desktop settings reporting
5+
linkTitle: Desktop settings reporting
6+
weight: 30
7+
params:
8+
sidebar:
9+
badge:
10+
color: violet
11+
text: EA
12+
---
13+
14+
{{< summary-bar feature_name="Compliance reporting" >}}
15+
16+
Desktop settings reporting is a feature of Desktop Settings Management that
17+
tracks and reports user compliance with the settings policies that are assigned
18+
to them. This lets administrators track the application of settings and
19+
monitor what actions they need to take to make users compliant.
20+
21+
This guide provides steps for accessing Desktop settings reporting, viewing
22+
compliance status, and resolving non-compliant users.
23+
24+
## Access Desktop settings reporting
25+
26+
> [!IMPORTANT]
27+
>
28+
> Desktop settings reporting is in Early Access and is being rolled out
29+
> gradually. You may not see this setting in the Admin Console yet.
30+
31+
1. Sign in to the [Admin Console](https://app.docker.com/admin).
32+
2. Select your organization or company from the **Choose profile** page.
33+
3. Under Docker Desktop, select **Reporting**.
34+
35+
This opens the Desktop settings reporting page. From here you can:
36+
37+
- Use the **Search** field to search by username or email address
38+
- Filter by policies
39+
- Hide or un-hide compliant users
40+
- View a user’s compliance status and what policy is assigned to the user
41+
- Download a CSV file of user compliance information
42+
43+
## View compliance status
44+
45+
> [!WARNING]
46+
>
47+
> Users on Docker Desktop versions older than 4.40 may appear non-compliant
48+
> because older versions can't report compliance. To ensure accurate
49+
> compliance status, users must update to Docker Desktop version 4.40 and later.
50+
51+
1. Sign in to the [Admin Console](https://app.docker.com/admin).
52+
2. Select your organization or company from the **Choose profile** page.
53+
3. Under Docker Desktop, select **Reporting**. By default, non-compliant users
54+
are displayed.
55+
4. Optional. Select the **Hide compliant users** checkbox to show both compliant
56+
and non-compliant users.
57+
5. Use the **Search** field to search by username or email address.
58+
6. Hover over a user’s compliance status indicator to quickly view their status.
59+
7. Select a username to view more details about their compliance status, and for
60+
steps to resolve non-compliant users.
61+
62+
## Resolve compliance status
63+
64+
To resolve compliance status, you must view a user's compliance status details
65+
by selecting their username from the Desktop settings reporting page.
66+
These details include the following information:
67+
68+
- **Compliance status**: Indicates whether the user is compliant with the
69+
settings applied to them
70+
- **Domain status**: Indicates whether the user’s email address is associated
71+
with a verified domain
72+
- **Settings status**: Indicates whether the user has settings applied to them
73+
- **Resolution steps**: If a user is non-compliant, this provides information
74+
on how to resolve the user’s compliance status
75+
76+
### Compliant
77+
78+
When a user is compliant, a **Compliant** icon appears next to their name on the
79+
Desktop settings reporting dashboard. Select a compliant user to open their
80+
compliance status details. Compliant users have the following status details:
81+
82+
- **Compliance status**: Compliant
83+
- **Domain status**: Verified domain
84+
- **Settings status**: Compliant
85+
- **User is compliant** indicator
86+
87+
No resolution steps are needed for compliant users.
88+
89+
### Non-compliant
90+
91+
When a user is non-compliant, a **Non-compliant** or **Unknown** icon appears
92+
next to their name on the Desktop settings reporting dashboard. Non-compliant
93+
users must have their compliance status resolved:
94+
95+
1. Select a username from the Desktop settings reporting dashboard.
96+
2. On the compliance status details page, follow the resolution steps provided
97+
to resolve the compliance status.
98+
3. Refresh the page to ensure the resolution steps resolved the compliance
99+
status.

‎content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ keywords: admin, controls, rootless, enhanced container isolation
44
title: Configure Settings Management with a JSON file
55
linkTitle: Use a JSON file
66
weight: 10
7-
aliases:
7+
aliases:
88
- /desktop/hardened-desktop/settings-management/configure/
99
- /security/for-admins/hardened-desktop/settings-management/configure/
1010
---

‎data/summary.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ Cache backend API:
6262
Company:
6363
subscription: [Business]
6464
for: Administrators
65+
Compliance reporting:
66+
subscription: [Business]
67+
for: Administrators
68+
requires: Docker Desktop 4.40 and later
69+
availability: Early Access
6570
Compose attach:
6671
requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later
6772
Compose bridge:
@@ -188,7 +193,6 @@ MSI installer:
188193
for: Administrators
189194
OATs:
190195
subscription: [Team, Business]
191-
availability: Beta
192196
PKG installer:
193197
subscription: [Business]
194198
requires: Docker Desktop [4.36](/manuals/desktop/release-notes.md#4360) and later

0 commit comments

Comments
 (0)