local.e2e: Reduce number of test images

chris-crone · gtardif · commit c0e5fbba993b · 2021-04-19T12:50:16.000+02:00
Signed-off-by: Chris Crone &lt;christopher.crone@docker.com&gt;
diff --git a/local/e2e/compose/fixtures/attach-restart/compose.yaml b/local/e2e/compose/fixtures/attach-restart/compose.yaml
@@ -1,9 +1,9 @@
 services:
   simple:
-    image: busybox:1.31.0-uclibc
+    image: alpine
     command: sh -c "sleep 5"
   another:
-    image: busybox:1.31.0-uclibc
+    image: alpine
     command: sh -c "sleep 0.1 && echo world && /bin/false"
     deploy:
       restart_policy:
diff --git a/local/e2e/compose/fixtures/build-test/nginx-build/Dockerfile b/local/e2e/compose/fixtures/build-test/nginx-build/Dockerfile
@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx
+FROM nginx:alpine
 
 ARG FOO
 LABEL FOO=$FOO
diff --git a/local/e2e/compose/fixtures/build-test/nginx-build2/Dockerfile b/local/e2e/compose/fixtures/build-test/nginx-build2/Dockerfile
@@ -12,6 +12,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx
+FROM nginx:alpine
 
 COPY static2 /usr/share/nginx/html
diff --git a/local/e2e/compose/fixtures/cascade-stop-test/compose.yaml b/local/e2e/compose/fixtures/cascade-stop-test/compose.yaml
@@ -1,7 +1,7 @@
 services:
   should_fail:
-    image: busybox:1.27.2
+    image: alpine
     command: ls /does_not_exist
   sleep: # will be killed
-    image: busybox:1.27.2
+    image: alpine
     command: ping localhost
diff --git a/local/e2e/compose/fixtures/ipc-test/compose.yaml b/local/e2e/compose/fixtures/ipc-test/compose.yaml
@@ -1,13 +1,13 @@
 services:
   service:
-    image: busybox
+    image: alpine
     command: top
     ipc: "service:shareable"
   container:
-    image: busybox
+    image: alpine
     command: top
     ipc: "container:ipc_mode_container"
   shareable:
-    image: busybox
+    image: alpine
     command: top
     ipc: shareable
diff --git a/local/e2e/compose/fixtures/logs-test/compose.yaml b/local/e2e/compose/fixtures/logs-test/compose.yaml
@@ -1,7 +1,7 @@
 services:
   ping:
-    image: busybox:1.27.2
+    image: alpine
     command: ping localhost -c 1
   hello:
-    image: busybox:1.31.0-uclibc
+    image: alpine
     command: echo hello
diff --git a/local/e2e/compose/fixtures/network-test/compose.yaml b/local/e2e/compose/fixtures/network-test/compose.yaml
@@ -1,6 +1,6 @@
 services:
   mydb:
-    image: mysql
+    image: mariadb
     network_mode: "service:db"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
diff --git a/local/e2e/compose/fixtures/restart-test/compose.yml b/local/e2e/compose/fixtures/restart-test/compose.yml
@@ -1,4 +1,4 @@
 services:
   restart:
-    image: busybox
+    image: alpine
     command: ash -c "if [[ -f /tmp/restart.lock ]] ; then sleep infinity; else touch /tmp/restart.lock; fi"
diff --git a/local/e2e/compose/fixtures/run-test/compose.yml b/local/e2e/compose/fixtures/run-test/compose.yml
@@ -8,13 +8,13 @@ services:
     networks:
       - backnet
   db:
-    image: nginx
+    image: nginx:alpine
     networks:
       - backnet
     volumes:
       - data:/test
   front:
-    image: nginx
+    image: nginx:alpine
     networks:
       - frontnet
 networks:
diff --git a/local/e2e/compose/fixtures/simple-build-test/nginx-build/Dockerfile b/local/e2e/compose/fixtures/simple-build-test/nginx-build/Dockerfile
@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx
+FROM nginx:alpine
 
 ARG FOO
 LABEL FOO=$FOO
diff --git a/local/e2e/compose/fixtures/simple-composefile/compose.yml b/local/e2e/compose/fixtures/simple-composefile/compose.yml
@@ -1,7 +1,7 @@
 services:
   simple:
-    image: busybox:1.27.2
+    image: alpine
     command: top
   another:
-    image: busybox:1.31.0-uclibc
+    image: alpine
     command: top
