Browse code

Windows: Fix golint daemon breaking commit

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2015/09/03 06:31:15
Showing 3 changed files
... ...
@@ -24,7 +24,7 @@ func (daemon *Daemon) Commit(container *Container, c *ContainerCommitConfig) (*i
24 24
 		defer container.unpause()
25 25
 	}
26 26
 
27
-	rwTar, err := container.exportRw()
27
+	rwTar, err := container.exportContainerRw()
28 28
 	if err != nil {
29 29
 		return nil, err
30 30
 	}
... ...
@@ -18,9 +18,7 @@ import (
18 18
 	"github.com/docker/docker/daemon/execdriver"
19 19
 	"github.com/docker/docker/daemon/links"
20 20
 	"github.com/docker/docker/daemon/network"
21
-	"github.com/docker/docker/pkg/archive"
22 21
 	"github.com/docker/docker/pkg/directory"
23
-	"github.com/docker/docker/pkg/ioutils"
24 22
 	"github.com/docker/docker/pkg/nat"
25 23
 	"github.com/docker/docker/pkg/stringid"
26 24
 	"github.com/docker/docker/pkg/system"
... ...
@@ -957,21 +955,6 @@ func (container *Container) initializeNetworking() error {
957 957
 	return container.buildHostnameFile()
958 958
 }
959 959
 
960
-func (container *Container) exportRw() (archive.Archive, error) {
961
-	if container.daemon == nil {
962
-		return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID)
963
-	}
964
-	archive, err := container.daemon.diff(container)
965
-	if err != nil {
966
-		return nil, err
967
-	}
968
-	return ioutils.NewReadCloserWrapper(archive, func() error {
969
-			err := archive.Close()
970
-			return err
971
-		}),
972
-		nil
973
-}
974
-
975 960
 func (container *Container) getIpcContainer() (*Container, error) {
976 961
 	containerID := container.hostConfig.IpcMode.Container()
977 962
 	c, err := container.daemon.Get(containerID)
... ...
@@ -7,7 +7,6 @@ import (
7 7
 	"strings"
8 8
 
9 9
 	"github.com/docker/docker/daemon/execdriver"
10
-	"github.com/docker/docker/pkg/archive"
11 10
 )
12 11
 
13 12
 // DefaultPathEnv is deliberately empty on Windows as the default path will be set by
... ...
@@ -144,14 +143,6 @@ func (container *Container) allocateNetwork() error {
144 144
 	return nil
145 145
 }
146 146
 
147
-func (container *Container) exportRw() (archive.Archive, error) {
148
-	if container.IsRunning() {
149
-		return nil, fmt.Errorf("Cannot export a running container.")
150
-	}
151
-	// TODO Windows. Implementation (different to Linux)
152
-	return nil, nil
153
-}
154
-
155 147
 func (container *Container) updateNetwork() error {
156 148
 	return nil
157 149
 }