jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not allow to specify both image and dockerfile in configuration. Closes #1908

Browse source 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
This commit is contained in:
Karol Duleba 2015-08-26 22:03:45 +01:00
commit 477d4f491d
4 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compose/config/validation.py
View file

@ -134,6 +134,11 @@ def process_errors(errors):
required.append(
"Service '{}' has neither an image nor a build path "
"specified. Exactly one must be provided.".format(service_name))
elif 'image' in error.instance and 'dockerfile' in error.instance:
required.append(
"Service '{}' has both an image and alternate Dockerfile. "
"A service can either be built to image or use an existing "
"image, not both.".format(service_name))
else:
required.append(_clean_error_message(error.message))
elif error.validator == 'oneOf':