summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDjordje Lukic <djordje.lukic@docker.com>2019-06-20 14:12:28 +0200
committerDjordje Lukic <djordje.lukic@docker.com>2019-06-24 10:38:39 +0200
commita78e3b0c7c6f9d562f2bac5246e3fb2f2f34c21d (patch)
treef17e2145d309226f94aa6d1d602f9389d458a956
parent5e7521909d59ca69f77b60dc4173c9517facc2b9 (diff)
Bump docker-py
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
-rw-r--r--requirements.txt4
-rw-r--r--tests/acceptance/cli_test.py10
-rw-r--r--tests/fixtures/environment-exec/docker-compose.yml2
-rw-r--r--tests/fixtures/links-composefile/docker-compose.yml6
-rw-r--r--tests/fixtures/simple-composefile/docker-compose.yml2
-rw-r--r--tests/fixtures/simple-dockerfile/Dockerfile2
-rw-r--r--tests/fixtures/v2-simple/docker-compose.yml4
7 files changed, 15 insertions, 15 deletions
diff --git a/requirements.txt b/requirements.txt
index 5e8ec2ed..6007ee3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 5142f96e..9ed25736 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -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]
diff --git a/tests/fixtures/environment-exec/docker-compose.yml b/tests/fixtures/environment-exec/docker-compose.yml
index 813606eb..e284ba8c 100644
--- a/tests/fixtures/environment-exec/docker-compose.yml
+++ b/tests/fixtures/environment-exec/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.2"
services:
service:
- image: busybox:latest
+ image: busybox:1.27.2
command: top
environment:
diff --git a/tests/fixtures/links-composefile/docker-compose.yml b/tests/fixtures/links-composefile/docker-compose.yml
index 930fd4c7..0a2f3d9e 100644
--- a/tests/fixtures/links-composefile/docker-compose.yml
+++ b/tests/fixtures/links-composefile/docker-compose.yml
@@ -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
diff --git a/tests/fixtures/simple-composefile/docker-compose.yml b/tests/fixtures/simple-composefile/docker-compose.yml
index b25beaf4..e86d3fc8 100644
--- a/tests/fixtures/simple-composefile/docker-compose.yml
+++ b/tests/fixtures/simple-composefile/docker-compose.yml
@@ -1,5 +1,5 @@
simple:
- image: busybox:latest
+ image: busybox:1.27.2
command: top
another:
image: busybox:latest
diff --git a/tests/fixtures/simple-dockerfile/Dockerfile b/tests/fixtures/simple-dockerfile/Dockerfile
index dd864b83..098ff3eb 100644
--- a/tests/fixtures/simple-dockerfile/Dockerfile
+++ b/tests/fixtures/simple-dockerfile/Dockerfile
@@ -1,3 +1,3 @@
-FROM busybox:latest
+FROM busybox:1.27.2
LABEL com.docker.compose.test_image=true
CMD echo "success"
diff --git a/tests/fixtures/v2-simple/docker-compose.yml b/tests/fixtures/v2-simple/docker-compose.yml
index c99ae02f..ac754eee 100644
--- a/tests/fixtures/v2-simple/docker-compose.yml
+++ b/tests/fixtures/v2-simple/docker-compose.yml
@@ -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