From 0d5196d359d27fec766e42ac293734e6c0f4f01a Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Tue, 25 Feb 2025 08:01:08 -0800 Subject: [PATCH] Merge pull request #22094 from craig-osterhout/init-debug-callout desktop: update init and debug cli --- content/reference/cli/docker/debug.md | 2 ++ content/reference/cli/docker/init.md | 8 +------- data/debug-cli/docker_debug.yaml | 7 +------ data/init-cli/docker_init.yaml | 5 ++--- data/summary.yaml | 5 +++++ 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/content/reference/cli/docker/debug.md b/content/reference/cli/docker/debug.md index fa9dc52a52..669c8d4d0b 100644 --- a/content/reference/cli/docker/debug.md +++ b/content/reference/cli/docker/debug.md @@ -6,3 +6,5 @@ layout: cli aliases: - /engine/reference/commandline/debug/ --- + +{{< summary-bar feature_name="Docker Debug" >}} \ No newline at end of file diff --git a/content/reference/cli/docker/init.md b/content/reference/cli/docker/init.md index b67adaaeef..ca0f927946 100644 --- a/content/reference/cli/docker/init.md +++ b/content/reference/cli/docker/init.md @@ -7,10 +7,4 @@ aliases: - /engine/reference/commandline/init/ --- - +{{< summary-bar feature_name="Docker Init" >}} diff --git a/data/debug-cli/docker_debug.yaml b/data/debug-cli/docker_debug.yaml index a26d341a12..461376e436 100644 --- a/data/debug-cli/docker_debug.yaml +++ b/data/debug-cli/docker_debug.yaml @@ -1,11 +1,6 @@ command: docker debug short: Get a shell into any container or image. An alternative to debugging with `docker exec`. long: |- - > **Note** - > - > Docker Debug requires a [Pro, Team, or Business subcription](/subscription/details/). - > You must [sign in](/desktop/get-started/) to use this command. - Docker Debug is a CLI command that helps you follow best practices by keeping your images small and secure. With Docker Debug, you can debug your images while they contain the bare minimum to run your application. It does this by letting you create and work with slim images or containers that are often difficult to debug because all tools have been removed. @@ -27,7 +22,7 @@ long: |- - `entrypoint`: Print, lint, or run the entrypoint, see [example](#understanding-the-default-startup-command-of-a-container-entry-points). - `builtins`: Show custom builtin tools. - > **Note** + > [!NOTE] > > For images and stopped containers, all changes are discarded when leaving the shell. > At no point, do changes affect the actual image or container. diff --git a/data/init-cli/docker_init.yaml b/data/init-cli/docker_init.yaml index 49c968ca78..caf04c7902 100644 --- a/data/init-cli/docker_init.yaml +++ b/data/init-cli/docker_init.yaml @@ -16,12 +16,11 @@ long: |- init` can overwrite it, using `docker-compose.yaml` as the name for the Compose file. - > **Warning** + > [!WARNING] > > You can't recover overwritten files. > To back up an existing file before selecting to overwrite it, rename the file or copy it to another directory. - { .warning } - + After running `docker init`, you can choose one of the following templates: * ASP.NET Core: Suitable for an ASP.NET Core application. diff --git a/data/summary.yaml b/data/summary.yaml index 4bb31e99a5..2680206225 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -122,6 +122,9 @@ Docker CLI OpenTelemetry: requires: Docker Engine [26.1.0](/manuals/engine/release-notes/26.1.md#2610) and later docker compose alpha: availability: Experimental +Docker Debug: + subscription: [Pro, Team, Business] + requires: Docker Desktop [4.33.0](/manuals/desktop/release-notes.md#4330) and later Docker Desktop Archlinux: availability: Experimental Docker Desktop CLI: @@ -131,6 +134,8 @@ Docker Desktop CLI update: requires: Docker Desktop 4.38 and later Docker GitHub Copilot: availability: Early Access +Docker Init: + requires: Docker Desktop [4.27](/manuals/desktop/release-notes.md#4270) and later Docker Scout exceptions: availability: Experimental requires: Docker Scout CLI [1.15.0](/manuals/scout/release-notes/cli.md#1150) and later