From 48084c86e5943888884644d8e2329555d0d741d7 Mon Sep 17 00:00:00 2001 From: Roberto Robles <51970655+Bobbypip@users.noreply.github.com> Date: Fri, 21 Feb 2025 14:55:48 -0600 Subject: [PATCH 1/5] Update develop.md Server port is incorrect, due this issue server cannot be available at http://localhost:8080/ --- content/guides/dotnet/develop.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/guides/dotnet/develop.md b/content/guides/dotnet/develop.md index accf7622723b..3c8ecf1ad581 100644 --- a/content/guides/dotnet/develop.md +++ b/content/guides/dotnet/develop.md @@ -92,7 +92,7 @@ services: context: . target: final ports: - - 8080:80 + - 8080:8080 depends_on: db: condition: service_healthy From a9efacad067e60aa3cc74fa8f890359aa595c496 Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Mon, 24 Feb 2025 01:34:38 -0800 Subject: [PATCH 2/5] fix image ref (#22069) ## Description Fix relative image path. https://deploy-preview-22069--docsdocker.netlify.app/desktop/features/gordon/#get-help-with-running-a-container ## Related issues or tickets ## Reviews - [ ] Editorial review Signed-off-by: Craig --- content/manuals/desktop/features/gordon/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/desktop/features/gordon/_index.md b/content/manuals/desktop/features/gordon/_index.md index 19812b36941b..ca4548f47cec 100644 --- a/content/manuals/desktop/features/gordon/_index.md +++ b/content/manuals/desktop/features/gordon/_index.md @@ -178,7 +178,7 @@ able to help you get set up: In the _Run a new container_ dialog that opens, you should see a message about **Ask Gordon**. -![Ask Gordon hint in Docker Desktop](../images/gordon-run-ctr.png) +![Ask Gordon hint in Docker Desktop](../../images/gordon-run-ctr.png) The linked text in the hint is a suggested prompt to start a conversation with Ask Gordon. From 4d9750207c477c6ab558282451d5e174314946e6 Mon Sep 17 00:00:00 2001 From: Marc PEREZ Date: Mon, 24 Feb 2025 10:37:48 +0100 Subject: [PATCH 3/5] fix typo in kubernetes rootless mode documentation (#22076) ## Description It bothered me ## Related issues or tickets ## Reviews - [ ] Technical review - [x] Editorial review - [ ] Product review --- content/manuals/build/builders/drivers/kubernetes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/build/builders/drivers/kubernetes.md b/content/manuals/build/builders/drivers/kubernetes.md index f15f83f9ebe0..115bb73cfd4a 100644 --- a/content/manuals/build/builders/drivers/kubernetes.md +++ b/content/manuals/build/builders/drivers/kubernetes.md @@ -246,7 +246,7 @@ that you want to support. ## Rootless mode The Kubernetes driver supports rootless mode. For more information on how -rootless mode works, and it's requirements, see +rootless mode works, and its requirements, see [here](https://github.com/moby/buildkit/blob/master/docs/rootless.md). To turn it on in your cluster, you can use the `rootless=true` driver option: From acb8d12b7b66e707fec56dbb1f5cd648f9bf7221 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:13:17 +0100 Subject: [PATCH 4/5] release-notes for Compose v2.33.1 version (#22077) ## Description Add release note for the latest `v2.33.1` release of Compose ## Related issues or tickets ## Reviews - [ ] Technical review - [x] Editorial review - [ ] Product review --------- Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- .../docs/reference/compose_alpha_publish.md | 4 +++- .../v2/docs/reference/compose_build.md | 8 +++---- .../compose/v2/docs/reference/compose_ls.md | 2 +- .../v2/docs/reference/compose_restart.md | 8 +++---- .../v2/docs/reference/compose_stats.md | 14 +++++------ .../docker_compose_alpha_publish.yaml | 23 ++++++++++++++++++- .../docs/reference/docker_compose_build.yaml | 4 ++-- .../v2/docs/reference/docker_compose_ls.yaml | 2 +- .../reference/docker_compose_restart.yaml | 4 ++-- .../docs/reference/docker_compose_stats.yaml | 2 +- _vendor/modules.txt | 2 +- .../manuals/compose/releases/release-notes.md | 14 +++++++++++ go.mod | 4 ++-- go.sum | 2 ++ hugo.yaml | 2 +- 15 files changed, 67 insertions(+), 28 deletions(-) diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md index 7fe79480ba9e..7d3655352323 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md @@ -8,8 +8,10 @@ Publish compose application | Name | Type | Default | Description | |:--------------------------|:---------|:--------|:-------------------------------------------------------------------------------| | `--dry-run` | `bool` | | Execute command in dry run mode | -| `--oci-version` | `string` | | OCI Image/Artifact specification version (automatically determined by default) | +| `--oci-version` | `string` | | OCI image/artifact specification version (automatically determined by default) | | `--resolve-image-digests` | `bool` | | Pin image tags to digests | +| `--with-env` | `bool` | | Include environment variables in the published OCI artifact | +| `-y`, `--y` | `bool` | | Assume "yes" as answer to all prompts | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md index eb05121a7dce..53150cdd8688 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md @@ -4,9 +4,9 @@ Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an -[image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, +[image](https://github.com/compose-spec/compose-spec/blob/main/spec.md#image) name, the image is tagged with that name, substituting any variables beforehand. See -[variable interpolation](https://github.com/compose-spec/compose-spec/blob/master/spec.md#interpolation). +[variable interpolation](https://github.com/compose-spec/compose-spec/blob/main/spec.md#interpolation). If you change a service's `Dockerfile` or the contents of its build directory, run `docker compose build` to rebuild it. @@ -34,9 +34,9 @@ run `docker compose build` to rebuild it. Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an -[image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, +[image](https://github.com/compose-spec/compose-spec/blob/main/spec.md#image) name, the image is tagged with that name, substituting any variables beforehand. See -[variable interpolation](https://github.com/compose-spec/compose-spec/blob/master/spec.md#interpolation). +[variable interpolation](https://github.com/compose-spec/compose-spec/blob/main/spec.md#interpolation). If you change a service's `Dockerfile` or the contents of its build directory, run `docker compose build` to rebuild it. diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_ls.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_ls.md index 754e91797113..7719d208609f 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_ls.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_ls.md @@ -11,7 +11,7 @@ Lists running Compose projects | `--dry-run` | `bool` | | Execute command in dry run mode | | `--filter` | `filter` | | Filter output based on conditions provided | | `--format` | `string` | `table` | Format the output. Values: [table \| json] | -| `-q`, `--quiet` | `bool` | | Only display IDs | +| `-q`, `--quiet` | `bool` | | Only display project names | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_restart.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_restart.md index e9bc161efd71..e57f346a81a2 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_restart.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_restart.md @@ -9,8 +9,8 @@ after a container is built, but before the container's command is executed) are after restarting. If you are looking to configure a service's restart policy, refer to -[restart](https://github.com/compose-spec/compose-spec/blob/master/spec.md#restart) -or [restart_policy](https://github.com/compose-spec/compose-spec/blob/master/deploy.md#restart_policy). +[restart](https://github.com/compose-spec/compose-spec/blob/main/spec.md#restart) +or [restart_policy](https://github.com/compose-spec/compose-spec/blob/main/deploy.md#restart_policy). ### Options @@ -33,5 +33,5 @@ after a container is built, but before the container's command is executed) are after restarting. If you are looking to configure a service's restart policy, refer to -[restart](https://github.com/compose-spec/compose-spec/blob/master/spec.md#restart) -or [restart_policy](https://github.com/compose-spec/compose-spec/blob/master/deploy.md#restart_policy). +[restart](https://github.com/compose-spec/compose-spec/blob/main/spec.md#restart) +or [restart_policy](https://github.com/compose-spec/compose-spec/blob/main/deploy.md#restart_policy). diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md index 43d8bbc33d7b..78d44b89350d 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md @@ -5,13 +5,13 @@ Display a live stream of container(s) resource usage statistics ### Options -| Name | Type | Default | Description | -|:--------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `-a`, `--all` | `bool` | | Show all containers (default shows just running) | -| `--dry-run` | `bool` | | Execute command in dry run mode | -| `--format` | `string` | | Format output using a custom template:
'table': Print output in table format with column headers (default)
'table TEMPLATE': Print output in table format using the given Go template
'json': Print in JSON format
'TEMPLATE': Print output using the given Go template.
Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates | -| `--no-stream` | `bool` | | Disable streaming stats and only pull the first result | -| `--no-trunc` | `bool` | | Do not truncate output | +| Name | Type | Default | Description | +|:--------------|:---------|:--------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `-a`, `--all` | `bool` | | Show all containers (default shows just running) | +| `--dry-run` | `bool` | | Execute command in dry run mode | +| `--format` | `string` | | Format output using a custom template:
'table': Print output in table format with column headers (default)
'table TEMPLATE': Print output in table format using the given Go template
'json': Print in JSON format
'TEMPLATE': Print output using the given Go template.
Refer to https://docs.docker.com/engine/cli/formatting/ for more information about formatting output with templates | +| `--no-stream` | `bool` | | Disable streaming stats and only pull the first result | +| `--no-trunc` | `bool` | | Do not truncate output | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml index 7a2da5ca92da..91600ac8b442 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml @@ -8,7 +8,7 @@ options: - option: oci-version value_type: string description: | - OCI Image/Artifact specification version (automatically determined by default) + OCI image/artifact specification version (automatically determined by default) deprecated: false hidden: false experimental: false @@ -25,6 +25,27 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: with-env + value_type: bool + default_value: "false" + description: Include environment variables in the published OCI artifact + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: "y" + shorthand: "y" + value_type: bool + default_value: "false" + description: Assume "yes" as answer to all prompts + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false inherited_options: - option: dry-run value_type: bool diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml index ade039dc4e34..92285de2efb3 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml @@ -4,9 +4,9 @@ long: |- Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an - [image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, + [image](https://github.com/compose-spec/compose-spec/blob/main/spec.md#image) name, the image is tagged with that name, substituting any variables beforehand. See - [variable interpolation](https://github.com/compose-spec/compose-spec/blob/master/spec.md#interpolation). + [variable interpolation](https://github.com/compose-spec/compose-spec/blob/main/spec.md#interpolation). If you change a service's `Dockerfile` or the contents of its build directory, run `docker compose build` to rebuild it. diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ls.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ls.yaml index a2efac2a88de..dd6418c652f1 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ls.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ls.yaml @@ -39,7 +39,7 @@ options: shorthand: q value_type: bool default_value: "false" - description: Only display IDs + description: Only display project names deprecated: false hidden: false experimental: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_restart.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_restart.yaml index 3b2a4bddd1b4..3bc0a3ad83ae 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_restart.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_restart.yaml @@ -9,8 +9,8 @@ long: |- after restarting. If you are looking to configure a service's restart policy, refer to - [restart](https://github.com/compose-spec/compose-spec/blob/master/spec.md#restart) - or [restart_policy](https://github.com/compose-spec/compose-spec/blob/master/deploy.md#restart_policy). + [restart](https://github.com/compose-spec/compose-spec/blob/main/spec.md#restart) + or [restart_policy](https://github.com/compose-spec/compose-spec/blob/main/deploy.md#restart_policy). usage: docker compose restart [OPTIONS] [SERVICE...] pname: docker compose plink: docker_compose.yaml diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml index cd8e801b321f..e6854b05a259 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml @@ -24,7 +24,7 @@ options: 'table TEMPLATE': Print output in table format using the given Go template 'json': Print in JSON format 'TEMPLATE': Print output using the given Go template. - Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates + Refer to https://docs.docker.com/engine/cli/formatting/ for more information about formatting output with templates deprecated: false hidden: false experimental: false diff --git a/_vendor/modules.txt b/_vendor/modules.txt index d8c188e02874..6da2aac2c315 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.20.0 # github.com/docker/buildx v0.21.1 # github.com/docker/cli v28.0.0+incompatible -# github.com/docker/compose/v2 v2.33.0 +# github.com/docker/compose/v2 v2.33.1 # github.com/docker/scout-cli v1.15.0 diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index 4a93a7da337e..fbba2e2fb30c 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,20 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.33.1 + +{{< release-date date="2025-02-21" >}} + +### Bug fixes and enhancements + +- Added support for `gw_priority`, `enable_ipv4` (requires Docker v28.0) +- Fixed an issue with the navigation menu +- Improved error message when using non-file secret/config with read-only service + +### Update + +- Dependencies upgrade: bump docker engine and cli to v28.0.0 + ## 2.33.0 {{< release-date date="2025-02-13" >}} diff --git a/go.mod b/go.mod index 30c234584772..5ce5d6150be3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 require ( github.com/docker/buildx v0.21.1 // indirect github.com/docker/cli v28.0.0+incompatible // indirect - github.com/docker/compose/v2 v2.33.0 // indirect + github.com/docker/compose/v2 v2.33.1 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.20.0 // indirect github.com/moby/moby v28.0.0+incompatible // indirect @@ -14,7 +14,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.21.1 github.com/docker/cli => github.com/docker/cli v28.0.0+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.33.1 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.20.0 github.com/moby/moby => github.com/moby/moby v28.0.0+incompatible diff --git a/go.sum b/go.sum index 1589598a0771..feb77944f585 100644 --- a/go.sum +++ b/go.sum @@ -209,6 +209,8 @@ github.com/docker/compose/v2 v2.32.3 h1:7KKVpTudYUrqs9GueTnJ+N6qnnzI2bqmANq6kXfm github.com/docker/compose/v2 v2.32.3/go.mod h1:fcK4rrf1bm8pfDsYdZIR+l4RSk9j6HVtBvJKGYyXsZ4= github.com/docker/compose/v2 v2.32.4 h1:h1I7GlJ1NCXKqM0nCVVsMrD/7TdIG48HNgRufcBF1KQ= github.com/docker/compose/v2 v2.32.4/go.mod h1:fcK4rrf1bm8pfDsYdZIR+l4RSk9j6HVtBvJKGYyXsZ4= +github.com/docker/compose/v2 v2.33.1 h1:i/V1gUpdbc4tMRfx30aYzw7oHKM8NGB2Oe4AUJUospw= +github.com/docker/compose/v2 v2.33.1/go.mod h1:TdDv/kdWOFrCWum5SVxVGVr+P9znSZepukHF1Dam25U= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= diff --git a/hugo.yaml b/hugo.yaml index 9c6ac5ea8c3c..64ae1a4bbd59 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -118,7 +118,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "27.5.1" # Latest Docker Compose version - compose_version: "v2.33.0" + compose_version: "v2.33.1" # Latest BuildKit version buildkit_version: "0.20.0" From 6f2acc99c1b2ba822462003264cd41f75bc0bbca Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 24 Feb 2025 10:47:08 +0000 Subject: [PATCH 5/5] gordon-beta-change (#22088) ## Description Removes link to Beta program which has ended ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- layouts/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index 04ee028ae60a..f72b1faae556 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -176,8 +176,6 @@

- Join the beta Read the docs