Do not erroneously mask exceptions

There was a catch-all `except` statement in `create_containers`:

        try:
            containers = do_create(count, params)
        except:
            self.pull_image()
            containers = do_create(count, params)

This would mask a variety of errors that should be exposed, including
API compatability errors (as in #1707) and common Python exceptions (KeyError, ValueError, etc) that could result from errors in the code.

This change makes the `except` statement more specific, and only attempts to pull the image and start a container if the original create attempt failed due to a 404 error from the docker API.
reviewable/pr18780/r1
Lars Kellogg-Stedman 9 years ago
parent 2790af2858
commit 444a2ad808

@ -389,6 +389,7 @@ from urlparse import urlparse
try: try:
import docker.client import docker.client
import docker.utils import docker.utils
import docker.errors
from requests.exceptions import RequestException from requests.exceptions import RequestException
except ImportError: except ImportError:
HAS_DOCKER_PY = False HAS_DOCKER_PY = False
@ -1322,7 +1323,10 @@ class DockerManager(object):
try: try:
containers = do_create(count, params) containers = do_create(count, params)
except: except docker.errors.APIError as e:
if e.response.status_code != 404:
raise
self.pull_image() self.pull_image()
containers = do_create(count, params) containers = do_create(count, params)

Loading…
Cancel
Save