diff --git a/local/e2e/compose/fixtures/start-stop/compose.yml b/local/e2e/compose/fixtures/start-stop/compose.yml
@@ -1,5 +1,5 @@
 services:
   simple:
-    image:  nginx
+    image:  nginx:alpine
   another:
-    image:  nginx
+    image:  nginx:alpine
diff --git a/local/e2e/compose/fixtures/volume-test/nginx-build/Dockerfile b/local/e2e/compose/fixtures/volume-test/nginx-build/Dockerfile
@@ -12,4 +12,4 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx
+FROM nginx:alpine
diff --git a/local/e2e/compose/fixtures/wrong-composefile/compose.yml b/local/e2e/compose/fixtures/wrong-composefile/compose.yml
@@ -1,4 +1,4 @@
 services:
   simple:
-    image:  nginx
+    image:  nginx:alpine
     wrongField: test
diff --git a/local/e2e/compose/ipc_test.go b/local/e2e/compose/ipc_test.go
@@ -32,7 +32,7 @@ func TestIPC(t *testing.T) {
 	const projectName = "ipc_e2e"
 	var cid string
 	t.Run("create ipc mode container", func(t *testing.T) {
-		res := c.RunDockerCmd("run", "-d", "--rm", "--ipc=shareable", "--name", "ipc_mode_container", "busybox", "top")
+		res := c.RunDockerCmd("run", "-d", "--rm", "--ipc=shareable", "--name", "ipc_mode_container", "alpine", "top")
 		cid = strings.Trim(res.Stdout(), "\n")
 	})
 
diff --git a/local/e2e/container/container_test.go b/local/e2e/container/container_test.go
@@ -53,7 +53,7 @@ func TestLocalBackendRun(t *testing.T) {
 
 	t.Run("run", func(t *testing.T) {
 		t.Parallel()
-		res := c.RunDockerCmd("run", "-d", "nginx")
+		res := c.RunDockerCmd("run", "-d", "nginx:alpine")
 		containerName := strings.TrimSpace(res.Combined())
 		t.Cleanup(func() {
 			_ = c.RunDockerOrExitError("rm", "-f", containerName)
@@ -64,7 +64,7 @@ func TestLocalBackendRun(t *testing.T) {
 
 	t.Run("run rm", func(t *testing.T) {
 		t.Parallel()
-		res := c.RunDockerCmd("run", "--rm", "-d", "nginx")
+		res := c.RunDockerCmd("run", "--rm", "-d", "nginx:alpine")
 		containerName := strings.TrimSpace(res.Combined())
 		t.Cleanup(func() {
 			_ = c.RunDockerOrExitError("rm", "-f", containerName)
@@ -81,7 +81,7 @@ func TestLocalBackendRun(t *testing.T) {
 	})
 
 	t.Run("run with ports", func(t *testing.T) {
-		res := c.RunDockerCmd("run", "-d", "-p", "85:80", "nginx")
+		res := c.RunDockerCmd("run", "-d", "-p", "85:80", "nginx:alpine")
 		containerName := strings.TrimSpace(res.Combined())
 		t.Cleanup(func() {
 			_ = c.RunDockerOrExitError("rm", "-f", containerName)
@@ -101,15 +101,15 @@ func TestLocalBackendRun(t *testing.T) {
 			fields := strings.Fields(line)
 			if fields[0] == nginxID {
 				nginxFound = true
-				assert.Equal(t, fields[1], "nginx", res.Combined())
+				assert.Equal(t, fields[1], "nginx:alpine", res.Combined())
 				assert.Equal(t, fields[2], "/docker-entrypoint.sh", res.Combined())
 				assert.Equal(t, fields[len(fields)-1], "0.0.0.0:85->80/tcp", res.Combined())
 			}
 		}
 		assert.Assert(t, nginxFound, res.Stdout())
 
 		res = c.RunDockerCmd("ps", "--format", "json")
-		res.Assert(t, icmd.Expected{Out: `"Image":"nginx","Status":"Up Less than a second","Command":"/docker-entrypoint.sh nginx -g 'daemon off;'","Ports":["0.0.0.0:85->80/tcp"`})
+		res.Assert(t, icmd.Expected{Out: `"Image":"nginx:alpine","Status":"Up Less than a second","Command":"/docker-entrypoint.sh nginx -g 'daemon off;'","Ports":["0.0.0.0:85->80/tcp"`})
 
 		res = c.RunDockerCmd("ps", "--quiet")
 		res.Assert(t, icmd.Expected{Out: nginxID + "\n"})
