From 7bbff2a2ee0a82228ad452aa0b2a7633426a433d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 28 Mar 2019 20:15:56 +0100 Subject: [PATCH] Update compose-version to 1.24.0 https://github.com/docker/compose/releases/tag/1.24.0 Signed-off-by: Sebastiaan van Stijn --- _config.yml | 2 +- _config_authoring.yml | 2 +- compose/reference/build.md | 2 +- compose/reference/config.md | 4 ++-- compose/reference/events.md | 4 ++-- compose/reference/images.md | 2 +- compose/reference/kill.md | 3 ++- compose/reference/logs.md | 10 +++++----- compose/reference/port.md | 6 +++--- compose/reference/ps.md | 5 ++++- compose/reference/pull.md | 4 ++-- compose/reference/restart.md | 3 ++- compose/reference/scale.md | 6 +++++- compose/reference/stop.md | 3 ++- 14 files changed, 33 insertions(+), 23 deletions(-) diff --git a/_config.yml b/_config.yml index 6da186d583..90fe613530 100644 --- a/_config.yml +++ b/_config.yml @@ -22,7 +22,7 @@ exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404. latest_engine_api_version: "1.39" docker_ce_version: "18.09" docker_ee_version: "18.09" -compose_version: "1.23.2" +compose_version: "1.24.0" machine_version: "0.16.0" distribution_version: "2.6" dtr_version: "2.6" diff --git a/_config_authoring.yml b/_config_authoring.yml index f95761ac42..03abb3e5db 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -22,7 +22,7 @@ url: https://docs.docker.com latest_engine_api_version: "1.39" docker_ce_version: "18.09" docker_ee_version: "18.09" -compose_version: "1.23.2" +compose_version: "1.24.0" machine_version: "0.16.0" distribution_version: "2.6" dtr_version: "2.6" diff --git a/compose/reference/build.md b/compose/reference/build.md index 0bac60a39d..8b229b788e 100644 --- a/compose/reference/build.md +++ b/compose/reference/build.md @@ -1,5 +1,5 @@ --- -description: docker-compose build +description: Build or rebuild services. keywords: fig, composition, compose, docker, orchestration, cli, build title: docker-compose build notoc: true diff --git a/compose/reference/config.md b/compose/reference/config.md index 56542663ab..f7bedd3426 100644 --- a/compose/reference/config.md +++ b/compose/reference/config.md @@ -5,12 +5,12 @@ title: docker-compose config notoc: true --- -```: +``` Usage: config [options] Options: --resolve-image-digests Pin image tags to digests. - -q, --quiet Only validate the configuration – do not print anything. + -q, --quiet Only validate the configuration, don't print anything. --services Print the service names, one per line. --volumes Print the volume names, one per line. --hash="*" Print the service config hash, one per line. diff --git a/compose/reference/events.md b/compose/reference/events.md index 1b5f1e420b..6d8106fb49 100644 --- a/compose/reference/events.md +++ b/compose/reference/events.md @@ -17,7 +17,7 @@ Stream container events for every container in the project. With the `--json` flag, a json object is printed one per line with the format: -``` +```json { "time": "2015-11-20T18:01:03.615550", "type": "container", @@ -26,7 +26,7 @@ format: "service": "web", "attributes": { "name": "application_web_1", - "image": "alpine:edge", + "image": "alpine:edge" } } ``` diff --git a/compose/reference/images.md b/compose/reference/images.md index b560ea9944..ee6e095c42 100644 --- a/compose/reference/images.md +++ b/compose/reference/images.md @@ -9,7 +9,7 @@ notoc: true Usage: images [options] [SERVICE...] Options: --q Only display image IDs + -q, --quiet Only display IDs ``` List images used by the created containers. diff --git a/compose/reference/kill.md b/compose/reference/kill.md index a72873d8b0..ecf06b5677 100644 --- a/compose/reference/kill.md +++ b/compose/reference/kill.md @@ -9,7 +9,8 @@ notoc: true Usage: kill [options] [SERVICE...] Options: --s SIGNAL SIGNAL to send to the container. Default signal is SIGKILL. + -s SIGNAL SIGNAL to send to the container. + Default signal is SIGKILL. ``` Forces running containers to stop by sending a `SIGKILL` signal. Optionally the diff --git a/compose/reference/logs.md b/compose/reference/logs.md index f74c123f5b..c54e1e9fb9 100644 --- a/compose/reference/logs.md +++ b/compose/reference/logs.md @@ -9,11 +9,11 @@ notoc: true Usage: logs [options] [SERVICE...] Options: ---no-color Produce monochrome output. --f, --follow Follow log output --t, --timestamps Show timestamps ---tail="all" Number of lines to show from the end of the logs - for each container. + --no-color Produce monochrome output. + -f, --follow Follow log output. + -t, --timestamps Show timestamps. + --tail="all" Number of lines to show from the end of the logs + for each container. ``` Displays log output from services. diff --git a/compose/reference/port.md b/compose/reference/port.md index 1892210b0a..38aaf38f56 100644 --- a/compose/reference/port.md +++ b/compose/reference/port.md @@ -9,9 +9,9 @@ notoc: true Usage: port [options] SERVICE PRIVATE_PORT Options: ---protocol=proto tcp or udp [default: tcp] ---index=index index of the container if there are multiple - instances of a service [default: 1] + --protocol=proto tcp or udp [default: tcp] + --index=index index of the container if there are multiple + instances of a service [default: 1] ``` Prints the public port for a port binding. diff --git a/compose/reference/ps.md b/compose/reference/ps.md index 302f961603..0dcca28466 100644 --- a/compose/reference/ps.md +++ b/compose/reference/ps.md @@ -9,7 +9,10 @@ notoc: true Usage: ps [options] [SERVICE...] Options: --q Only display IDs + -q, --quiet Only display IDs + --services Display services + --filter KEY=VAL Filter services by a property + -a, --all Show all stopped containers (including those created by the run command) ``` Lists containers. diff --git a/compose/reference/pull.md b/compose/reference/pull.md index 2fb5329277..d86d813a82 100644 --- a/compose/reference/pull.md +++ b/compose/reference/pull.md @@ -20,7 +20,7 @@ Pulls an image associated with a service defined in a `docker-compose.yml` or `d For example, suppose you have this `docker-compose.yml` file from the [Quickstart: Compose and Rails](/compose/rails.md) sample. -``` +```yaml version: '2' services: db: @@ -38,7 +38,7 @@ services: If you run `docker-compose pull ServiceName` in the same directory as the `docker-compose.yml` file that defines the service, Docker pulls the associated image. For example, to call the `postgres` image configured as the `db` service in our example, you would run `docker-compose pull db`. -``` +```bash $ docker-compose pull db Pulling db (postgres:latest)... latest: Pulling from library/postgres diff --git a/compose/reference/restart.md b/compose/reference/restart.md index e30094ba7b..8b361d4d3b 100644 --- a/compose/reference/restart.md +++ b/compose/reference/restart.md @@ -9,7 +9,8 @@ notoc: true Usage: restart [options] [SERVICE...] Options: --t, --timeout TIMEOUT Specify a shutdown timeout in seconds. (default: 10) + -t, --timeout TIMEOUT Specify a shutdown timeout in seconds. + (default: 10) ``` Restarts all stopped and running services. diff --git a/compose/reference/scale.md b/compose/reference/scale.md index bf553f872f..2b71bde9e5 100644 --- a/compose/reference/scale.md +++ b/compose/reference/scale.md @@ -11,7 +11,11 @@ notoc: true of `up` command. ``` -Usage: scale [SERVICE=NUM...] +Usage: scale [options] [SERVICE=NUM...] + +Options: + -t, --timeout TIMEOUT Specify a shutdown timeout in seconds. + (default: 10) ``` Sets the number of containers to run for a service. diff --git a/compose/reference/stop.md b/compose/reference/stop.md index 2da3ff2669..82e0a7a76b 100644 --- a/compose/reference/stop.md +++ b/compose/reference/stop.md @@ -9,7 +9,8 @@ notoc: true Usage: stop [options] [SERVICE...] Options: --t, --timeout TIMEOUT Specify a shutdown timeout in seconds (default: 10). + -t, --timeout TIMEOUT Specify a shutdown timeout in seconds. + (default: 10) ``` Stops running containers without removing them. They can be started again with