tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 04:34:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Update API version to 1.19
(cherry picked from commit 276e369c3167b4f5e189b33e8a55ff6fd7115142)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-07-29 16:59:42 +01:00
parent 989b2491b9
commit 49bafdc4cd
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -48,16 +48,14 @@ RUN set -ex; \
rm -rf pip-7.0.1; \ rm -rf pip-7.0.1; \
rm pip-7.0.1.tar.gz 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; \ 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; \ 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 chmod +x /usr/local/bin/docker-1.7.1
# Set the default Docker to be run # 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 RUN useradd -d /home/user -m -s /bin/bash user
WORKDIR /code/ WORKDIR /code/

2
compose/cli/docker_client.py
View File

@ -14,7 +14,7 @@ def docker_client():
cert_path = os.path.join(os.environ.get('HOME', ''), '.docker') cert_path = os.path.join(os.environ.get('HOME', ''), '.docker')
base_url = os.environ.get('DOCKER_HOST') 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 tls_config = None

2
docs/install.md
View File

@ -17,7 +17,7 @@ Compose with a `curl` command.
## Install Docker ## 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 Mac OS X](http://docs.docker.com/installation/mac/)
- [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/) - [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/)

4
tests/integration/service_test.py
View File

@ -121,7 +121,7 @@ class ServiceTest(DockerClientTestCase):
service = self.create_service('db', cpu_shares=73) service = self.create_service('db', cpu_shares=73)
container = service.create_container() container = service.create_container()
service.start_container(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): def test_build_extra_hosts(self):
# string # string
@ -183,7 +183,7 @@ class ServiceTest(DockerClientTestCase):
service = self.create_service('db', cpuset='0') service = self.create_service('db', cpuset='0')
container = service.create_container() container = service.create_container()
service.start_container(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): def test_create_container_with_read_only_root_fs(self):
read_only = True read_only = True