mirror of https://github.com/docker/docs.git
Merge pull request #8544 from thaJeztah/compose_1.24
Update compose-version to 1.24.0
This commit is contained in:
commit
35204be6e2
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue