diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha.yaml index 43994d80cd..807097a387 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha.yaml @@ -6,11 +6,9 @@ plink: docker_compose.yaml cname: - docker compose alpha publish - docker compose alpha viz - - docker compose alpha watch clink: - docker_compose_alpha_publish.yaml - docker_compose_alpha_viz.yaml - - docker_compose_alpha_watch.yaml inherited_options: - option: dry-run value_type: bool diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 07a3a83cd0..f173ed8ef8 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ -# github.com/moby/buildkit v0.13.0-beta1.0.20240116143623-28ce478b1fde # github.com/moby/moby v24.0.8-0.20240109122856-854ca341c0f6+incompatible +# github.com/moby/buildkit v0.13.0-beta1.0.20240116143623-28ce478b1fde # github.com/docker/buildx v0.12.1 # github.com/docker/scout-cli v1.2.0 -# github.com/docker/cli v25.0.0-rc.1+incompatible -# github.com/docker/compose/v2 v2.24.0 +# github.com/docker/cli v25.0.0-rc.3+incompatible +# github.com/docker/compose/v2 v2.24.1 diff --git a/content/compose/release-notes.md b/content/compose/release-notes.md index 09a56b3f9a..62e3e0930a 100644 --- a/content/compose/release-notes.md +++ b/content/compose/release-notes.md @@ -11,6 +11,21 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.24.1 +{{< release-date date="2024-01-18" >}} + +### Update +- Dependencies upgrade: bump cli to 25.0.0-rc3 +- Dependencies upgrade: bump docker to 25.0.0-rc3 +- Dependencies upgrade: bump compose-go to 2.0.0-rc.1 +- Dependencies upgrade: bump containerd to 1.7.12 + +### Bug fixes and enhancements +Reworked the display of container status during `up` +Fixed the engine version required to use `healthcheck.start_interval` +Removed `watch` subcommand from the `alpha` command +Fixed a bug when handling received signals + ## 2.24.0 {{< release-date date="2024-01-11" >}} diff --git a/go.mod b/go.mod index 10ee3a115d..642a1ef664 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ toolchain go1.21.1 require ( github.com/docker/buildx v0.12.1 // indirect - github.com/docker/cli v25.0.0-rc.1+incompatible // indirect - github.com/docker/compose/v2 v2.24.0 // indirect + github.com/docker/cli v25.0.0-rc.3+incompatible // indirect + github.com/docker/compose/v2 v2.24.1 // indirect github.com/docker/scout-cli v1.2.0 // indirect github.com/moby/buildkit v0.13.0-beta1.0.20240116143623-28ce478b1fde // indirect github.com/moby/moby v24.0.8-0.20240109122856-854ca341c0f6+incompatible // indirect diff --git a/go.sum b/go.sum index 309d006501..d9ed2e2388 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,8 @@ github.com/docker/compose/v2 v2.23.3 h1:2p2biZqpUvPzC8J7nDl+ankVQNCCAk2IZJ4eg1S+ github.com/docker/compose/v2 v2.23.3/go.mod h1:lUweVMN13YR0a9M7qdKulTSMS1kYdAysYNJlFEnDMCw= github.com/docker/compose/v2 v2.24.0 h1:Gvmg3E5/Rqa4G340sYcUk/DIegT5Nod2ZV3MqR248j8= github.com/docker/compose/v2 v2.24.0/go.mod h1:sDypMTKq6Mrp0W5NZ6+uiqxR9zEukI1RVuFRqwBTljs= +github.com/docker/compose/v2 v2.24.1 h1:Mk14AOkxetMKrWb1bOnx7bEfS+v/moaCZnU69QqUw6A= +github.com/docker/compose/v2 v2.24.1/go.mod h1:rrqu0bPBN/HD2wRSNwVN+V9SDfhVQnKxF1DP9B9WOdI= 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/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q= diff --git a/hugo.yaml b/hugo.yaml index a088a6c668..5ba5f4df02 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -93,7 +93,7 @@ params: latest_engine_api_version: "1.43" docker_ce_version: "24.0.7" - compose_version: "v2.24.0" + compose_version: "v2.24.1" compose_file_v3: "3.8" compose_file_v2: "2.4" buildkit_version: "0.12.3"