mirror of
https://github.com/docker/docs.git
synced 2026-11-04 10:01:00 +00:00
bump compose to version v5.6.0
Signed-off-by: Guillaume Lours <glours@users.noreply.github.com>
This commit is contained in:
43 files changed
+12739
-11972
No files matched your search
@@ -25,6 +25,7 @@ A self-sufficient runtime for containers.
|
||||
Options:
|
||||
--add-runtime runtime Register an additional OCI compatible runtime (default [])
|
||||
--allow-direct-routing Allow remote access to published ports on container IP addresses
|
||||
--apparmor-profile string Path to AppArmor profile template
|
||||
--authorization-plugin list Authorization plugins to load
|
||||
--bip string IPv4 address for the default bridge
|
||||
--bip6 string IPv6 address for the default bridge
|
||||
@@ -51,6 +52,7 @@ Options:
|
||||
--default-network-opt mapmap Default network options (default map[])
|
||||
--default-runtime string Default OCI runtime for containers (default "runc")
|
||||
--default-shm-size bytes Default shm size for containers (default 64MiB)
|
||||
--default-stop-timeout int Set the default container stop timeout in seconds (0 to terminate immediately) (default 10)
|
||||
--default-ulimit ulimit Default ulimits for containers (default [])
|
||||
--dns list DNS server to use
|
||||
--dns-opt list DNS options to use
|
||||
@@ -758,6 +760,18 @@ This only adds the proxy and authentication to the Docker daemon's requests.
|
||||
To use the proxy when building images and running containers, see
|
||||
[Configure Docker to use a proxy server](https://docs.docker.com/engine/cli/proxy/)
|
||||
|
||||
### Default container stop timeout
|
||||
|
||||
The `--default-stop-timeout` flag sets the number of seconds to wait for a
|
||||
container to stop when the container doesn't have a `--stop-timeout` configured.
|
||||
The default is `10` seconds on Linux and `30` seconds on Windows. A value of `0`
|
||||
doesn't wait before forcefully terminating the container. Negative values are
|
||||
invalid.
|
||||
|
||||
You can also configure the timeout with the `default-stop-timeout` option in the
|
||||
[daemon configuration file](#daemon-configuration-file). You can reload this
|
||||
option without restarting the daemon.
|
||||
|
||||
### Default `ulimit` settings
|
||||
|
||||
The `--default-ulimit` flag lets you set the default `ulimit` options to use for
|
||||
@@ -793,6 +807,24 @@ allow the request for it to complete.
|
||||
For information about how to create an authorization plugin, refer to the
|
||||
[authorization plugin](https://docs.docker.com/engine/extend/plugins_authorization/) section.
|
||||
|
||||
### Configure the default AppArmor profile
|
||||
|
||||
The `--apparmor-profile` option sets the path to an AppArmor profile definition
|
||||
for Docker's default `docker-default` container profile. This option is only
|
||||
supported on Linux hosts. The file can be a static profile or a Go template.
|
||||
|
||||
The equivalent `daemon.json` configuration is:
|
||||
|
||||
```json
|
||||
{
|
||||
"apparmor-profile": "/etc/docker/apparmor/docker-default"
|
||||
}
|
||||
```
|
||||
|
||||
Restart the daemon to apply changes. For template values, safe file placement,
|
||||
security considerations, and verification, see
|
||||
[Customize the default AppArmor profile](https://docs.docker.com/engine/security/apparmor/#customize-the-default-profile).
|
||||
|
||||
### Daemon user namespace options
|
||||
|
||||
The Linux kernel
|
||||
@@ -1066,6 +1098,7 @@ The following is a full example of the allowed configuration options on Linux:
|
||||
```json
|
||||
{
|
||||
"allow-direct-routing": false,
|
||||
"apparmor-profile": "",
|
||||
"authorization-plugins": [],
|
||||
"bip": "",
|
||||
"bip6": "",
|
||||
@@ -1104,6 +1137,7 @@ The following is a full example of the allowed configuration options on Linux:
|
||||
"default-network-opts": {},
|
||||
"default-runtime": "runc",
|
||||
"default-shm-size": "64M",
|
||||
"default-stop-timeout": 10,
|
||||
"default-ulimits": {
|
||||
"nofile": {
|
||||
"Hard": 64000,
|
||||
@@ -1225,6 +1259,7 @@ The following is a full example of the allowed configuration options on Windows:
|
||||
"debug": true,
|
||||
"default-network-opts": {},
|
||||
"default-runtime": "",
|
||||
"default-stop-timeout": 30,
|
||||
"default-ulimits": {},
|
||||
"dns": [],
|
||||
"dns-opts": [],
|
||||
@@ -1317,6 +1352,7 @@ The list of currently supported options that can be reconfigured is this:
|
||||
| `max-concurrent-uploads` | Configures the max concurrent uploads for each push. |
|
||||
| `max-download-attempts` | Configures the max download attempts for each pull. |
|
||||
| `default-runtime` | Configures the runtime to be used if not is specified at container creation. |
|
||||
| `default-stop-timeout` | Configures the timeout for stopping containers that have no container-specific timeout. |
|
||||
| `runtimes` | Configures the list of available OCI runtimes that can be used to run containers. |
|
||||
| `authorization-plugin` | Specifies the authorization plugins to use. |
|
||||
| `insecure-registries` | Specifies a list of registries that the daemon should consider insecure. |
|
||||
|
||||
@@ -28,7 +28,7 @@ Define and run multi-container applications with Docker
|
||||
| [`logs`](compose_logs.md) | View output from containers |
|
||||
| [`ls`](compose_ls.md) | List running compose projects |
|
||||
| [`pause`](compose_pause.md) | Pause services |
|
||||
| [`port`](compose_port.md) | Print the public port for a port binding |
|
||||
| [`port`](compose_port.md) | List port mappings or print the public port for a specific mapping for the service |
|
||||
| [`ps`](compose_ps.md) | List containers |
|
||||
| [`publish`](compose_publish.md) | Publish compose application |
|
||||
| [`pull`](compose_pull.md) | Pull service images |
|
||||
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
# docker compose alpha publish
|
||||
|
||||
<!---MARKER_GEN_START-->
|
||||
Publish compose application
|
||||
|
||||
### Options
|
||||
|
||||
| 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) |
|
||||
| `--resolve-image-digests` | `bool` | | Pin image tags to digests |
|
||||
| `--with-env` | `bool` | | Include environment variables in the published OCI artifact |
|
||||
| `-y`, `--yes` | `bool` | | Assume "yes" as answer to all prompts |
|
||||
|
||||
|
||||
<!---MARKER_GEN_END-->
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# docker compose port
|
||||
|
||||
<!---MARKER_GEN_START-->
|
||||
Prints the public port for a port binding
|
||||
List port mappings or print the public port for a specific mapping for the service
|
||||
|
||||
### Options
|
||||
|
||||
@@ -16,4 +16,4 @@ Prints the public port for a port binding
|
||||
|
||||
## Description
|
||||
|
||||
Prints the public port for a port binding
|
||||
List port mappings or print the public port for a specific mapping for the service
|
||||
-2
@@ -5,11 +5,9 @@ pname: docker compose
|
||||
plink: docker_compose.yaml
|
||||
cname:
|
||||
- docker compose alpha generate
|
||||
- docker compose alpha publish
|
||||
- docker compose alpha viz
|
||||
clink:
|
||||
- docker_compose_alpha_generate.yaml
|
||||
- docker_compose_alpha_publish.yaml
|
||||
- docker_compose_alpha_viz.yaml
|
||||
inherited_options:
|
||||
- option: dry-run
|
||||
|
||||
-86
@@ -1,86 +0,0 @@
|
||||
command: docker compose alpha publish
|
||||
short: Publish compose application
|
||||
long: Publish compose application
|
||||
usage: docker compose alpha publish [OPTIONS] REPOSITORY[:TAG]
|
||||
pname: docker compose alpha
|
||||
plink: docker_compose_alpha.yaml
|
||||
options:
|
||||
- option: app
|
||||
value_type: bool
|
||||
default_value: "false"
|
||||
description: Published compose application (includes referenced images)
|
||||
deprecated: false
|
||||
hidden: false
|
||||
experimental: false
|
||||
experimentalcli: false
|
||||
kubernetes: false
|
||||
swarm: false
|
||||
- option: insecure-registry
|
||||
value_type: bool
|
||||
default_value: "false"
|
||||
description: Use insecure registry
|
||||
deprecated: false
|
||||
hidden: true
|
||||
experimental: false
|
||||
experimentalcli: false
|
||||
kubernetes: false
|
||||
swarm: false
|
||||
- option: oci-version
|
||||
value_type: string
|
||||
description: |
|
||||
OCI image/artifact specification version (automatically determined by default)
|
||||
deprecated: false
|
||||
hidden: false
|
||||
experimental: false
|
||||
experimentalcli: false
|
||||
kubernetes: false
|
||||
swarm: false
|
||||
- option: resolve-image-digests
|
||||
value_type: bool
|
||||
default_value: "false"
|
||||
description: Pin image tags to digests
|
||||
deprecated: false
|
||||
hidden: false
|
||||
experimental: false
|
||||
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: "yes"
|
||||
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
|
||||
default_value: "false"
|
||||
description: Execute command in dry run mode
|
||||
deprecated: false
|
||||
hidden: false
|
||||
experimental: false
|
||||
experimentalcli: false
|
||||
kubernetes: false
|
||||
swarm: false
|
||||
deprecated: false
|
||||
hidden: true
|
||||
experimental: false
|
||||
experimentalcli: true
|
||||
kubernetes: false
|
||||
swarm: false
|
||||
|
||||
+5
-3
@@ -1,7 +1,9 @@
|
||||
command: docker compose port
|
||||
short: Print the public port for a port binding
|
||||
long: Prints the public port for a port binding
|
||||
usage: docker compose port [OPTIONS] SERVICE PRIVATE_PORT
|
||||
short: |
|
||||
List port mappings or print the public port for a specific mapping for the service
|
||||
long: |
|
||||
List port mappings or print the public port for a specific mapping for the service
|
||||
usage: docker compose port [OPTIONS] SERVICE [PRIVATE_PORT]
|
||||
pname: docker compose
|
||||
plink: docker_compose.yaml
|
||||
options:
|
||||
|
||||
+319
-294
File diff suppressed because it is too large.
Load diff
+328
-301
File diff suppressed because it is too large.
Load diff
+352
-325
File diff suppressed because it is too large.
Load diff
+358
-329
File diff suppressed because it is too large.
Load diff
+363
-334
File diff suppressed because it is too large.
Load diff
+391
-362
File diff suppressed because it is too large.
Load diff
+396
-367
File diff suppressed because it is too large.
Load diff
+395
-367
File diff suppressed because it is too large.
Load diff
+395
-367
File diff suppressed because it is too large.
Load diff
+395
-367
File diff suppressed because it is too large.
Load diff
+395
-367
File diff suppressed because it is too large.
Load diff
+395
-367
File diff suppressed because it is too large.
Load diff
+396
-368
File diff suppressed because it is too large.
Load diff
+396
-368
File diff suppressed because it is too large.
Load diff
+407
-386
File diff suppressed because it is too large.
Load diff
+408
-385
File diff suppressed because it is too large.
Load diff
+408
-385
File diff suppressed because it is too large.
Load diff
+413
-390
File diff suppressed because it is too large.
Load diff
+413
-390
File diff suppressed because it is too large.
Load diff
+414
-391
File diff suppressed because it is too large.
Load diff
+414
-391
File diff suppressed because it is too large.
Load diff
+414
-391
File diff suppressed because it is too large.
Load diff
+415
-392
File diff suppressed because it is too large.
Load diff
+418
-396
File diff suppressed because it is too large.
Load diff
+418
-396
File diff suppressed because it is too large.
Load diff
+408
-381
File diff suppressed because it is too large.
Load diff
+408
-381
File diff suppressed because it is too large.
Load diff
+408
-381
File diff suppressed because it is too large.
Load diff
+408
-381
File diff suppressed because it is too large.
Load diff
+408
-381
File diff suppressed because it is too large.
Load diff
+413
-386
File diff suppressed because it is too large.
Load diff
+413
-386
File diff suppressed because it is too large.
Load diff
Generated
+3
-3
@@ -1,7 +1,7 @@
|
||||
# github.com/moby/moby/api v1.56.0
|
||||
# github.com/moby/moby/api v1.56.1
|
||||
# github.com/moby/buildkit v0.33.1
|
||||
# github.com/docker/buildx v0.37.2
|
||||
# github.com/docker/cli v29.7.2+incompatible
|
||||
# github.com/docker/compose/v5 v5.5.1
|
||||
# github.com/docker/cli v29.8.2+incompatible
|
||||
# github.com/docker/compose/v5 v5.6.0
|
||||
# github.com/docker/model-runner v1.1.36
|
||||
# github.com/docker/docker-agent v1.126.0
|
||||
@@ -9,12 +9,12 @@ go 1.26.8
|
||||
// Make sure to add an entry in the "tools" section when adding a new repository.
|
||||
require (
|
||||
github.com/docker/buildx v0.37.2
|
||||
github.com/docker/cli v29.7.2+incompatible
|
||||
github.com/docker/compose/v5 v5.5.1
|
||||
github.com/docker/cli v29.8.2+incompatible
|
||||
github.com/docker/compose/v5 v5.6.0
|
||||
github.com/docker/docker-agent v1.126.0
|
||||
github.com/docker/model-runner v1.1.36
|
||||
github.com/moby/buildkit v0.33.1
|
||||
github.com/moby/moby/api v1.56.0
|
||||
github.com/moby/moby/api v1.56.1
|
||||
)
|
||||
|
||||
tool (
|
||||
|
||||
@@ -129,6 +129,8 @@ github.com/docker/cli v29.7.1+incompatible h1:ILZpP6B7fedIr6ANy824QkDp1WMJuouIq0
|
||||
github.com/docker/cli v29.7.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
|
||||
github.com/docker/cli v29.7.2+incompatible h1:dlkwallR8XqfeVnA2ELEhdwvb4lsSwuB4IgsG8Q9cLY=
|
||||
github.com/docker/cli v29.7.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
|
||||
github.com/docker/cli v29.8.2+incompatible h1:2zgdFuoFst2T80oS42vhKGxkd0JRo305eIEKTsxR7pQ=
|
||||
github.com/docker/cli v29.8.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
|
||||
github.com/docker/compose/v5 v5.0.0 h1:J2uMCzJ/5xLcoIVVXvMmPe6HBzVQpmJThKa7Qk7Xldc=
|
||||
github.com/docker/compose/v5 v5.0.0/go.mod h1:BurapGv8zmYnsbSmlpCz5EU2Pi3YFV/PjeUnoFpcw64=
|
||||
github.com/docker/compose/v5 v5.0.1 h1:5yCjDJbwUqcuI+6WNFHNWz2/3vyBDsNnfe8LlFjyxEc=
|
||||
@@ -151,6 +153,8 @@ github.com/docker/compose/v5 v5.5.0 h1:B5Eh5CtlbscCMlbyMydbEj3rpIuP9GthdD7PC0Isv
|
||||
github.com/docker/compose/v5 v5.5.0/go.mod h1:5yn5qs7G7V7OZc1Kkd6wLz72Le0C45xLNJQ7dgASvMk=
|
||||
github.com/docker/compose/v5 v5.5.1 h1:saWlMxB0tfQ+FVUlWGIUjLvR0jF5cfTU18KI5zKLD/M=
|
||||
github.com/docker/compose/v5 v5.5.1/go.mod h1:I1MDqH4C/vHlbaWcA6A9pKTOBx9vhtQO3hx3e45igDE=
|
||||
github.com/docker/compose/v5 v5.6.0 h1:WCDEV0D1CtZLyPdklHdEjFBnCStosBYkfsD3tvM/ITU=
|
||||
github.com/docker/compose/v5 v5.6.0/go.mod h1:NLnbMzshDO3QlhgzMxd9sm981O1yLjPybL1WGStUesI=
|
||||
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
|
||||
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||
github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
|
||||
@@ -333,6 +337,8 @@ github.com/moby/moby/api v1.55.0 h1:2/sexvQyqIWS8pRSCFddBfpW2qE7vR7FCL+vN8pxwMc=
|
||||
github.com/moby/moby/api v1.55.0/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs=
|
||||
github.com/moby/moby/api v1.56.0 h1:GQzua3NA599ASSIICx0iFgiJeO9YkdDARvQsm23ZZuQ=
|
||||
github.com/moby/moby/api v1.56.0/go.mod h1:sZ+THbVWkjOmBPPfbnzdD/G1LuIexWhqlSHHPTDQ1Uk=
|
||||
github.com/moby/moby/api v1.56.1 h1:PpWkvVPB7Fr/No8w+TfyJ/I6rWZ2YPZhT3JorIg+06c=
|
||||
github.com/moby/moby/api v1.56.1/go.mod h1:sZ+THbVWkjOmBPPfbnzdD/G1LuIexWhqlSHHPTDQ1Uk=
|
||||
github.com/moby/moby/client v0.2.1 h1:1Grh1552mvv6i+sYOdY+xKKVTvzJegcVMhuXocyDz/k=
|
||||
github.com/moby/moby/client v0.2.1/go.mod h1:O+/tw5d4a1Ha/ZA/tPxIZJapJRUS6LNZ1wiVRxYHyUE=
|
||||
github.com/moby/moby/client v0.2.2 h1:Pt4hRMCAIlyjL3cr8M5TrXCwKzguebPAc2do2ur7dEM=
|
||||
|
||||
@@ -179,7 +179,7 @@ params:
|
||||
# (Used to show e.g., "latest" and "latest"-1 in engine install examples
|
||||
docker_ce_version_prev: "29.8.1"
|
||||
# Latest Docker Compose version
|
||||
compose_version: "v5.5.0"
|
||||
compose_version: "v5.6.0"
|
||||
# Latest BuildKit version
|
||||
buildkit_version: "0.32.0"
|
||||
# Latest actions version
|
||||
|
||||
Reference in new issue
Block a user