diff --git a/cmd/compose/ps.go b/cmd/compose/ps.go index e1b448745..ad7c5cd26 100644 --- a/cmd/compose/ps.go +++ b/cmd/compose/ps.go @@ -41,6 +41,7 @@ type psOptions struct { Services bool Filter string Status []string + noTrunc bool } func (p *psOptions) parseFilter() error { @@ -84,6 +85,7 @@ func psCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *c flags.BoolVarP(&opts.Quiet, "quiet", "q", false, "Only display IDs") flags.BoolVar(&opts.Services, "services", false, "Display services") flags.BoolVarP(&opts.All, "all", "a", false, "Show all stopped containers (including those created by the run command)") + flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output") return psCmd } @@ -145,6 +147,7 @@ func runPs(ctx context.Context, dockerCli command.Cli, backend api.Service, serv containerCtx := cliformatter.Context{ Output: dockerCli.Out(), Format: formatter.NewContainerFormat(opts.Format, opts.Quiet, false), + Trunc: !opts.noTrunc, } return formatter.ContainerWrite(containerCtx, containers) } diff --git a/docs/reference/compose_ps.md b/docs/reference/compose_ps.md index 15c7b1b69..401ec7a28 100644 --- a/docs/reference/compose_ps.md +++ b/docs/reference/compose_ps.md @@ -11,6 +11,7 @@ List containers | `--dry-run` | | | Execute command in dry run mode | | [`--filter`](#filter) | `string` | | Filter services by a property (supported filters: status). | | [`--format`](#format) | `string` | `table` | Format output using a custom template:
'table': Print output in table format with column headers (default)
'table TEMPLATE': Print output in table format using the given Go template
'json': Print in JSON format
'TEMPLATE': Print output using the given Go template.
Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates | +| `--no-trunc` | | | Don't truncate output | | `-q`, `--quiet` | | | Only display IDs | | `--services` | | | Display services | | [`--status`](#status) | `stringArray` | | Filter services by status. Values: [paused \| restarting \| removing \| running \| dead \| created \| exited] | diff --git a/docs/reference/docker_compose_ps.yaml b/docs/reference/docker_compose_ps.yaml index d51d0ac96..7525fcdb0 100644 --- a/docs/reference/docker_compose_ps.yaml +++ b/docs/reference/docker_compose_ps.yaml @@ -60,6 +60,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: no-trunc + value_type: bool + default_value: "false" + description: Don't truncate output + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: quiet shorthand: q value_type: bool