tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-01 19:04:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

This new field Named “Type” breaks VSCode extension for some strange reason, lets rename it ContextType

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-10-30 13:25:42 +01:00
parent 7cc3bc3870
commit c3cc54316b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/cmd/context/ls.go
View File

@ -111,7 +111,7 @@ func runList(cmd *cobra.Command, opts lsOpts) error {
} }
_, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\n", _, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\n",
contextName, contextName,
c.Type, c.ContextType,
c.Description, c.Description,
c.DockerEndpoint, c.DockerEndpoint,
c.KubernetesEndpoint, c.KubernetesEndpoint,
@ -144,7 +144,7 @@ type contextView struct {
Description string Description string
DockerEndpoint string DockerEndpoint string
KubernetesEndpoint string KubernetesEndpoint string
Type string ContextType string
Name string Name string
StackOrchestrator string StackOrchestrator string
} }
@ -158,7 +158,7 @@ func viewFromContextList(contextList []*store.DockerContext, currentContext stri
DockerEndpoint: getEndpoint("docker", c.Endpoints), DockerEndpoint: getEndpoint("docker", c.Endpoints),
KubernetesEndpoint: getEndpoint("kubernetes", c.Endpoints), KubernetesEndpoint: getEndpoint("kubernetes", c.Endpoints),
Name: c.Name, Name: c.Name,
Type: c.Type(), ContextType: c.Type(),
StackOrchestrator: c.Metadata.StackOrchestrator, StackOrchestrator: c.Metadata.StackOrchestrator,
} }
} }

2
tests/e2e/testdata/ls-out-json-windows.golden vendored
View File

@ -1 +1 @@
[{"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"npipe:////./pipe/docker_engine","KubernetesEndpoint":"","Type":"moby","Name":"default","StackOrchestrator":"swarm"}] [{"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"npipe:////./pipe/docker_engine","KubernetesEndpoint":"","ContextType":"moby","Name":"default","StackOrchestrator":"swarm"}]

2
tests/e2e/testdata/ls-out-json.golden vendored
View File

@ -1 +1 @@
[{"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"unix:///var/run/docker.sock","KubernetesEndpoint":"","Type":"moby","Name":"default","StackOrchestrator":"swarm"}] [{"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"unix:///var/run/docker.sock","KubernetesEndpoint":"","ContextType":"moby","Name":"default","StackOrchestrator":"swarm"}]

2
tests/e2e/testdata/ls-out-legacy-json-windows.golden vendored
View File

@ -1 +1 @@
{"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"npipe:////./pipe/docker_engine","KubernetesEndpoint":"","Type":"moby","Name":"default","StackOrchestrator":"swarm"} {"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"npipe:////./pipe/docker_engine","KubernetesEndpoint":"","ContextType":"moby","Name":"default","StackOrchestrator":"swarm"}

2
tests/e2e/testdata/ls-out-legacy-json.golden vendored
View File

@ -1 +1 @@
{"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"unix:///var/run/docker.sock","KubernetesEndpoint":"","Type":"moby","Name":"default","StackOrchestrator":"swarm"} {"Current":true,"Description":"Current DOCKER_HOST based configuration","DockerEndpoint":"unix:///var/run/docker.sock","KubernetesEndpoint":"","ContextType":"moby","Name":"default","StackOrchestrator":"swarm"}