From 5e7521909d59ca69f77b60dc4173c9517facc2b9 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Fri, 14 Jun 2019 14:58:17 +0100 Subject: [PATCH 1/3] Add .fossa.yml file This commit adds a .fossa.yml file used by fossa.io It allows for fossa to scan the dependencies and figure out which oss licenses are in use. This can be added to CI at some point in the near future. Signed-off-by: Dave Tucker --- .fossa.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .fossa.yml diff --git a/.fossa.yml b/.fossa.yml new file mode 100644 index 000000000..b50761ef1 --- /dev/null +++ b/.fossa.yml @@ -0,0 +1,14 @@ +# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli) +# Visit https://fossa.io to learn more + +version: 2 +cli: + server: https://app.fossa.io + fetcher: custom + project: git@github.com:docker/compose +analyze: + modules: + - name: . + type: pip + target: . + path: . From a78e3b0c7c6f9d562f2bac5246e3fb2f2f34c21d Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Thu, 20 Jun 2019 14:12:28 +0200 Subject: [PATCH 2/3] Bump docker-py Signed-off-by: Djordje Lukic --- requirements.txt | 4 ++-- tests/acceptance/cli_test.py | 10 +++++----- tests/fixtures/environment-exec/docker-compose.yml | 2 +- tests/fixtures/links-composefile/docker-compose.yml | 6 +++--- tests/fixtures/simple-composefile/docker-compose.yml | 2 +- tests/fixtures/simple-dockerfile/Dockerfile | 2 +- tests/fixtures/v2-simple/docker-compose.yml | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5e8ec2ed7..6007ee3ff 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 5142f96eb..9ed257369 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 813606eb8..e284ba8cb 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 930fd4c7a..0a2f3d9ef 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 b25beaf4b..e86d3fc80 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 dd864b838..098ff3eb1 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 c99ae02fc..ac754eeea 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 From 4667896b69e46991f5e93183fa70f1233f469414 Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Mon, 24 Jun 2019 11:20:44 +0200 Subject: [PATCH 3/3] "Bump 1.24.1" Signed-off-by: Djordje Lukic --- CHANGELOG.md | 7 +++++++ compose/__init__.py | 2 +- script/run/run.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f98be92..8f777c6c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Change log ========== +1.24.1 (2019-06-24) +------------------- + +### Bugfixes + +- Fixed acceptance tests + 1.24.0 (2019-03-22) ------------------- diff --git a/compose/__init__.py b/compose/__init__.py index b66d2eb58..6a40e150f 100644 --- a/compose/__init__.py +++ b/compose/__init__.py @@ -1,4 +1,4 @@ from __future__ import absolute_import from __future__ import unicode_literals -__version__ = '1.24.0' +__version__ = '1.24.1' diff --git a/script/run/run.sh b/script/run/run.sh index a8690cad1..4881adc38 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.24.0" +VERSION="1.24.1" IMAGE="docker/compose:$VERSION"