Merge branch '1.4'
This commit is contained in:
commit
3283bc89fc
2 files changed
+2
-2
No files matched your search
@@ -98,7 +98,7 @@ func (c *Client) AddObserver(ob ContainerObserver) error {
|
|||||||
func (c *Client) IsContainerNotRunning(idStr string) bool {
|
func (c *Client) IsContainerNotRunning(idStr string) bool {
|
||||||
container, err := c.InspectContainer(idStr)
|
container, err := c.InspectContainer(idStr)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return !container.State.Running
|
return !container.State.Running || container.State.Restarting
|
||||||
}
|
}
|
||||||
if _, notThere := err.(*docker.NoSuchContainer); notThere {
|
if _, notThere := err.(*docker.NoSuchContainer); notThere {
|
||||||
return true
|
return true
|
||||||
|
|||||||
+1
-1
@@ -474,7 +474,7 @@ func (proxy *Proxy) attach(containerID string, orDie bool) error {
|
|||||||
Log.Infof("Attaching weave router container: %s", container.ID)
|
Log.Infof("Attaching weave router container: %s", container.ID)
|
||||||
return callWeaveAttach(container, []string{"attach-router"})
|
return callWeaveAttach(container, []string{"attach-router"})
|
||||||
}
|
}
|
||||||
if !containerShouldAttach(container) || !(container.State.Running || container.State.Paused) {
|
if !containerShouldAttach(container) || !container.State.Running {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user