From 84cdf58e8aeaca82d09de16bb68e64d3cb405660 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 12 Jun 2020 15:09:16 +0200 Subject: [PATCH] =?UTF-8?q?default=20context=20type=20is=20=E2=80=9Cmoby?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- context/store/store.go | 3 ++- context/store/storedefault.go | 2 +- tests/e2e/testdata/ls-out-default-windows.golden | 2 +- tests/e2e/testdata/ls-out-default.golden | 2 +- tests/e2e/testdata/ls-out-test-docker-windows.golden | 4 ++-- tests/e2e/testdata/ls-out-test-docker.golden | 4 ++-- tests/e2e/testdata/ls-out-test-example-windows.golden | 2 +- tests/e2e/testdata/ls-out-test-example.golden | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/context/store/store.go b/context/store/store.go index 53355c0d..25c604dd 100644 --- a/context/store/store.go +++ b/context/store/store.go @@ -96,7 +96,8 @@ const ( // AciContextType is the endpoint key in the context endpoints for an ACI // backend AciContextType = "aci" - // LocalContextType is the endpoint key in the context endpoints for a new local backend + // LocalContextType is the endpoint key in the context endpoints for a new + // local backend LocalContextType = "local" // ExampleContextType is the endpoint key in the context endpoints for an // example backend diff --git a/context/store/storedefault.go b/context/store/storedefault.go index 95785c1f..b3e66337 100644 --- a/context/store/storedefault.go +++ b/context/store/storedefault.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" ) -const defaultContextType = "docker" +const defaultContextType = "moby" // Represents a context as created by the docker cli type defaultContext struct { diff --git a/tests/e2e/testdata/ls-out-default-windows.golden b/tests/e2e/testdata/ls-out-default-windows.golden index 19ebe37d..c01e0659 100644 --- a/tests/e2e/testdata/ls-out-default-windows.golden +++ b/tests/e2e/testdata/ls-out-default-windows.golden @@ -1,2 +1,2 @@ NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -default * docker Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm +default * moby Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm diff --git a/tests/e2e/testdata/ls-out-default.golden b/tests/e2e/testdata/ls-out-default.golden index 9e361fa7..838fc003 100644 --- a/tests/e2e/testdata/ls-out-default.golden +++ b/tests/e2e/testdata/ls-out-default.golden @@ -1,2 +1,2 @@ NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -default * docker Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm +default * moby Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm diff --git a/tests/e2e/testdata/ls-out-test-docker-windows.golden b/tests/e2e/testdata/ls-out-test-docker-windows.golden index 09bb66b6..5074d412 100644 --- a/tests/e2e/testdata/ls-out-test-docker-windows.golden +++ b/tests/e2e/testdata/ls-out-test-docker-windows.golden @@ -1,3 +1,3 @@ NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -default * docker Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm -test-docker docker npipe:////./pipe/docker_engine swarm +default * moby Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm +test-docker moby npipe:////./pipe/docker_engine swarm diff --git a/tests/e2e/testdata/ls-out-test-docker.golden b/tests/e2e/testdata/ls-out-test-docker.golden index 03718eac..b0c8e97a 100644 --- a/tests/e2e/testdata/ls-out-test-docker.golden +++ b/tests/e2e/testdata/ls-out-test-docker.golden @@ -1,3 +1,3 @@ NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -default * docker Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm -test-docker docker unix:///var/run/docker.sock swarm +default * moby Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm +test-docker moby unix:///var/run/docker.sock swarm diff --git a/tests/e2e/testdata/ls-out-test-example-windows.golden b/tests/e2e/testdata/ls-out-test-example-windows.golden index 1df1196f..95878b1a 100644 --- a/tests/e2e/testdata/ls-out-test-example-windows.golden +++ b/tests/e2e/testdata/ls-out-test-example-windows.golden @@ -1,3 +1,3 @@ NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -default docker Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm +default moby Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm test-example * example diff --git a/tests/e2e/testdata/ls-out-test-example.golden b/tests/e2e/testdata/ls-out-test-example.golden index 2508cb89..efdb5180 100644 --- a/tests/e2e/testdata/ls-out-test-example.golden +++ b/tests/e2e/testdata/ls-out-test-example.golden @@ -1,3 +1,3 @@ NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR -default docker Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm +default moby Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm test-example * example