From f7741d3b0809ecd6764e14ebdc05b28906b99166 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 1 Apr 2025 13:17:01 +0200 Subject: [PATCH 1/4] Merge pull request #22341 from crazy-max/gha-intro-update build: update github actions list --- .../manuals/build/ci/github-actions/_index.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/content/manuals/build/ci/github-actions/_index.md b/content/manuals/build/ci/github-actions/_index.md index 444bc3bc3f7e..4f80a110be52 100644 --- a/content/manuals/build/ci/github-actions/_index.md +++ b/content/manuals/build/ci/github-actions/_index.md @@ -17,17 +17,22 @@ The following GitHub Actions are available: - [Build and push Docker images](https://github.com/marketplace/actions/build-and-push-docker-images): build and push Docker images with BuildKit. +- [Docker Buildx Bake](https://github.com/marketplace/actions/docker-buildx-bake): + enables using high-level builds with [Bake](../../bake/_index.md). - [Docker Login](https://github.com/marketplace/actions/docker-login): sign in to a Docker registry. - [Docker Setup Buildx](https://github.com/marketplace/actions/docker-setup-buildx): - initiates a BuildKit builder. + creates and boots a BuildKit builder. - [Docker Metadata action](https://github.com/marketplace/actions/docker-metadata-action): - extracts metadata from Git reference and GitHub events. + extracts metadata from Git reference and GitHub events to generate tags, + labels, and annotations. +- [Docker Setup Compose](https://github.com/marketplace/actions/docker-setup-compose): + installs and sets up [Compose](../../../compose). +- [Docker Setup Docker](https://github.com/marketplace/actions/docker-setup-docker): + installs Docker CE. - [Docker Setup QEMU](https://github.com/marketplace/actions/docker-setup-qemu): - installs [QEMU](https://github.com/qemu/qemu) static binaries for multi-arch - builds. -- [Docker Buildx Bake](https://github.com/marketplace/actions/docker-buildx-bake): - enables using high-level builds with [Bake](../../bake/_index.md). + installs [QEMU](https://github.com/qemu/qemu) static binaries for + multi-platform builds. - [Docker Scout](https://github.com/docker/scout-action): analyze Docker images for security vulnerabilities. From 8d57252d2e8ec9dc372229200ce4f98f2e0157c6 Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Tue, 1 Apr 2025 07:58:39 -0700 Subject: [PATCH 2/4] add some aliases (#22337) ## Description Added some aliases for Hub and get-started content ## Related issues or tickets ENGDOCS-2514 ## Reviews - [ ] Editorial review Signed-off-by: Craig --- content/get-started/_index.md | 2 ++ content/get-started/workshop/02_our_app.md | 1 + content/manuals/docker-hub/_index.md | 2 ++ .../manuals/docker-hub/repos/manage/trusted-content/_index.md | 2 ++ 4 files changed, 7 insertions(+) diff --git a/content/get-started/_index.md b/content/get-started/_index.md index e577696978b4..c4ffafafcd1d 100644 --- a/content/get-started/_index.md +++ b/content/get-started/_index.md @@ -28,6 +28,8 @@ params: description: Get guided through a 45-minute workshop to learn about Docker. link: /get-started/workshop/ icon: desk +aliases: + - /get-started/what-is-a-container --- If you're new to Docker, this section guides you through the essential resources to get started. diff --git a/content/get-started/workshop/02_our_app.md b/content/get-started/workshop/02_our_app.md index 9d05ba5fc112..563871f9c233 100644 --- a/content/get-started/workshop/02_our_app.md +++ b/content/get-started/workshop/02_our_app.md @@ -13,6 +13,7 @@ aliases: - /get-started/part2/ - /get-started/02_our_app/ - /guides/workshop/02_our_app/ + - /guides/walkthroughs/containerize-your-app/ --- For the rest of this guide, you'll be working with a simple todo diff --git a/content/manuals/docker-hub/_index.md b/content/manuals/docker-hub/_index.md index f1da3b3f5b72..71f8c076729d 100644 --- a/content/manuals/docker-hub/_index.md +++ b/content/manuals/docker-hub/_index.md @@ -32,6 +32,8 @@ grid: description: Find out about new features, improvements, and bug fixes. icon: note_add link: /docker-hub/release-notes +aliases: + - /docker-hub/overview/ --- Docker Hub simplifies development with the world's largest container registry diff --git a/content/manuals/docker-hub/repos/manage/trusted-content/_index.md b/content/manuals/docker-hub/repos/manage/trusted-content/_index.md index 3b29c8873da4..0ae04840e94a 100644 --- a/content/manuals/docker-hub/repos/manage/trusted-content/_index.md +++ b/content/manuals/docker-hub/repos/manage/trusted-content/_index.md @@ -3,6 +3,8 @@ description: Learn how to manage and contribute to trusted content. keywords: Docker Hub, Hub, trusted content title: Trusted content weight: 100 +aliases: + - /trusted-content/ --- Docker's trusted content programs ensure that container images meet the highest From 805cc31708fc15286f24ac1e3a495c7de749b011 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Tue, 1 Apr 2025 17:58:28 +0100 Subject: [PATCH 3/4] remove beta from oat (#22344) ## Description OAT is going GA today https://docker.slack.com/archives/C046HE6K4CC/p1743524473234929 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/security/for-admins/access-tokens.md | 5 ----- data/summary.yaml | 1 - 2 files changed, 6 deletions(-) diff --git a/content/manuals/security/for-admins/access-tokens.md b/content/manuals/security/for-admins/access-tokens.md index 2e2d0c93afd5..b5f028f66d0a 100644 --- a/content/manuals/security/for-admins/access-tokens.md +++ b/content/manuals/security/for-admins/access-tokens.md @@ -4,11 +4,6 @@ description: Learn how to create and manage organization access tokens to securely push and pull images programmatically. keywords: docker hub, security, OAT, organization access token linkTitle: Organization access tokens -params: - sidebar: - badge: - color: blue - text: Beta --- {{< summary-bar feature_name="OATs" >}} diff --git a/data/summary.yaml b/data/summary.yaml index 545243c14266..0694cb5a9d77 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -188,7 +188,6 @@ MSI installer: for: Administrators OATs: subscription: [Team, Business] - availability: Beta PKG installer: subscription: [Business] requires: Docker Desktop [4.36](/manuals/desktop/release-notes.md#4360) and later From 256da1adec25b35787116237174a001ad11cdd4d Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Tue, 1 Apr 2025 14:26:01 -0400 Subject: [PATCH 4/4] cx: desktop settings reporting (#21646) ## Description - Added guide on desktop settings reporting NOTE: To go out with DD 4.40 release in EA ## Related issues or tickets [ENGDOCS-2346](https://docker.atlassian.net/browse/ENGDOCS-2346) ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review [ENGDOCS-2346]: https://docker.atlassian.net/browse/ENGDOCS-2346?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- .../compliance-reporting.md | 99 +++++++++++++++++++ .../configure-json-file.md | 2 +- data/summary.yaml | 5 + 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md new file mode 100644 index 000000000000..c556b435fe21 --- /dev/null +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/compliance-reporting.md @@ -0,0 +1,99 @@ +--- +description: Understand how to use the Desktop settings reporting dashboard +keywords: Settings Management, docker desktop, hardened desktop, reporting, compliance +title: Desktop settings reporting +linkTitle: Desktop settings reporting +weight: 30 +params: + sidebar: + badge: + color: violet + text: EA +--- + +{{< summary-bar feature_name="Compliance reporting" >}} + +Desktop settings reporting is a feature of Desktop Settings Management that +tracks and reports user compliance with the settings policies that are assigned +to them. This lets administrators track the application of settings and +monitor what actions they need to take to make users compliant. + +This guide provides steps for accessing Desktop settings reporting, viewing +compliance status, and resolving non-compliant users. + +## Access Desktop settings reporting + +> [!IMPORTANT] +> +> Desktop settings reporting is in Early Access and is being rolled out +> gradually. You may not see this setting in the Admin Console yet. + +1. Sign in to the [Admin Console](https://app.docker.com/admin). +2. Select your organization or company from the **Choose profile** page. +3. Under Docker Desktop, select **Reporting**. + +This opens the Desktop settings reporting page. From here you can: + +- Use the **Search** field to search by username or email address +- Filter by policies +- Hide or un-hide compliant users +- View a user’s compliance status and what policy is assigned to the user +- Download a CSV file of user compliance information + +## View compliance status + +> [!WARNING] +> +> Users on Docker Desktop versions older than 4.40 may appear non-compliant +> because older versions can't report compliance. To ensure accurate +> compliance status, users must update to Docker Desktop version 4.40 and later. + +1. Sign in to the [Admin Console](https://app.docker.com/admin). +2. Select your organization or company from the **Choose profile** page. +3. Under Docker Desktop, select **Reporting**. By default, non-compliant users +are displayed. +4. Optional. Select the **Hide compliant users** checkbox to show both compliant +and non-compliant users. +5. Use the **Search** field to search by username or email address. +6. Hover over a user’s compliance status indicator to quickly view their status. +7. Select a username to view more details about their compliance status, and for +steps to resolve non-compliant users. + +## Resolve compliance status + +To resolve compliance status, you must view a user's compliance status details +by selecting their username from the Desktop settings reporting page. +These details include the following information: + +- **Compliance status**: Indicates whether the user is compliant with the +settings applied to them +- **Domain status**: Indicates whether the user’s email address is associated +with a verified domain +- **Settings status**: Indicates whether the user has settings applied to them +- **Resolution steps**: If a user is non-compliant, this provides information +on how to resolve the user’s compliance status + +### Compliant + +When a user is compliant, a **Compliant** icon appears next to their name on the +Desktop settings reporting dashboard. Select a compliant user to open their +compliance status details. Compliant users have the following status details: + +- **Compliance status**: Compliant +- **Domain status**: Verified domain +- **Settings status**: Compliant +- **User is compliant** indicator + +No resolution steps are needed for compliant users. + +### Non-compliant + +When a user is non-compliant, a **Non-compliant** or **Unknown** icon appears +next to their name on the Desktop settings reporting dashboard. Non-compliant +users must have their compliance status resolved: + +1. Select a username from the Desktop settings reporting dashboard. +2. On the compliance status details page, follow the resolution steps provided +to resolve the compliance status. +3. Refresh the page to ensure the resolution steps resolved the compliance +status. diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md index db391e0b58eb..3fdcf7b0054d 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md @@ -4,7 +4,7 @@ keywords: admin, controls, rootless, enhanced container isolation title: Configure Settings Management with a JSON file linkTitle: Use a JSON file weight: 10 -aliases: +aliases: - /desktop/hardened-desktop/settings-management/configure/ - /security/for-admins/hardened-desktop/settings-management/configure/ --- diff --git a/data/summary.yaml b/data/summary.yaml index 0694cb5a9d77..fe53413d5359 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -62,6 +62,11 @@ Cache backend API: Company: subscription: [Business] for: Administrators +Compliance reporting: + subscription: [Business] + for: Administrators + requires: Docker Desktop 4.40 and later + availability: Early Access Compose attach: requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later Compose bridge: