Skip to content

Commit 79c2424

Browse files
committed
ref(requirements.txt): remove marathon library
1 parent e3af588 commit 79c2424

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

rootfs/registry/dockerclient.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,8 @@ def tag(self, image, repo, tag):
9090
def check_blacklist(repo):
9191
"""Check a Docker repository name for collision with deis/* components."""
9292
blacklisted = [ # NOTE: keep this list up to date!
93-
'builder', 'cache', 'controller', 'database', 'logger', 'logspout',
94-
'publisher', 'registry', 'router', 'store-admin', 'store-daemon',
95-
'store-gateway', 'store-metadata', 'store-monitor', 'swarm', 'mesos-master',
96-
'mesos-marathon', 'mesos-slave', 'zookeeper',
93+
'builder', 'database', 'dockerbuilder', 'etcd', 'minio', 'registry', 'router',
94+
'slugbuilder', 'slugrunner', 'workflow',
9795
]
9896
if any("deis/{}".format(c) in repo for c in blacklisted):
9997
raise PermissionDenied("Repository name {} is not allowed".format(repo))

rootfs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ django-auth-ldap==1.2.5
1010
djangorestframework==3.0.5
1111
docker-py==1.5.0
1212
gunicorn==19.3.0
13-
marathon==0.6.15
1413
paramiko==1.15.2
1514
psycopg2==2.6.1
1615
python-etcd==0.3.2

0 commit comments

Comments
 (0)