Merge pull request #1369 from vieux/fix_various_issues

Fix various issues

cluster/engine.go

@@ -128,6 +128,9 @@ func (e *Engine) ConnectWithClient(client dockerclient.Client) error {
 		return err
 	}
 
+	// Start monitoring events from the engine.
+	e.client.StartMonitorEvents(e.handler, nil)
+
 	// Force a state update before returning.
 	if err := e.RefreshContainers(true); err != nil {
 		return err
@@ -144,8 +147,6 @@ func (e *Engine) ConnectWithClient(client dockerclient.Client) error {
 	// Start the update loop.
 	go e.refreshLoop()
 
-	// Start monitoring events from the engine.
-	e.client.StartMonitorEvents(e.handler, nil)
 	e.emitEvent("engine_connect")
 
 	return nil
@@ -218,7 +219,10 @@ func (e *Engine) updateSpecs() error {
 
 // RemoveImage deletes an image from the engine.
 func (e *Engine) RemoveImage(image *Image, name string, force bool) ([]*dockerclient.ImageDelete, error) {
-	return e.client.RemoveImage(name, force)
+	array, err := e.client.RemoveImage(name, force)
+	e.RefreshImages()
+	return array, err
+
 }
 
 // RemoveNetwork deletes a network from the engine.
@@ -521,6 +525,7 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool) (*
 	// Register the container immediately while waiting for a state refresh.
 	// Force a state refresh to pick up the newly created container.
 	e.refreshContainer(id, true)
+	e.RefreshVolumes()
 	e.RefreshNetworks()
 
 	e.RLock()

test/integration/api/network.bats

@@ -28,7 +28,7 @@ function teardown() {
 	run docker_swarm network inspect node-0/bridge
 	[[ "${output}" != *"\"Containers\": {}"* ]]
 
-	diff <(docker_swarm network inspect node-0/bridge) <(docker_host -H ${HOSTS[0]} network inspect bridge)
+	diff <(docker_swarm network inspect node-0/bridge) <(docker -H ${HOSTS[0]} network inspect bridge)
 }
 
 @test "docker network create" {

test/integration/api/run.bats

@@ -107,7 +107,7 @@ function teardown() {
 	[[ "${output}" == *"node-0/test_container"* ]]
 }
 
-@test "docker run - reschedule with soft-image-affinity(have node constraint))" {
+@test "docker run - reschedule with soft-image-affinity and node constraint" {
 	start_docker_with_busybox 1
 	start_docker 1