Merge pull request #1777 from aanand/update-api-version

Update API version to 1.19

Dockerfile

@@ -48,16 +48,14 @@ RUN set -ex; \
     rm -rf pip-7.0.1; \
     rm pip-7.0.1.tar.gz
 
-ENV ALL_DOCKER_VERSIONS 1.6.2 1.7.1
+ENV ALL_DOCKER_VERSIONS 1.7.1
 
 RUN set -ex; \
-    curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.2 -o /usr/local/bin/docker-1.6.2; \
-    chmod +x /usr/local/bin/docker-1.6.2; \
     curl https://get.docker.com/builds/Linux/x86_64/docker-1.7.1 -o /usr/local/bin/docker-1.7.1; \
     chmod +x /usr/local/bin/docker-1.7.1
 
 # Set the default Docker to be run
-RUN ln -s /usr/local/bin/docker-1.6.2 /usr/local/bin/docker
+RUN ln -s /usr/local/bin/docker-1.7.1 /usr/local/bin/docker
 
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/

compose/cli/docker_client.py

@@ -14,7 +14,7 @@ def docker_client():
         cert_path = os.path.join(os.environ.get('HOME', ''), '.docker')
 
     base_url = os.environ.get('DOCKER_HOST')
-    api_version = os.environ.get('COMPOSE_API_VERSION', '1.18')
+    api_version = os.environ.get('COMPOSE_API_VERSION', '1.19')
 
     tls_config = None
 

docs/install.md

@@ -17,7 +17,7 @@ Compose with a `curl` command.
 
 ## Install Docker
 
-First, install Docker version 1.6 or greater:
+First, install Docker version 1.7.1 or greater:
 
 - [Instructions for Mac OS X](http://docs.docker.com/installation/mac/)
 - [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/)

tests/integration/service_test.py

@@ -121,7 +121,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', cpu_shares=73)
         container = service.create_container()
         service.start_container(container)
-        self.assertEqual(container.inspect()['Config']['CpuShares'], 73)
+        self.assertEqual(container.get('HostConfig.CpuShares'), 73)
 
     def test_build_extra_hosts(self):
         # string
@@ -183,7 +183,7 @@ class ServiceTest(DockerClientTestCase):
         service = self.create_service('db', cpuset='0')
         container = service.create_container()
         service.start_container(container)
-        self.assertEqual(container.inspect()['Config']['Cpuset'], '0')
+        self.assertEqual(container.get('HostConfig.CpusetCpus'), '0')
 
     def test_create_container_with_read_only_root_fs(self):
         read_only = True