diff --git a/daemon/execdriver/driver.go b/daemon/execdriver/driver.go index ba47b74e72..1a626929a4 100644 --- a/daemon/execdriver/driver.go +++ b/daemon/execdriver/driver.go @@ -39,12 +39,6 @@ type Hooks struct { PostStop []DriverCallback } -// Info is driver specific information based on -// processes registered with the driver -type Info interface { - IsRunning() bool -} - // Terminal represents a pseudo TTY, it is for when // using a container interactively. type Terminal interface { @@ -75,10 +69,6 @@ type Driver interface { // Name returns the name of the driver. Name() string - // Info returns the configuration stored in the driver struct, - // "temporary" hack (until we move state from core to plugins). - Info(id string) Info - // GetPidsForContainer returns a list of pid for the processes running in a container. GetPidsForContainer(id string) ([]int, error) diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index cfece7b433..93ad481d17 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -349,14 +349,6 @@ func (d *Driver) Terminate(c *execdriver.Command) error { return err } -// Info implements the exec driver Driver interface. -func (d *Driver) Info(id string) execdriver.Info { - return &info{ - ID: id, - driver: d, - } -} - // Name implements the exec driver Driver interface. func (d *Driver) Name() string { return fmt.Sprintf("%s-%s", DriverName, Version) diff --git a/daemon/execdriver/native/info.go b/daemon/execdriver/native/info.go deleted file mode 100644 index 498e56f00e..0000000000 --- a/daemon/execdriver/native/info.go +++ /dev/null @@ -1,16 +0,0 @@ -// +build linux,cgo - -package native - -type info struct { - ID string - driver *Driver -} - -// IsRunning is determined by looking for the -// pid file for a container. If the file exists then the -// container is currently running -func (i *info) IsRunning() bool { - _, ok := i.driver.activeContainers[i.ID] - return ok -} diff --git a/daemon/execdriver/windows/info.go b/daemon/execdriver/windows/info.go deleted file mode 100644 index 5e26e879c4..0000000000 --- a/daemon/execdriver/windows/info.go +++ /dev/null @@ -1,29 +0,0 @@ -// +build windows - -package windows - -import ( - "github.com/docker/docker/daemon/execdriver" - "github.com/docker/engine-api/types/container" -) - -type info struct { - ID string - driver *Driver - isolation container.IsolationLevel -} - -// Info implements the exec driver Driver interface. -func (d *Driver) Info(id string) execdriver.Info { - return &info{ - ID: id, - driver: d, - isolation: DefaultIsolation, - } -} - -func (i *info) IsRunning() bool { - var running bool - running = true // TODO Need an HCS API - return running -}