summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_inspect_test.go
diff options
context:
space:
mode:
authorTonis Tiigi <tonistiigi@gmail.com>2016-12-12 15:05:53 -0800
committerTonis Tiigi <tonistiigi@gmail.com>2016-12-23 13:29:58 -0800
commit3d86b0c79b16334ce5836c0315e4c310b84c2e17 (patch)
tree72a96c9e5f584575126ecabe468e40a3aea4437b /integration-cli/docker_cli_inspect_test.go
parentd1dfc1a5ef95dc5621a07915f9786199442043c7 (diff)
downloaddocker-3d86b0c79b16334ce5836c0315e4c310b84c2e17.tar.gz
Implement content addressability for plugins
Move plugins to shared distribution stack with images. Create immutable plugin config that matches schema2 requirements. Ensure data being pushed is same as pulled/created. Store distribution artifacts in a blobstore. Run init layer setup for every plugin start. Fix breakouts from unsafe file accesses. Add support for `docker plugin install --alias` Uses normalized references for default names to avoid collisions when using default hosts/tags. Some refactoring of the plugin manager to support the change, like removing the singleton manager and adding manager config struct. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Diffstat (limited to 'integration-cli/docker_cli_inspect_test.go')
-rw-r--r--integration-cli/docker_cli_inspect_test.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go
index a2466a5a6a..fef870f5d2 100644
--- a/integration-cli/docker_cli_inspect_test.go
+++ b/integration-cli/docker_cli_inspect_test.go
@@ -425,20 +425,20 @@ func (s *DockerSuite) TestInspectPlugin(c *check.C) {
out, _, err := dockerCmdWithError("inspect", "--type", "plugin", "--format", "{{.Name}}", pNameWithTag)
c.Assert(err, checker.IsNil)
- c.Assert(strings.TrimSpace(out), checker.Equals, pName)
+ c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
out, _, err = dockerCmdWithError("inspect", "--format", "{{.Name}}", pNameWithTag)
c.Assert(err, checker.IsNil)
- c.Assert(strings.TrimSpace(out), checker.Equals, pName)
+ c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
// Even without tag the inspect still work
- out, _, err = dockerCmdWithError("inspect", "--type", "plugin", "--format", "{{.Name}}", pName)
+ out, _, err = dockerCmdWithError("inspect", "--type", "plugin", "--format", "{{.Name}}", pNameWithTag)
c.Assert(err, checker.IsNil)
- c.Assert(strings.TrimSpace(out), checker.Equals, pName)
+ c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
- out, _, err = dockerCmdWithError("inspect", "--format", "{{.Name}}", pName)
+ out, _, err = dockerCmdWithError("inspect", "--format", "{{.Name}}", pNameWithTag)
c.Assert(err, checker.IsNil)
- c.Assert(strings.TrimSpace(out), checker.Equals, pName)
+ c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
_, _, err = dockerCmdWithError("plugin", "disable", pNameWithTag)
c.Assert(err, checker.IsNil)