docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity

Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty

Browse Source 
add endpoint mode in service pretty
Upstream-commit: b322c8e506
Component: cli
This commit is contained in:
Vincent Demeester
2016-09-27 18:28:43 +02:00
committed by GitHub
parent c8b419cfef 64b2b3acec
commit 72959f648d
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/cli/command/formatter/service.go
View File

@@ -19,9 +19,9 @@ Labels:
{{- range $k, $v := .Labels }}
{{ $k }}{{if $v }}={{ $v }}{{ end }}
{{- end }}{{ end }}
Mode:
{{- if .IsModeGlobal }} Global
{{- else if .IsModeReplicated }} Replicated
Service Mode:
{{- if .IsModeGlobal }} Global
{{- else if .IsModeReplicated }} Replicated
{{- if .ModeReplicatedReplicas }}
Replicas: {{ .ModeReplicatedReplicas }}
{{- end }}{{ end }}
@@ -90,6 +90,7 @@ Resources:
{{- if .Networks }}
Networks:
{{- range $network := .Networks }} {{ $network }}{{ end }} {{ end }}
Endpoint Mode: {{ .EndpointMode }}
{{- if .Ports }}
Ports:
{{- range $port := .Ports }}
@@ -282,6 +283,14 @@ func (ctx *serviceInspectContext) Networks() []string {
return out
}
func (ctx *serviceInspectContext) EndpointMode() string {
if ctx.Service.Spec.EndpointSpec == nil {
return ""
}
return string(ctx.Service.Spec.EndpointSpec.Mode)
}
func (ctx *serviceInspectContext) Ports() []swarm.PortConfig {
return ctx.Service.Endpoint.Ports
}

4
components/cli/command/inspect/inspector.go
View File

@@ -122,7 +122,7 @@ func (i *TemplateInspector) tryRawInspectFallback(rawElement []byte) error {
return nil
}
// Flush write the result of inspecting all elements into the output stream.
// Flush writes the result of inspecting all elements into the output stream.
func (i *TemplateInspector) Flush() error {
if i.buffer.Len() == 0 {
_, err := io.WriteString(i.outputStream, "\n")
@@ -156,7 +156,7 @@ func (i *IndentedInspector) Inspect(typedElement interface{}, rawElement []byte)
return nil
}
// Flush write the result of inspecting all elements into the output stream.
// Flush writes the result of inspecting all elements into the output stream.
func (i *IndentedInspector) Flush() error {
if len(i.elements) == 0 && len(i.rawElements) == 0 {
_, err := io.WriteString(i.outputStream, "[]\n")