From 8301540809dcaf698fc7fb2466dcd4d58076303c Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Sat, 7 Jul 2018 19:26:58 +0100
Subject: [PATCH] Update remaining uses of alpine:3.7 to alpine:3.8

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
---
 contrib/foreign-kernels/Dockerfile.deb                        | 2 +-
 contrib/foreign-kernels/Dockerfile.rpm                        | 2 +-
 examples/docker-for-mac.yml                                   | 4 ++--
 examples/vpnkit-forwarder.yml                                 | 2 +-
 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/020_kernel/019_kmod_4.17.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 ++--
 26 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/contrib/foreign-kernels/Dockerfile.deb b/contrib/foreign-kernels/Dockerfile.deb
index 4b796ebee..3d10588a0 100644
--- a/contrib/foreign-kernels/Dockerfile.deb
+++ b/contrib/foreign-kernels/Dockerfile.deb
@@ -1,4 +1,4 @@
-FROM alpine:3.7 AS extract
+FROM alpine:3.8 AS extract
 
 ARG DEB_URLS
 
diff --git a/contrib/foreign-kernels/Dockerfile.rpm b/contrib/foreign-kernels/Dockerfile.rpm
index 819117265..be2648dda 100644
--- a/contrib/foreign-kernels/Dockerfile.rpm
+++ b/contrib/foreign-kernels/Dockerfile.rpm
@@ -1,4 +1,4 @@
-FROM alpine:3.7 AS extract
+FROM alpine:3.8 AS extract
 
 ARG RPM_URLS
 
diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml
index b469b3249..e254c801e 100644
--- a/examples/docker-for-mac.yml
+++ b/examples/docker-for-mac.yml
@@ -30,7 +30,7 @@ onboot:
     command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"]
   # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding
   - name: mount-vpnkit
-    image: alpine:3.7
+    image: alpine:3.8
     binds:
         - /var/:/host_var:rbind,rshared
     capabilities:
@@ -39,7 +39,7 @@ onboot:
     command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"]
   # move logs to the mounted disk (this is a temporary fix until we can limit the log sizes)
   - name: move-logs
-    image: alpine:3.7
+    image: alpine:3.8
     binds:
         - /var:/host_var
     command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"]
diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml
index 21ee4c9ed..90a6d3d1c 100644
--- a/examples/vpnkit-forwarder.yml
+++ b/examples/vpnkit-forwarder.yml
@@ -10,7 +10,7 @@ onboot:
     image: linuxkit/dhcpcd:0aa201ad1a4c134f0ed6ab2cec23602d5ee73d7f
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: mount-vpnkit
-    image: alpine:3.7
+    image: alpine:3.8
     binds:
         - /var/:/host_var:rbind,rshared
     capabilities:
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 77f87cb42..3b6e14473 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.7
+FROM alpine:3.8
 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 c9f83c5aa..a6cfa9e33 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.7
+FROM alpine:3.8
 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 1d2c3dcd5..84bc710d3 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.7
+FROM alpine:3.8
 COPY --from=build /kmod/hello_world.ko /
 COPY check.sh /check.sh
 ENTRYPOINT ["/bin/sh", "/check.sh"]
diff --git a/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile b/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile
index f2186c157..c94e32826 100644
--- a/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile
+++ b/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile
@@ -17,7 +17,7 @@ COPY ./src/* ./
 RUN make all
 
 # Package
-FROM alpine:3.7
+FROM alpine:3.8
 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 6aea82d9f..1581e6eca 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:01b4f0706d999f9065ef44492689e43d0bcd83c5
 onboot:
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 1f9ceec48..ddbcb9712 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:b0d833f5ecd26d6cb991622b1234afd9a0f6ee31
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     binds:
       - /check.sh:/check.sh
       - /proc/sys/fs/binfmt_misc:/binfmt_misc
@@ -23,4 +23,4 @@ trust:
   org:
     - linuxkit
   image:
-    - alpine:3.7
+    - alpine:3.8
diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml
index 08843c8f0..1d7badb96 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:ce2692e89d2be341b0d3caa0b0aa01b37d5d0694
 onboot:
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     binds:
       - /check.sh:/check.sh
       - /etc:/host-etc
@@ -22,4 +22,4 @@ trust:
   org:
     - linuxkit
   image:
-    - alpine:3.7
+    - alpine:3.8
diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml
index ca20d7acd..d2ab4a9d0 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:0aa201ad1a4c134f0ed6ab2cec23602d5ee73d7f
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     net: host
     binds:
       - /check.sh:/check.sh
@@ -24,4 +24,4 @@ trust:
   org:
     - linuxkit
   image:
-    - alpine:3.7
+    - alpine:3.8
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 b96168df8..2f6a79954 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 beb0bbc96..57c8ee554 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 1a38251db..96c7a7f49 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 1457c2166..1df353255 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 2fc7b1ce7..863f9a336 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 d0d176551..3b8a768d7 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 92acd5fbf..00ccea2a0 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 c54d67127..e7629d4c7 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 1818f0bed..1d7061fd2 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 f44fc1e8f..60066b965 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 abe2f30ea..46767a824 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "/var/lib/docker"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 52f5d15b1..c75fa7859 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:6b25743397b520924de11f96e3eeb613aa04a507
     command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     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 d8dabee59..8c82e05fc 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:6f96e509c7383b31dfdd2c3e9fa01c6ab3e4c586
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     net: host
     pid: host
     ipc: host
@@ -25,4 +25,4 @@ trust:
   org:
     - linuxkit
   image:
-    - alpine:3.7
+    - alpine:3.8
diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml
index 20e35ea94..9575fa2b2 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.7
+    image: alpine:3.8
     binds:
       - /tmp:/tmp
       - /check.sh:/check.sh
@@ -55,7 +55,7 @@ services:
      - CAP_SETGID
      - CAP_DAC_OVERRIDE
   - name: test
-    image: alpine:3.7
+    image: alpine:3.8
     net: /run/netns/wg1
     pid: host
     capabilities: