From f385cb994f11d5902283b0914c09515dfb0e25b4 Mon Sep 17 00:00:00 2001 From: Hossein Abbasi <16090309+hsnabszhdn@users.noreply.github.com> Date: Sat, 23 Aug 2025 15:54:56 +1000 Subject: [PATCH 1/3] docs: fix sentence structures in 'run.md' Signed-off-by: Hossein Abbasi <16090309+hsnabszhdn@users.noreply.github.com> (cherry picked from commit ba2c1c94abe626547b13b6c52c6d24186b2b97c5) Signed-off-by: Sebastiaan van Stijn --- docs/reference/run.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/run.md b/docs/reference/run.md index db06ad71f669..0733ad10aa8f 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -248,7 +248,7 @@ $ docker run -it --mount type=bind,source=[PATH],target=[PATH] busybox ``` In this case, the `--mount` flag takes three parameters. A type (`bind`), and -two paths. The `source` path is a the location on the host that you want to +two paths. The `source` path is the location on the host that you want to bind mount into the container. The `target` path is the mount destination inside the container. @@ -1087,7 +1087,7 @@ Additionally, you can set any environment variable in the container by using one or more `-e` flags. You can even override the variables mentioned above, or variables defined using a Dockerfile `ENV` instruction when building the image. -If the you name an environment variable without specifying a value, the current +If you name an environment variable without specifying a value, the current value of the named variable on the host is propagated into the container's environment: From c712d97172994675f69609193c9db648d944f706 Mon Sep 17 00:00:00 2001 From: Hossein Abbasi <16090309+hsnabszhdn@users.noreply.github.com> Date: Sat, 23 Aug 2025 16:14:53 +1000 Subject: [PATCH 2/3] docs: add missing backticks in 'run.md' Signed-off-by: Hossein Abbasi <16090309+hsnabszhdn@users.noreply.github.com> (cherry picked from commit d9cafa759f53d3c93a4f6dc771961113251653ea) Signed-off-by: Sebastiaan van Stijn --- docs/reference/run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/run.md b/docs/reference/run.md index 0733ad10aa8f..9c8b8baf0f25 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -419,7 +419,7 @@ $ docker run -it -m 300M ubuntu:24.04 /bin/bash We set memory limit only, this means the processes in the container can use 300M memory and 300M swap memory, by default, the total virtual memory size -(--memory-swap) will be set as double of memory, in this case, memory + swap +(`--memory-swap`) will be set as double of memory, in this case, memory + swap would be 2*300M, so processes can use 300M swap memory as well. ```console From 3b68cde77ac237297f825070bb0959519d3a30b1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 25 Aug 2025 09:51:48 +0200 Subject: [PATCH 3/3] cli/command/service: fix API annotations for generic resource flags These flags were added in 20a6ff32ee0edaa6b87a493871a9d5e05065e1e9, and require API version v1.32 or up, but they accidentally copied the flag-name from another flag, so were not setting the annotation correctly. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit dcc3d25dc27f8f0c1570d85c679947a29ac1c4c8) Signed-off-by: Sebastiaan van Stijn --- cli/command/service/update.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 2b75b6b59b18..5f9971adf287 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -112,9 +112,9 @@ func newUpdateCommand(dockerCLI command.Cli) *cobra.Command { // Add needs parsing, Remove only needs the key flags.Var(newListOptsVar(), flagGenericResourcesRemove, "Remove a Generic resource") - flags.SetAnnotation(flagHostAdd, "version", []string{"1.32"}) + flags.SetAnnotation(flagGenericResourcesRemove, "version", []string{"1.32"}) flags.Var(newListOptsVarWithValidator(ValidateSingleGenericResource), flagGenericResourcesAdd, "Add a Generic resource") - flags.SetAnnotation(flagHostAdd, "version", []string{"1.32"}) + flags.SetAnnotation(flagGenericResourcesAdd, "version", []string{"1.32"}) // TODO(thaJeztah): add completion for capabilities, stop-signal (currently non-exported in container package) // _ = cmd.RegisterFlagCompletionFunc(flagCapAdd, completeLinuxCapabilityNames)