beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Windows: Fix golint daemon breaking commit

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-09-02 14:31:15 -07:00
parent 2434bd8e63
commit cfddca2bf9
3 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/commit.go
View file

@ -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
}

17
daemon/container_unix.go
View file

@ -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)

9
daemon/container_windows.go
View file

@ -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
}