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

Merge pull request #6777 from ulyssessouza/pin-busybox-image-version

Browse Source 
Pin busybox image version in tests
This commit is contained in:
Ulysses Souza 2019-07-02 14:33:56 +02:00 committed by GitHub
commit df2e833cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/acceptance/cli_test.py
View File

@ -41,7 +41,7 @@ ProcessResult = namedtuple('ProcessResult', 'stdout stderr')
BUILD_CACHE_TEXT = 'Using cache' 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): def start_process(base_dir, options):
@ -688,15 +688,15 @@ class CLITestCase(DockerClientTestCase):
self.base_dir = 'tests/fixtures/links-composefile' self.base_dir = 'tests/fixtures/links-composefile'
result = self.dispatch(['pull', '--no-parallel', 'web']) result = self.dispatch(['pull', '--no-parallel', 'web'])
assert sorted(result.stderr.split('\n'))[1:] == [ assert sorted(result.stderr.split('\n'))[1:] == [
'Pulling web (busybox:latest)...', 'Pulling web (busybox:1.27.2)...',
] ]
def test_pull_with_include_deps(self): def test_pull_with_include_deps(self):
self.base_dir = 'tests/fixtures/links-composefile' self.base_dir = 'tests/fixtures/links-composefile'
result = self.dispatch(['pull', '--no-parallel', '--include-deps', 'web']) result = self.dispatch(['pull', '--no-parallel', '--include-deps', 'web'])
assert sorted(result.stderr.split('\n'))[1:] == [ assert sorted(result.stderr.split('\n'))[1:] == [
'Pulling db (busybox:latest)...', 'Pulling db (busybox:1.27.2)...',
'Pulling web (busybox:latest)...', 'Pulling web (busybox:1.27.2)...',
] ]
def test_build_plain(self): def test_build_plain(self):
@ -2669,7 +2669,7 @@ class CLITestCase(DockerClientTestCase):
container, = self.project.containers() container, = self.project.containers()
expected_template = ' container {} {}' 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('create', container.id) in lines[0]
assert expected_template.format('start', container.id) in lines[1] assert expected_template.format('start', container.id) in lines[1]

2
tests/fixtures/environment-exec/docker-compose.yml vendored
View File

@ -2,7 +2,7 @@ version: "2.2"
services: services:
service: service:
image: busybox:latest image: busybox:1.27.2
command: top command: top
environment: environment:

6
tests/fixtures/links-composefile/docker-compose.yml vendored
View File

@ -1,11 +1,11 @@
db: db:
image: busybox:latest image: busybox:1.27.2
command: top command: top
web: web:
image: busybox:latest image: busybox:1.27.2
command: top command: top
links: links:
- db:db - db:db
console: console:
image: busybox:latest image: busybox:1.27.2
command: top command: top

2
tests/fixtures/simple-composefile/docker-compose.yml vendored
View File

@ -1,5 +1,5 @@
simple: simple:
image: busybox:latest image: busybox:1.27.2
command: top command: top
another: another:
image: busybox:latest image: busybox:latest

2
tests/fixtures/simple-dockerfile/Dockerfile vendored
View File

@ -1,3 +1,3 @@
FROM busybox:latest FROM busybox:1.27.2
LABEL com.docker.compose.test_image=true LABEL com.docker.compose.test_image=true
CMD echo "success" CMD echo "success"

4
tests/fixtures/v2-simple/docker-compose.yml vendored
View File

@ -1,8 +1,8 @@
version: "2" version: "2"
services: services:
simple: simple:
image: busybox:latest image: busybox:1.27.2
command: top command: top
another: another:
image: busybox:latest image: busybox:1.27.2
command: top command: top