tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209 from orchardup/better-invalid-service-name-error 

Better error message when service names are invalid
This commit is contained in:
Ben Firshman 2014-06-20 12:32:07 +01:00
parent 723cccdae8 cafe68a92d
commit eb69225444
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fig/service.py
View File

@ -21,6 +21,8 @@ DOCKER_CONFIG_HINTS = {
'volume' : 'volumes', 'volume' : 'volumes',
} }
VALID_NAME_CHARS = '[a-zA-Z0-9]'
class BuildError(Exception): class BuildError(Exception):
def __init__(self, service, reason): def __init__(self, service, reason):
@ -38,10 +40,10 @@ class ConfigError(ValueError):
class Service(object): class Service(object):
def __init__(self, name, client=None, project='default', links=[], **options): def __init__(self, name, client=None, project='default', links=[], **options):
if not re.match('^[a-zA-Z0-9]+$', name): if not re.match('^%s+$' % VALID_NAME_CHARS, name):
raise ConfigError('Invalid name: %s' % name) raise ConfigError('Invalid service name "%s" - only %s are allowed' % (name, VALID_NAME_CHARS))
if not re.match('^[a-zA-Z0-9]+$', project): if not re.match('^%s+$' % VALID_NAME_CHARS, project):
raise ConfigError('Invalid project: %s' % project) raise ConfigError('Invalid project name "%s" - only %s are allowed' % (project, VALID_NAME_CHARS))
if 'image' in options and 'build' in options: if 'image' in options and 'build' in options:
raise ConfigError('Service %s has both an image and build path specified. A service can either be built to image or use an existing image, not both.' % name) raise ConfigError('Service %s has both an image and build path specified. A service can either be built to image or use an existing image, not both.' % name)