Merge pull request #14 from orchardup/vendor-docker-py

Vendor docker-py
This commit is contained in:
Ben Firshman 2014-01-16 05:49:15 -08:00
commit b4c905dc83
14 changed files with 1098 additions and 5 deletions

View file

@ -1,6 +1,6 @@
from __future__ import unicode_literals
from __future__ import absolute_import
from docker import Client
from ..packages.docker import Client
import errno
import logging
import os

View file

@ -15,7 +15,7 @@ from .formatter import Formatter
from .log_printer import LogPrinter
from .utils import yesno
from docker.client import APIError
from ..packages.docker.client import APIError
from .errors import UserError
from .docopt_command import NoSuchCommand
from .socketclient import SocketClient