Merge pull request #663 from krancour/update-blacklist

krancour · krancour · commit 8b49d66c86a0 · 2016-04-26T12:43:19.000-04:00
chore(dockerclient): Add workflow-manager to repo blacklist
diff --git a/rootfs/registry/dockerclient.py b/rootfs/registry/dockerclient.py
@@ -126,7 +126,7 @@ def check_blacklist(repo):
     """Check a Docker repository name for collision with deis/* components."""
     blacklisted = [  # NOTE: keep this list up to date!
         'builder', 'controller', 'database', 'dockerbuilder', 'etcd', 'minio', 'registry',
-        'router', 'slugbuilder', 'slugrunner', 'workflow',
+        'router', 'slugbuilder', 'slugrunner', 'workflow', 'workflow-manager',
     ]
     if any("deis/{}".format(c) in repo for c in blacklisted):
         raise PermissionDenied("Repository name {} is not allowed, as it is reserved by Deis".format(repo))  # noqa

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def check_blacklist(repo):`
`126`	`126`	`"""Check a Docker repository name for collision with deis/* components."""`
`127`	`127`	`blacklisted = [ # NOTE: keep this list up to date!`
`128`	`128`	`'builder', 'controller', 'database', 'dockerbuilder', 'etcd', 'minio', 'registry',`
`129`		`- 'router', 'slugbuilder', 'slugrunner', 'workflow',`
	`129`	`+ 'router', 'slugbuilder', 'slugrunner', 'workflow', 'workflow-manager',`
`130`	`130`	`]`
`131`	`131`	`if any("deis/{}".format(c) in repo for c in blacklisted):`
`132`	`132`	`raise PermissionDenied("Repository name {} is not allowed, as it is reserved by Deis".format(repo)) # noqa`