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

Fix #466

This commit is contained in:
Joffrey F 2015-02-01 15:44:30 -08:00
parent 08ce8d0e9f
commit cd006bbfaf
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/client.py
View File

@ -533,7 +533,9 @@ class Client(requests.Session):
volumes = [volumes, ] volumes = [volumes, ]
if host_config and utils.compare_version('1.15', self._version) < 0: if host_config and utils.compare_version('1.15', self._version) < 0:
raise errors.APIError('host_config is not supported in API < 1.15') raise errors.InvalidVersion(
'host_config is not supported in API < 1.15'
)
config = self._container_config( config = self._container_config(
image, command, hostname, user, detach, stdin_open, tty, mem_limit, image, command, hostname, user, detach, stdin_open, tty, mem_limit,
@ -563,7 +565,7 @@ class Client(requests.Session):
def execute(self, container, cmd, detach=False, stdout=True, stderr=True, def execute(self, container, cmd, detach=False, stdout=True, stderr=True,
stream=False, tty=False): stream=False, tty=False):
if utils.compare_version('1.15', self._version) < 0: if utils.compare_version('1.15', self._version) < 0:
raise errors.APIError('Exec is not supported in API < 1.15') raise errors.InvalidVersion('Exec is not supported in API < 1.15')
if isinstance(container, dict): if isinstance(container, dict):
container = container.get('Id') container = container.get('Id')
if isinstance(cmd, six.string_types): if isinstance(cmd, six.string_types):
@ -911,11 +913,11 @@ class Client(requests.Session):
if utils.compare_version('1.10', self._version) < 0: if utils.compare_version('1.10', self._version) < 0:
if dns is not None: if dns is not None:
raise errors.APIError( raise errors.InvalidVersion(
'dns is only supported for API version >= 1.10' 'dns is only supported for API version >= 1.10'
) )
if volumes_from is not None: if volumes_from is not None:
raise errors.APIError( raise errors.InvalidVersion(
'volumes_from is only supported for API version >= 1.10' 'volumes_from is only supported for API version >= 1.10'
) )

4
docker/errors.py
View File

@ -53,6 +53,10 @@ class DockerException(Exception):
pass pass
class InvalidVersion(DockerException):
pass
class InvalidRepository(DockerException): class InvalidRepository(DockerException):
pass pass