diff --git a/cmd/buildah/config.go b/cmd/buildah/config.go index 3f66d08f281..8afe1d89696 100644 --- a/cmd/buildah/config.go +++ b/cmd/buildah/config.go @@ -36,15 +36,15 @@ var ( Usage: "`operating system` of the target image", }, cli.StringFlag{ - Name: "user", + Name: "user, u", Usage: "`user` to run containers based on image as", }, cli.StringSliceFlag{ - Name: "port", + Name: "port, p", Usage: "`port` to expose when running containers based on image", }, cli.StringSliceFlag{ - Name: "env", + Name: "env, e", Usage: "`environment variable` to set when running containers based on image", }, cli.StringFlag{ @@ -56,7 +56,7 @@ var ( Usage: "`command` for containers based on image", }, cli.StringSliceFlag{ - Name: "volume", + Name: "volume, v", Usage: "`volume` to create for containers based on image", }, cli.StringFlag{ @@ -64,11 +64,11 @@ var ( Usage: "working `directory` for containers based on image", }, cli.StringSliceFlag{ - Name: "label", + Name: "label, l", Usage: "image configuration `label` e.g. label=value", }, cli.StringSliceFlag{ - Name: "annotation", + Name: "annotation, a", Usage: "`annotation` e.g. annotation=value, for the target image", }, } diff --git a/cmd/buildah/list.go b/cmd/buildah/list.go index 393046520a0..d08961def8e 100644 --- a/cmd/buildah/list.go +++ b/cmd/buildah/list.go @@ -11,8 +11,12 @@ var ( // TODO implement listFlags = []cli.Flag{ cli.BoolFlag{ - Name: "quiet", - Usage: "omit column headings", + Name: "quiet, q", + Usage: "list only container image id's", + }, + cli.BoolFlag{ + Name: "noheading, n", + Usage: "do not print column headings", }, } listDescription = "Lists containers which appear to be " + buildah.Package + " working containers, their\n names and IDs, and the names and IDs of the images from which they were\n initialized" @@ -38,18 +42,27 @@ func listCmd(c *cli.Context) error { quiet = c.Bool("quiet") } + noheading := false + if c.IsSet("noheading") { + noheading = c.Bool("noheading") + } + builders, err := openBuilders(store) if err != nil { return fmt.Errorf("error reading build containers: %v", err) } - if len(builders) > 0 && !quiet { + if len(builders) > 0 && !noheading && !quiet { fmt.Printf("%-64s %-64s %-10s %s\n", "CONTAINER ID", "IMAGE ID", "IMAGE NAME", "CONTAINER NAME") } for _, builder := range builders { if builder.FromImage == "" { builder.FromImage = buildah.BaseImageFakeName } - fmt.Printf("%-64s %-64s %-10s %s\n", builder.ContainerID, builder.FromImageID, builder.FromImage, builder.Container) + if quiet { + fmt.Printf("%-64s\n", builder.ContainerID) + } else { + fmt.Printf("%-64s %-64s %-10s %s\n", builder.ContainerID, builder.FromImageID, builder.FromImage, builder.Container) + } } return nil