mirror of https://github.com/docker/compose.git
Bump docker-py
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
This commit is contained in:
parent
d9fa8158c3
commit
3fbb9fe51e
|
@ -3,7 +3,7 @@ cached-property==1.3.0
|
|||
certifi==2017.4.17
|
||||
chardet==3.0.4
|
||||
colorama==0.4.0; sys_platform == 'win32'
|
||||
docker==3.7.2
|
||||
docker==3.7.3
|
||||
docker-pycreds==0.4.0
|
||||
dockerpty==0.4.1
|
||||
docopt==0.6.2
|
||||
|
@ -21,4 +21,4 @@ requests==2.20.0
|
|||
six==1.10.0
|
||||
texttable==0.9.1
|
||||
urllib3==1.21.1; python_version == '3.3'
|
||||
websocket-client==0.32.0
|
||||
websocket-client==0.56.0
|
||||
|
|
|
@ -40,7 +40,7 @@ ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
|
|||
|
||||
|
||||
BUILD_CACHE_TEXT = 'Using cache'
|
||||
BUILD_PULL_TEXT = 'Status: Image is up to date for busybox:latest'
|
||||
BUILD_PULL_TEXT = 'Status: Image is up to date for busybox:1.27.2'
|
||||
|
||||
|
||||
def start_process(base_dir, options):
|
||||
|
@ -658,15 +658,15 @@ class CLITestCase(DockerClientTestCase):
|
|||
self.base_dir = 'tests/fixtures/links-composefile'
|
||||
result = self.dispatch(['pull', '--no-parallel', 'web'])
|
||||
assert sorted(result.stderr.split('\n'))[1:] == [
|
||||
'Pulling web (busybox:latest)...',
|
||||
'Pulling web (busybox:1.27.2)...',
|
||||
]
|
||||
|
||||
def test_pull_with_include_deps(self):
|
||||
self.base_dir = 'tests/fixtures/links-composefile'
|
||||
result = self.dispatch(['pull', '--no-parallel', '--include-deps', 'web'])
|
||||
assert sorted(result.stderr.split('\n'))[1:] == [
|
||||
'Pulling db (busybox:latest)...',
|
||||
'Pulling web (busybox:latest)...',
|
||||
'Pulling db (busybox:1.27.2)...',
|
||||
'Pulling web (busybox:1.27.2)...',
|
||||
]
|
||||
|
||||
def test_build_plain(self):
|
||||
|
@ -2592,7 +2592,7 @@ class CLITestCase(DockerClientTestCase):
|
|||
|
||||
container, = self.project.containers()
|
||||
expected_template = ' container {} {}'
|
||||
expected_meta_info = ['image=busybox:latest', 'name=simple-composefile_simple_']
|
||||
expected_meta_info = ['image=busybox:1.27.2', 'name=simple-composefile_simple_']
|
||||
|
||||
assert expected_template.format('create', container.id) in lines[0]
|
||||
assert expected_template.format('start', container.id) in lines[1]
|
||||
|
|
|
@ -2,7 +2,7 @@ version: "2.2"
|
|||
|
||||
services:
|
||||
service:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
|
||||
environment:
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
db:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
web:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
links:
|
||||
- db:db
|
||||
console:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
simple:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
another:
|
||||
image: busybox:latest
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
FROM busybox:latest
|
||||
FROM busybox:1.27.2
|
||||
LABEL com.docker.compose.test_image=true
|
||||
CMD echo "success"
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
version: "2"
|
||||
services:
|
||||
simple:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
another:
|
||||
image: busybox:latest
|
||||
image: busybox:1.27.2
|
||||
command: top
|
||||
|
|
Loading…
Reference in New Issue