truncate command by default, introduce --no-trunc flag to get the full command

ndeloof · ndeloof · commit 44d21280e7ce · 2023-09-23T06:34:26.000+02:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git 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
@@ -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:<br>'table':            Print output in table format with column headers (default)<br>'table TEMPLATE':   Print output in table format using the given Go template<br>'json':             Print in JSON format<br>'TEMPLATE':         Print output using the given Go template.<br>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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ type psOptions struct {`
`41`	`41`	`Services bool`
`42`	`42`	`Filter string`
`43`	`43`	`Status []string`
	`44`	`+ noTrunc bool`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`func (p *psOptions) parseFilter() error {`
`@@ -84,6 +85,7 @@ func psCommand(p ProjectOptions, dockerCli command.Cli, backend api.Service) c`
`84`	`85`	`flags.BoolVarP(&opts.Quiet, "quiet", "q", false, "Only display IDs")`
`85`	`86`	`flags.BoolVar(&opts.Services, "services", false, "Display services")`
`86`	`87`	`flags.BoolVarP(&opts.All, "all", "a", false, "Show all stopped containers (including those created by the run command)")`
	`88`	`+ flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")`
`87`	`89`	`return psCmd`
`88`	`90`	`}`
`89`	`91`
`@@ -145,6 +147,7 @@ func runPs(ctx context.Context, dockerCli command.Cli, backend api.Service, serv`
`145`	`147`	`containerCtx := cliformatter.Context{`
`146`	`148`	`Output: dockerCli.Out(),`
`147`	`149`	`Format: formatter.NewContainerFormat(opts.Format, opts.Quiet, false),`
	`150`	`+ Trunc: !opts.noTrunc,`
`148`	`151`	`}`
`149`	`152`	`return formatter.ContainerWrite(containerCtx, containers)`
`150`	`153`	`}`