From 851cbff030acac42bd1a358bd128cc47f1707161 Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 2 Sep 2015 14:31:15 -0700 Subject: [PATCH] Windows: Fix golint daemon breaking commit Signed-off-by: John Howard Upstream-commit: cfddca2bf90764757a436720361cda674071ba4f Component: engine --- components/engine/daemon/commit.go | 2 +- components/engine/daemon/container_unix.go | 17 ----------------- components/engine/daemon/container_windows.go | 9 --------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/components/engine/daemon/commit.go b/components/engine/daemon/commit.go index 78870abcee..62c9a458f4 100644 --- a/components/engine/daemon/commit.go +++ b/components/engine/daemon/commit.go @@ -24,7 +24,7 @@ func (daemon *Daemon) Commit(container *Container, c *ContainerCommitConfig) (*i defer container.unpause() } - rwTar, err := container.exportRw() + rwTar, err := container.exportContainerRw() if err != nil { return nil, err } diff --git a/components/engine/daemon/container_unix.go b/components/engine/daemon/container_unix.go index 722b25dc18..0eec1c8f68 100644 --- a/components/engine/daemon/container_unix.go +++ b/components/engine/daemon/container_unix.go @@ -18,9 +18,7 @@ import ( "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/links" "github.com/docker/docker/daemon/network" - "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/directory" - "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/nat" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" @@ -957,21 +955,6 @@ func (container *Container) initializeNetworking() error { return container.buildHostnameFile() } -func (container *Container) exportRw() (archive.Archive, error) { - if container.daemon == nil { - return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID) - } - archive, err := container.daemon.diff(container) - if err != nil { - return nil, err - } - return ioutils.NewReadCloserWrapper(archive, func() error { - err := archive.Close() - return err - }), - nil -} - func (container *Container) getIpcContainer() (*Container, error) { containerID := container.hostConfig.IpcMode.Container() c, err := container.daemon.Get(containerID) diff --git a/components/engine/daemon/container_windows.go b/components/engine/daemon/container_windows.go index 03665186c0..f72b6bb72e 100644 --- a/components/engine/daemon/container_windows.go +++ b/components/engine/daemon/container_windows.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/docker/docker/daemon/execdriver" - "github.com/docker/docker/pkg/archive" ) // DefaultPathEnv is deliberately empty on Windows as the default path will be set by @@ -144,14 +143,6 @@ func (container *Container) allocateNetwork() error { return nil } -func (container *Container) exportRw() (archive.Archive, error) { - if container.IsRunning() { - return nil, fmt.Errorf("Cannot export a running container.") - } - // TODO Windows. Implementation (different to Linux) - return nil, nil -} - func (container *Container) updateNetwork() error { return nil }