From 8434058dcf2ec0b0b3c64f0451a1b64f7952ea94 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 13:48:03 +0000 Subject: [PATCH] tests: Switch test to alpine:3.7 Some testis explicitly use alpine:3.6 and alpine:3.5 to run some shell scripts. Switch them to alpine:3.7 like the rest of the packages and tools. Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/010_kmod_4.4.x/Dockerfile | 2 +- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.14.x/Dockerfile | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 4 ++-- test/cases/040_packages/003_ca-certificates/test.yml | 4 ++-- test/cases/040_packages/004_dhcpcd/test.yml | 4 ++-- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 4 ++-- test/cases/040_packages/023_wireguard/test.yml | 4 ++-- 21 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile index 51d54a1d9..9df81a966 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.5 +FROM alpine:3.7 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 5088a1017..bfdda25de 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.5 +FROM alpine:3.7 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile index f1a23cd7e..8499d04ef 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.5 +FROM alpine:3.7 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index aba513b1c..eed617283 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test - image: alpine:3.6 + image: alpine:3.7 readonly: true binds: - /check.sh:/check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 7e1c2ef18..c771669f1 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -8,7 +8,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:4b1d7a8dab03c09855fb4b6060a42b2294674b47 - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /check.sh:/check.sh - /proc/sys/fs/binfmt_misc:/binfmt_misc @@ -23,4 +23,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 508174d8f..f0279d649 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /check.sh:/check.sh - /etc:/host-etc @@ -22,4 +22,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 5467dde2d..0477bef96 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test - image: alpine:3.6 + image: alpine:3.7 net: host binds: - /check.sh:/check.sh @@ -24,4 +24,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 5812aa813..efc0c42ac 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 928458bc3..fd980720c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 868f37b0e..bea408266 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 18c18a47d..a4b9bd9b7 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 157935a62..cb4371049 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index fd5920e1b..bf586e01a 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index ad1a4d5f6..2de931795 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 728fe09e8..47382c2b9 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 8c9dea237..eded2d802 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 54f7e5641..f39ae88d6 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index bcc734fae..619d7000f 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index d6e7fa53d..2cba3eaec 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /var/foo:/var/foo diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index c90506645..f59a7d5e9 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -8,7 +8,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:ce3bde5118a41092f1b7048c85d14fb35237ed45 - name: test - image: alpine:3.6 + image: alpine:3.7 net: host pid: host ipc: host @@ -25,4 +25,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 1c568da64..9b7429cd6 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -38,7 +38,7 @@ onboot: net: /run/netns/wg1 onshutdown: - name: test2 - image: alpine:3.6 + image: alpine:3.7 binds: - /tmp:/tmp - /check.sh:/check.sh @@ -54,7 +54,7 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE - name: test - image: alpine:3.6 + image: alpine:3.7 net: /run/netns/wg1 pid: host capabilities: