瀏覽代碼

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

Pin busybox image version in tests
Ulysses Souza 6 年之前
父節點
當前提交
df2e833cf0

+ 5 - 5
tests/acceptance/cli_test.py

@@ -41,7 +41,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):
@@ -688,15 +688,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):
@@ -2669,7 +2669,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]

+ 1 - 1
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:

+ 3 - 3
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

+ 1 - 1
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

+ 1 - 1
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"

+ 2 - 2
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