1
0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00

local.e2e: Reduce number of test images

Signed-off-by: Chris Crone <christopher.crone@docker.com>
This commit is contained in:
Chris Crone 2021-04-13 15:11:14 +02:00
parent faf120a5c0
commit af74207f82
14 changed files with 22 additions and 22 deletions
local/e2e/compose
fixtures
attach-restart
build-test
nginx-build
nginx-build2
cascade-stop-test
ipc-test
logs-test
network-test
restart-test
run-test
simple-build-test/nginx-build
simple-composefile
start-stop
volume-test/nginx-build
ipc_test.go

@ -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:

@ -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

@ -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

@ -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

@ -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

@ -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

@ -1,6 +1,6 @@
services:
mydb:
image: mysql
image: mariadb
network_mode: "service:db"
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes

@ -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"

@ -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:

@ -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

@ -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

@ -1,5 +1,5 @@
services:
simple:
image: nginx
image: nginx:alpine
another:
image: nginx
image: nginx:alpine

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM nginx
FROM nginx:alpine

@ -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")
})