Merge branch 'master' into storage_refactor

2017-06-16 10:02:20 -03:00
parent e9911abf94 de281eb58b
commit 3a13358739
6 changed files with 7 additions and 2 deletions
--- a/pwd/instance_test.go
+++ b/pwd/instance_test.go
@@ -235,7 +235,7 @@ func TestInstanceAllowedImages(t *testing.T) {

 	p := NewPWD(dock, tasks, broadcast, storage)

-	expectedImages := []string{config.GetDindImageName(), "franela/dind:overlay2-dev"}
+	expectedImages := []string{config.GetDindImageName(), "franela/dind:overlay2-dev", "franela/ucp:2.4.1"}

 	assert.Equal(t, expectedImages, p.InstanceAllowedImages())
 }