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.go
+++ b/pwd/instance.go
@@ -236,6 +236,7 @@ func (p *pwd) InstanceAllowedImages() []string {
 	return []string{
 		config.GetDindImageName(),
 		"franela/dind:overlay2-dev",
+		"franela/ucp:2.4.1",
 	}

 }