diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md index ce6c214d0d62..09a4c69da9a6 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md @@ -43,6 +43,7 @@ Define and run multi-container applications with Docker | Name | Type | Default | Description | |:-----------------------|:--------------|:--------|:----------------------------------------------------------------------------------------------------| +| `--all-resources` | | | Include all resources, even those not used by services | | `--ansi` | `string` | `auto` | Control when to print ANSI control characters ("never"\|"always"\|"auto") | | `--compatibility` | | | Run compose in backward compatibility mode | | `--dry-run` | | | Execute command in dry run mode | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md index a34766c48433..382996395362 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md @@ -5,34 +5,35 @@ Create and start containers ### Options -| Name | Type | Default | Description | -|:-----------------------------|:--------------|:---------|:--------------------------------------------------------------------------------------------------------| -| `--abort-on-container-exit` | | | Stops all containers if any container was stopped. Incompatible with -d | -| `--always-recreate-deps` | | | Recreate dependent containers. Incompatible with --no-recreate. | -| `--attach` | `stringArray` | | Restrict attaching to the specified services. Incompatible with --attach-dependencies. | -| `--attach-dependencies` | | | Automatically attach to log output of dependent services | -| `--build` | | | Build images before starting containers | -| `-d`, `--detach` | | | Detached mode: Run containers in the background | -| `--dry-run` | | | Execute command in dry run mode | -| `--exit-code-from` | `string` | | Return the exit code of the selected service container. Implies --abort-on-container-exit | -| `--force-recreate` | | | Recreate containers even if their configuration and image haven't changed | -| `--no-attach` | `stringArray` | | Do not attach (stream logs) to the specified services | -| `--no-build` | | | Don't build an image, even if it's policy | -| `--no-color` | | | Produce monochrome output | -| `--no-deps` | | | Don't start linked services | -| `--no-log-prefix` | | | Don't print prefix in logs | -| `--no-recreate` | | | If containers already exist, don't recreate them. Incompatible with --force-recreate. | -| `--no-start` | | | Don't start the services after creating them | -| `--pull` | `string` | `policy` | Pull image before running ("always"\|"missing"\|"never") | -| `--quiet-pull` | | | Pull without printing progress information | -| `--remove-orphans` | | | Remove containers for services not defined in the Compose file | -| `-V`, `--renew-anon-volumes` | | | Recreate anonymous volumes instead of retrieving data from the previous containers | -| `--scale` | `stringArray` | | Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. | -| `-t`, `--timeout` | `int` | `0` | Use this timeout in seconds for container shutdown when attached or when containers are already running | -| `--timestamps` | | | Show timestamps | -| `--wait` | | | Wait for services to be running\|healthy. Implies detached mode. | -| `--wait-timeout` | `int` | `0` | Maximum duration to wait for the project to be running\|healthy | -| `-w`, `--watch` | | | Watch source code and rebuild/refresh containers when files are updated. | +| Name | Type | Default | Description | +|:-------------------------------|:--------------|:---------|:--------------------------------------------------------------------------------------------------------| +| `--abort-on-container-exit` | | | Stops all containers if any container was stopped. Incompatible with -d | +| `--abort-on-container-failure` | | | Stops all containers if any container exited with failure. Incompatible with -d | +| `--always-recreate-deps` | | | Recreate dependent containers. Incompatible with --no-recreate. | +| `--attach` | `stringArray` | | Restrict attaching to the specified services. Incompatible with --attach-dependencies. | +| `--attach-dependencies` | | | Automatically attach to log output of dependent services | +| `--build` | | | Build images before starting containers | +| `-d`, `--detach` | | | Detached mode: Run containers in the background | +| `--dry-run` | | | Execute command in dry run mode | +| `--exit-code-from` | `string` | | Return the exit code of the selected service container. Implies --abort-on-container-exit | +| `--force-recreate` | | | Recreate containers even if their configuration and image haven't changed | +| `--no-attach` | `stringArray` | | Do not attach (stream logs) to the specified services | +| `--no-build` | | | Don't build an image, even if it's policy | +| `--no-color` | | | Produce monochrome output | +| `--no-deps` | | | Don't start linked services | +| `--no-log-prefix` | | | Don't print prefix in logs | +| `--no-recreate` | | | If containers already exist, don't recreate them. Incompatible with --force-recreate. | +| `--no-start` | | | Don't start the services after creating them | +| `--pull` | `string` | `policy` | Pull image before running ("always"\|"missing"\|"never") | +| `--quiet-pull` | | | Pull without printing progress information | +| `--remove-orphans` | | | Remove containers for services not defined in the Compose file | +| `-V`, `--renew-anon-volumes` | | | Recreate anonymous volumes instead of retrieving data from the previous containers | +| `--scale` | `stringArray` | | Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. | +| `-t`, `--timeout` | `int` | `0` | Use this timeout in seconds for container shutdown when attached or when containers are already running | +| `--timestamps` | | | Show timestamps | +| `--wait` | | | Wait for services to be running\|healthy. Implies detached mode. | +| `--wait-timeout` | `int` | `0` | Maximum duration to wait for the project to be running\|healthy | +| `-w`, `--watch` | | | Watch source code and rebuild/refresh containers when files are updated. | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml index acdd3912610e..f725467df8d4 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml @@ -208,6 +208,16 @@ clink: - docker_compose_wait.yaml - docker_compose_watch.yaml options: + - option: all-resources + value_type: bool + default_value: "false" + description: Include all resources, even those not used by services + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: ansi value_type: string default_value: auto diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml index 967a16379f90..760a32da3323 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml @@ -35,6 +35,17 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: abort-on-container-failure + value_type: bool + default_value: "false" + description: | + Stops all containers if any container exited with failure. Incompatible with -d + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: always-recreate-deps value_type: bool default_value: "false" diff --git a/_vendor/modules.txt b/_vendor/modules.txt index cbfa0aac0dcb..9eef6544f7cb 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.13.1 # github.com/docker/buildx v0.14.0 # github.com/docker/cli v26.1.0+incompatible -# github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 +# github.com/docker/compose/v2 v2.27.0 # github.com/docker/scout-cli v1.7.0 diff --git a/content/compose/release-notes.md b/content/compose/release-notes.md index e8b9f04269b9..ed59bc1f49b1 100644 --- a/content/compose/release-notes.md +++ b/content/compose/release-notes.md @@ -12,7 +12,25 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). -## 2.26.0 +## 2.27.0 + +{{< release-date date="2024-04-24" >}} + +### Update + +- Dependencies upgrade: bump golang to 1.21.9 +- Dependencies upgrade: bump compose-go to v2.1.0 +- Dependencies upgrade: bump docker engine and cli to v26.1.0 + +### Bug fixes and enhancements + +- Introduced `--abort-on-container-failure` flag +- Introduced `--all-resources` to not exclude resources not used by services +- Introduced support for `build.entitlements` +- Fixed a bug so Docker Compose now ignores missing containers when `docker compose down/stop -p` is run +- Fixed support for `--flag=value` syntax in compatibility mode + +## 2.26.1 {{< release-date date="2024-03-29" >}} diff --git a/go.mod b/go.mod index 9f9bd8c5e666..f7872dd9e2c3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.1 require ( github.com/docker/buildx v0.14.0 // indirect github.com/docker/cli v26.1.0+incompatible // indirect - github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 // indirect + github.com/docker/compose/v2 v2.27.0 // indirect github.com/docker/scout-cli v1.7.0 // indirect github.com/moby/buildkit v0.13.1 // indirect github.com/moby/moby v26.1.0+incompatible // indirect @@ -16,7 +16,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.14.0 github.com/docker/cli => github.com/docker/cli v26.1.0+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.26.1 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.27.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.7.0 github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e github.com/moby/moby => github.com/moby/moby v26.1.0+incompatible diff --git a/go.sum b/go.sum index 0b845548cc4c..bc8bf40358f9 100644 --- a/go.sum +++ b/go.sum @@ -128,6 +128,8 @@ github.com/docker/compose/v2 v2.25.0 h1:UMCrWFItKdXXrlbxvA63V3aFb4Nr3zmlSY2GvJIq github.com/docker/compose/v2 v2.25.0/go.mod h1:M0PSYeTsp2ZEZJGhvzNTBtJeJRN7ZBGb4Ft1mUteTac= github.com/docker/compose/v2 v2.26.1 h1:27fAR5jVzNUYwY/9ppIjrPqGYLW5HtOTq2aYGBMCtA0= github.com/docker/compose/v2 v2.26.1/go.mod h1:5iVCMlr18ab0NlMxIPdtTgThTkzb34Z/zj15N7KSW+s= +github.com/docker/compose/v2 v2.27.0 h1:FKyClQdErCxUZULC2zo6Jn5ve+epFPe/Y0HaxjmUzNg= +github.com/docker/compose/v2 v2.27.0/go.mod h1:uaqwmY6haO8wXWHk+LAsqqDapX6boH4izRKqj/E7+Bo= 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 ab4a8aa01c68..d1af6445c29d 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -96,7 +96,7 @@ params: latest_engine_api_version: "1.45" docker_ce_version: "26.1.0" - compose_version: "v2.26.1" + compose_version: "v2.27.0" compose_file_v3: "3.8" compose_file_v2: "2.4" buildkit_version: "0.13.1"