Skip to content

Commit a10c4c6

Browse files
ndeloofndeloof
committed
restore --timeout flag renamed by mistake
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 6a37428 commit a10c4c6

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

‎cmd/compose/up.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func upCommand(p *ProjectOptions, streams api.Streams, backend api.Service) *cob
104104
flags.BoolVar(&up.noStart, "no-start", false, "Don't start the services after creating them.")
105105
flags.BoolVar(&up.cascadeStop, "abort-on-container-exit", false, "Stops all containers if any container was stopped. Incompatible with -d")
106106
flags.StringVar(&up.exitCodeFrom, "exit-code-from", "", "Return the exit code of the selected service container. Implies --abort-on-container-exit")
107-
flags.IntVarP(&create.timeout, "waitTimeout", "t", 10, "Use this waitTimeout in seconds for container shutdown when attached or when containers are already running.")
107+
flags.IntVarP(&create.timeout, "timeout", "t", 10, "Use this timeout in seconds for container shutdown when attached or when containers are already running.")
108108
flags.BoolVar(&up.timestamp, "timestamps", false, "Show timestamps.")
109109
flags.BoolVar(&up.noDeps, "no-deps", false, "Don't start linked services.")
110110
flags.BoolVar(&create.recreateDeps, "always-recreate-deps", false, "Recreate dependent containers. Incompatible with --no-recreate.")

‎docs/reference/compose_up.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ Create and start containers
55

66
### Options
77

8-
| Name | Type | Default | Description |
9-
|:-----------------------------|:--------------|:----------|:-------------------------------------------------------------------------------------------------------------|
10-
| `--abort-on-container-exit` | | | Stops all containers if any container was stopped. Incompatible with -d |
11-
| `--always-recreate-deps` | | | Recreate dependent containers. Incompatible with --no-recreate. |
12-
| `--attach` | `stringArray` | | Attach to service output. |
13-
| `--attach-dependencies` | | | Attach to dependent containers. |
14-
| `--build` | | | Build images before starting containers. |
15-
| `-d`, `--detach` | | | Detached mode: Run containers in the background |
16-
| `--exit-code-from` | `string` | | Return the exit code of the selected service container. Implies --abort-on-container-exit |
17-
| `--force-recreate` | | | Recreate containers even if their configuration and image haven't changed. |
18-
| `--no-attach` | `stringArray` | | Don't attach to specified service. |
19-
| `--no-build` | | | Don't build an image, even if it's missing. |
20-
| `--no-color` | | | Produce monochrome output. |
21-
| `--no-deps` | | | Don't start linked services. |
22-
| `--no-log-prefix` | | | Don't print prefix in logs. |
23-
| `--no-recreate` | | | If containers already exist, don't recreate them. Incompatible with --force-recreate. |
24-
| `--no-start` | | | Don't start the services after creating them. |
25-
| `--pull` | `string` | `missing` | Pull image before running ("always"\|"missing"\|"never") |
26-
| `--quiet-pull` | | | Pull without printing progress information. |
27-
| `--remove-orphans` | | | Remove containers for services not defined in the Compose file. |
28-
| `-V`, `--renew-anon-volumes` | | | Recreate anonymous volumes instead of retrieving data from the previous containers. |
29-
| `--scale` | `stringArray` | | Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. |
30-
| `--timestamps` | | | Show timestamps. |
31-
| `--wait` | | | Wait for services to be running\|healthy. Implies detached mode. |
32-
| `--wait-timeout` | `int` | `0` | timeout waiting for application to be running\|healthy. |
33-
| `-t`, `--waitTimeout` | `int` | `10` | Use this waitTimeout in seconds for container shutdown when attached or when containers are already running. |
8+
| Name | Type | Default | Description |
9+
|:-----------------------------|:--------------|:----------|:---------------------------------------------------------------------------------------------------------|
10+
| `--abort-on-container-exit` | | | Stops all containers if any container was stopped. Incompatible with -d |
11+
| `--always-recreate-deps` | | | Recreate dependent containers. Incompatible with --no-recreate. |
12+
| `--attach` | `stringArray` | | Attach to service output. |
13+
| `--attach-dependencies` | | | Attach to dependent containers. |
14+
| `--build` | | | Build images before starting containers. |
15+
| `-d`, `--detach` | | | Detached mode: Run containers in the background |
16+
| `--exit-code-from` | `string` | | Return the exit code of the selected service container. Implies --abort-on-container-exit |
17+
| `--force-recreate` | | | Recreate containers even if their configuration and image haven't changed. |
18+
| `--no-attach` | `stringArray` | | Don't attach to specified service. |
19+
| `--no-build` | | | Don't build an image, even if it's missing. |
20+
| `--no-color` | | | Produce monochrome output. |
21+
| `--no-deps` | | | Don't start linked services. |
22+
| `--no-log-prefix` | | | Don't print prefix in logs. |
23+
| `--no-recreate` | | | If containers already exist, don't recreate them. Incompatible with --force-recreate. |
24+
| `--no-start` | | | Don't start the services after creating them. |
25+
| `--pull` | `string` | `missing` | Pull image before running ("always"\|"missing"\|"never") |
26+
| `--quiet-pull` | | | Pull without printing progress information. |
27+
| `--remove-orphans` | | | Remove containers for services not defined in the Compose file. |
28+
| `-V`, `--renew-anon-volumes` | | | Recreate anonymous volumes instead of retrieving data from the previous containers. |
29+
| `--scale` | `stringArray` | | Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. |
30+
| `-t`, `--timeout` | `int` | `10` | Use this timeout in seconds for container shutdown when attached or when containers are already running. |
31+
| `--timestamps` | | | Show timestamps. |
32+
| `--wait` | | | Wait for services to be running\|healthy. Implies detached mode. |
33+
| `--wait-timeout` | `int` | `0` | timeout waiting for application to be running\|healthy. |
3434

3535

3636
<!---MARKER_GEN_END-->

‎docs/reference/docker_compose_up.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,18 @@ options:
231231
experimentalcli: false
232232
kubernetes: false
233233
swarm: false
234+
- option: timeout
235+
shorthand: t
236+
value_type: int
237+
default_value: "10"
238+
description: |
239+
Use this timeout in seconds for container shutdown when attached or when containers are already running.
240+
deprecated: false
241+
hidden: false
242+
experimental: false
243+
experimentalcli: false
244+
kubernetes: false
245+
swarm: false
234246
- option: timestamps
235247
value_type: bool
236248
default_value: "false"
@@ -261,18 +273,6 @@ options:
261273
experimentalcli: false
262274
kubernetes: false
263275
swarm: false
264-
- option: waitTimeout
265-
shorthand: t
266-
value_type: int
267-
default_value: "10"
268-
description: |
269-
Use this waitTimeout in seconds for container shutdown when attached or when containers are already running.
270-
deprecated: false
271-
hidden: false
272-
experimental: false
273-
experimentalcli: false
274-
kubernetes: false
275-
swarm: false
276276
deprecated: false
277277
experimental: false
278278
experimentalcli: false

‎pkg/compose/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (s *composeService) Build(ctx context.Context, project *types.Project, opti
5353
}, s.stderr())
5454
}
5555

56-
func (s *composeService) build(ctx context.Context, project *types.Project, options api.BuildOptions) (map[string]string, error) {
56+
func (s *composeService) build(ctx context.Context, project *types.Project, options api.BuildOptions) (map[string]string, error) { //nolint:gocyclo
5757
args := options.Args.Resolve(envResolver(project.Environment))
5858

5959
buildkitEnabled, err := s.dockerCli.BuildKitEnabled()

0 commit comments

Comments
 (0)