This fix is an attempt to address https://github.com/docker/docker/pull/28213#issuecomment-273840405 Currently when specify table format with table `--format "table {{.ID}}..."`, the delimiter in the header section of the table is always `"\t"`. That is actually different from the content of the table as the delimiter could be anything (or even contatenated with `.`, for example): ``` $ docker service ps web --format 'table {{.Name}}.{{.ID}}' --no-trunc NAME ID web.1.inyhxhvjcijl0hdbu8lgrwwh7 \_ web.1.p9m4kx2srjqmfms4igam0uqlb ``` This fix is an attampt to address the skewness of the table when delimiter is not `"\t"`. The basic idea is that, when header consists of `table` key, the header section will be redendered the same way as content section. A map mapping each placeholder name to the HEADER entry name is used for the context of the header. Unit tests have been updated and added to cover the changes. This fix is related to #28313. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: ea61dac9e6d04879445f9c34729055ac1bb15050 Component: engine
244 lines
5.2 KiB
Go
244 lines
5.2 KiB
Go
package formatter
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/pkg/stringutils"
|
|
units "github.com/docker/go-units"
|
|
)
|
|
|
|
const (
|
|
defaultContainerTableFormat = "table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.RunningFor}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
|
|
|
|
containerIDHeader = "CONTAINER ID"
|
|
namesHeader = "NAMES"
|
|
commandHeader = "COMMAND"
|
|
runningForHeader = "CREATED"
|
|
statusHeader = "STATUS"
|
|
portsHeader = "PORTS"
|
|
mountsHeader = "MOUNTS"
|
|
localVolumes = "LOCAL VOLUMES"
|
|
networksHeader = "NETWORKS"
|
|
)
|
|
|
|
// NewContainerFormat returns a Format for rendering using a Context
|
|
func NewContainerFormat(source string, quiet bool, size bool) Format {
|
|
switch source {
|
|
case TableFormatKey:
|
|
if quiet {
|
|
return defaultQuietFormat
|
|
}
|
|
format := defaultContainerTableFormat
|
|
if size {
|
|
format += `\t{{.Size}}`
|
|
}
|
|
return Format(format)
|
|
case RawFormatKey:
|
|
if quiet {
|
|
return `container_id: {{.ID}}`
|
|
}
|
|
format := `container_id: {{.ID}}
|
|
image: {{.Image}}
|
|
command: {{.Command}}
|
|
created_at: {{.CreatedAt}}
|
|
status: {{- pad .Status 1 0}}
|
|
names: {{.Names}}
|
|
labels: {{- pad .Labels 1 0}}
|
|
ports: {{- pad .Ports 1 0}}
|
|
`
|
|
if size {
|
|
format += `size: {{.Size}}\n`
|
|
}
|
|
return Format(format)
|
|
}
|
|
return Format(source)
|
|
}
|
|
|
|
// ContainerWrite renders the context for a list of containers
|
|
func ContainerWrite(ctx Context, containers []types.Container) error {
|
|
render := func(format func(subContext subContext) error) error {
|
|
for _, container := range containers {
|
|
err := format(&containerContext{trunc: ctx.Trunc, c: container})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
return ctx.Write(newContainerContext(), render)
|
|
}
|
|
|
|
type containerHeaderContext map[string]string
|
|
|
|
func (c containerHeaderContext) Label(name string) string {
|
|
n := strings.Split(name, ".")
|
|
r := strings.NewReplacer("-", " ", "_", " ")
|
|
h := r.Replace(n[len(n)-1])
|
|
|
|
return h
|
|
}
|
|
|
|
type containerContext struct {
|
|
HeaderContext
|
|
trunc bool
|
|
c types.Container
|
|
}
|
|
|
|
func newContainerContext() *containerContext {
|
|
containerCtx := containerContext{}
|
|
containerCtx.header = containerHeaderContext{
|
|
"ID": containerIDHeader,
|
|
"Names": namesHeader,
|
|
"Image": imageHeader,
|
|
"Command": commandHeader,
|
|
"CreatedAt": createdAtHeader,
|
|
"RunningFor": runningForHeader,
|
|
"Ports": portsHeader,
|
|
"Status": statusHeader,
|
|
"Size": sizeHeader,
|
|
"Labels": labelsHeader,
|
|
"Mounts": mountsHeader,
|
|
"LocalVolumes": localVolumes,
|
|
"Networks": networksHeader,
|
|
}
|
|
return &containerCtx
|
|
}
|
|
|
|
func (c *containerContext) MarshalJSON() ([]byte, error) {
|
|
return marshalJSON(c)
|
|
}
|
|
|
|
func (c *containerContext) ID() string {
|
|
if c.trunc {
|
|
return stringid.TruncateID(c.c.ID)
|
|
}
|
|
return c.c.ID
|
|
}
|
|
|
|
func (c *containerContext) Names() string {
|
|
names := stripNamePrefix(c.c.Names)
|
|
if c.trunc {
|
|
for _, name := range names {
|
|
if len(strings.Split(name, "/")) == 1 {
|
|
names = []string{name}
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return strings.Join(names, ",")
|
|
}
|
|
|
|
func (c *containerContext) Image() string {
|
|
if c.c.Image == "" {
|
|
return "<no image>"
|
|
}
|
|
if c.trunc {
|
|
if trunc := stringid.TruncateID(c.c.ImageID); trunc == stringid.TruncateID(c.c.Image) {
|
|
return trunc
|
|
}
|
|
}
|
|
return c.c.Image
|
|
}
|
|
|
|
func (c *containerContext) Command() string {
|
|
command := c.c.Command
|
|
if c.trunc {
|
|
command = stringutils.Ellipsis(command, 20)
|
|
}
|
|
return strconv.Quote(command)
|
|
}
|
|
|
|
func (c *containerContext) CreatedAt() string {
|
|
return time.Unix(int64(c.c.Created), 0).String()
|
|
}
|
|
|
|
func (c *containerContext) RunningFor() string {
|
|
createdAt := time.Unix(int64(c.c.Created), 0)
|
|
return units.HumanDuration(time.Now().UTC().Sub(createdAt)) + " ago"
|
|
}
|
|
|
|
func (c *containerContext) Ports() string {
|
|
return api.DisplayablePorts(c.c.Ports)
|
|
}
|
|
|
|
func (c *containerContext) Status() string {
|
|
return c.c.Status
|
|
}
|
|
|
|
func (c *containerContext) Size() string {
|
|
srw := units.HumanSizeWithPrecision(float64(c.c.SizeRw), 3)
|
|
sv := units.HumanSizeWithPrecision(float64(c.c.SizeRootFs), 3)
|
|
|
|
sf := srw
|
|
if c.c.SizeRootFs > 0 {
|
|
sf = fmt.Sprintf("%s (virtual %s)", srw, sv)
|
|
}
|
|
return sf
|
|
}
|
|
|
|
func (c *containerContext) Labels() string {
|
|
if c.c.Labels == nil {
|
|
return ""
|
|
}
|
|
|
|
var joinLabels []string
|
|
for k, v := range c.c.Labels {
|
|
joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
|
|
}
|
|
return strings.Join(joinLabels, ",")
|
|
}
|
|
|
|
func (c *containerContext) Label(name string) string {
|
|
if c.c.Labels == nil {
|
|
return ""
|
|
}
|
|
return c.c.Labels[name]
|
|
}
|
|
|
|
func (c *containerContext) Mounts() string {
|
|
var name string
|
|
var mounts []string
|
|
for _, m := range c.c.Mounts {
|
|
if m.Name == "" {
|
|
name = m.Source
|
|
} else {
|
|
name = m.Name
|
|
}
|
|
if c.trunc {
|
|
name = stringutils.Ellipsis(name, 15)
|
|
}
|
|
mounts = append(mounts, name)
|
|
}
|
|
return strings.Join(mounts, ",")
|
|
}
|
|
|
|
func (c *containerContext) LocalVolumes() string {
|
|
count := 0
|
|
for _, m := range c.c.Mounts {
|
|
if m.Driver == "local" {
|
|
count++
|
|
}
|
|
}
|
|
|
|
return fmt.Sprintf("%d", count)
|
|
}
|
|
|
|
func (c *containerContext) Networks() string {
|
|
if c.c.NetworkSettings == nil {
|
|
return ""
|
|
}
|
|
|
|
networks := []string{}
|
|
for k := range c.c.NetworkSettings.Networks {
|
|
networks = append(networks, k)
|
|
}
|
|
|
|
return strings.Join(networks, ",")
|
|
}
|