diff --git a/Makefile b/Makefile index 30230027e..9c370dd35 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ endif PREFIX?=/usr/local/ -RTF_COMMIT=f2409214ca3b719567aa15bb7b363f24876a4d98 +RTF_COMMIT=171155c375706f2616f0b9c96afe2240e15d1de1 RTF_CMD=github.com/linuxkit/rtf/cmd RTF_VERSION=0.0 bin/rtf: tmp_rtf_bin.tar | bin diff --git a/examples/aws.yml b/examples/aws.yml index f99332c05..ed516eeee 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.2 + image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 20f61aae2..57f9ea9f1 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 66efa4382..75a133d87 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:v0.2 + image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: ntpd - image: linuxkit/openntpd:v0.2 + image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 - name: docker image: docker:17.10.0-ce-dind @@ -46,7 +46,7 @@ services: - /etc/docker/daemon.json:/etc/docker/daemon.json command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: cadvisor - image: linuxkit/cadvisor:v0.2 + image: linuxkit/cadvisor:5adb222abfcc3e7f21287045d7192aaf9198b80e files: - path: var/lib/docker directory: true diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index bf64e3e04..74655451c 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/vpnkit-expose-port:3f60b78f78bfb83c14dd459ff7a3f58dacb33ad0 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:v0.2 + image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: sysfs - image: linuxkit/sysfs:v0.2 + image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f - name: binfmt - image: linuxkit/binfmt:v0.2 + image: linuxkit/binfmt:98398d827e80b56e487d2ae94ed86a0006acb702 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:v0.2 + image: linuxkit/swap:83b2f6d8c1e8196b68215a62269da4b79002aad0 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 @@ -44,41 +44,41 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:v0.2 + image: linuxkit/acpid:a1399f824db917488d048c5e23ca3cec6e5317d8 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:v0.2 + image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:v0.2 + image: linuxkit/vsudd:3559f24480e165e0719479146953b461a3e1b99e binds: - /var/run:/var/run command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"] # vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373. # It needs access to the vpnkit 9P coordination share - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.2 + image: linuxkit/vpnkit-forwarder:9dad2e9fb848d6452232deb01e08beda7ba00d21 binds: - /var/vpnkit:/port net: host command: ["/vpnkit-forwarder", "-vsockPort", "62373"] # Monitor for image deletes and invoke a TRIM on the container filesystem - name: trim-after-delete - image: linuxkit/trim-after-delete:v0.2 + image: linuxkit/trim-after-delete:ab0873798bf27deb5024569e46dfe30bebda9713 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:v0.2 + image: linuxkit/host-timesync-daemon:10177f45d9384fa4cc61571ae8bb3bffbb3eba3c # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/docker.yml b/examples/docker.yml index f1fa0a1c9..02d16b17d 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,31 +2,31 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: sysfs - image: linuxkit/sysfs:v0.2 + image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: ntpd - image: linuxkit/openntpd:v0.2 + image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 - name: docker image: docker:17.09.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 9475eb4a3..487332ce0 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.2 + image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index d1a332515..d181fdfff 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index f674c83c0..bfa6101b9 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true runtime: @@ -30,7 +30,7 @@ services: destination: writeable-host-etc options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"] - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index d9e3e6ec5..4b79faef9 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: influxdb diff --git a/examples/minimal.yml b/examples/minimal.yml index cc617ed4f..d7b873a0a 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 2ed8bf87f..f9f9f93a5 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: node_exporter - image: linuxkit/node_exporter:v0.2 + image: linuxkit/node_exporter:4e469ba415316c03136d5645642782554cb293e7 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 39ec67b6e..9718365b0 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.2 + image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index 9471c0795..0d1f8e00f 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:v0.2 + image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index e838450c2..fc76a108c 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,32 +3,32 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 - - linuxkit/firmware:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 + - linuxkit/firmware:33b2483a7e2cc54cc4a58dbe9c3662f7f067f70d onboot: - name: rngd1 - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.2 + image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index c12af7128..6547a50ef 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index c9c4cff9b..77e82e77e 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,24 +2,24 @@ kernel: image: linuxkit/kernel:4.14.18-rt cmdline: "console=tty0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: open-vm-tools - image: linuxkit/open-vm-tools:v0.2 + image: linuxkit/open-vm-tools:fd0b0bc2c57da0ed069a423fb5a3494499fb1ac0 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/sshd.yml b/examples/sshd.yml index 942a3effe..4cc835cd0 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: rngd1 - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 51eb36372..b0019d1e7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,33 +2,33 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:v0.2 + image: linuxkit/swap:83b2f6d8c1e8196b68215a62269da4b79002aad0 # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index f2084b8d6..da4770ef7 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: tss - image: linuxkit/tss:v0.2 + image: linuxkit/tss:4ed60eeeeb9c26a3172e8b2c654ec257c6c9b220 - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/vmware.yml b/examples/vmware.yml index 88bc8b1fc..0a1e23745 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,22 +2,22 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index dbdfcb300..97f3e7e93 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.7 @@ -19,9 +19,9 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.2 + image: linuxkit/vpnkit-forwarder:9dad2e9fb848d6452232deb01e08beda7ba00d21 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index d684bff9f..5bc034969 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:v0.2 + image: linuxkit/vsudd:3559f24480e165e0719479146953b461a3e1b99e binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 9475eb4a3..487332ce0 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,27 +2,27 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.2 + image: linuxkit/metadata:09272c373fa10b9a09f2c9fe380bffb4402f98f6 services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 6ad7b810b..027b6eb27 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,18 +2,18 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.2 + image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.2 + image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/linuxkit.yml b/linuxkit.yml index 75d7b60fa..31c630cfb 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,15 +2,15 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,11 +18,11 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index 14575b468..6fcb45081 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -6,7 +6,7 @@ RUN apk add --no-cache --initdb -p /out \ busybox RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror2 +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror2 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ busybox-initscripts diff --git a/pkg/auditd/Dockerfile b/pkg/auditd/Dockerfile index 66ed1a2b9..14a677ed7 100644 --- a/pkg/auditd/Dockerfile +++ b/pkg/auditd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 9341e63d2..931b5b789 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS qemu +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ qemu-ppc64le -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 5f3dfc80e..6cc178f09 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 as alpine +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as alpine RUN apk add ca-certificates diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 8ed547d00..8438e9ae3 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 as build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as build RUN apk add --no-cache bash go git musl-dev linux-headers make @@ -16,7 +16,7 @@ RUN go get -d ${GITREPO} \ && mv cadvisor /usr/bin/ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/cadvisor/build.yml b/pkg/cadvisor/build.yml index f14e79e4b..79a35bc80 100644 --- a/pkg/cadvisor/build.yml +++ b/pkg/cadvisor/build.yml @@ -1,2 +1,5 @@ image: cadvisor network: true +arches: + - amd64 + - arm64 diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 7f66c6295..7794fa177 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:b1a36f0dd41e60142dd84dab7cd333ce7da1d1f8 as alpine +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 17ae27f4a..7aa0065b3 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile index 9bb64cb96..783e91597 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile index 70ca205e2..c3e4f4da6 100644 --- a/pkg/firmware-all/Dockerfile +++ b/pkg/firmware-all/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache git # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile index 9b3dbfae6..bd62b21b1 100644 --- a/pkg/firmware/Dockerfile +++ b/pkg/firmware/Dockerfile @@ -1,7 +1,7 @@ # Make modules from a recentish kernel available -FROM linuxkit/kernel:4.14.12 AS kernel +FROM linuxkit/kernel:4.14.28 AS kernel -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache git kmod # Clone the firmware repository diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 390659ea6..c815ee334 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 3c216dc12..04d46dc4f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile index d46f40a91..5ed0df70c 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index af8728616..ba8fa4d70 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:b1a36f0dd41e60142dd84dab7cd333ce7da1d1f8 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:b1a36f0dd41e60142dd84dab7cd333ce7da1d1f8 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index 508b1b423..e684f43e7 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add curl RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile index f0b146f3e..4621d3414 100644 --- a/pkg/metadata/Dockerfile +++ b/pkg/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index 2bb7bb2b5..7fdb1580d 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/modprobe/Dockerfile b/pkg/modprobe/Dockerfile index 7709cd96f..926e87426 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index afadd7d8a..84aef533f 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ @@ -9,7 +9,7 @@ RUN apk add --no-cache --initdb -p /out \ && true RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index 54bbc021c..f88871cf6 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 as build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as build RUN apk add --no-cache go git musl-dev make diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 539ca7290..30a058791 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index 5bcf4c671..2c332ae2e 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index bf206a838..1afee5f8b 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/var/run RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 0249f50c2..084a2df24 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,8 +1,11 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go gcc musl-dev linux-headers ENV GOPATH=/go PATH=$PATH:/go/bin +# see https://github.com/golang/go/issues/23672 +ENV CGO_CFLAGS_ALLOW=(-mrdrnd|-mrdseed) + COPY cmd/rngd/ /go/src/rngd/ RUN REQUIRE_CGO=1 go-compile.sh /go/src/rngd diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index a8bbd65ff..a4aa1ef0c 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 as alpine +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as alpine RUN \ apk add \ bash \ diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index d360eb5db..5da23de1b 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 665654bb0..8dc89b240 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/sysctl/Dockerfile b/pkg/sysctl/Dockerfile index fead526ea..47466fa38 100644 --- a/pkg/sysctl/Dockerfile +++ b/pkg/sysctl/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index 3ca5f3553..94f1f571c 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile index 64ccd1da1..cd4ea2880 100644 --- a/pkg/trim-after-delete/Dockerfile +++ b/pkg/trim-after-delete/Dockerfile @@ -1,5 +1,5 @@ # We need the `fstrim` binary: -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/pkg/tss/Dockerfile b/pkg/tss/Dockerfile index be5aec859..eda3ed45b 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build ENV TROUSERS_COMMIT de57f069ef2297d6a6b3a0353e217a5a2f66e444 ENV TPM_TOOLS_COMMIT bdf9f1bc8f63cd6fc370c2deb58d03ac55079e84 diff --git a/pkg/vpnkit-expose-port/Dockerfile b/pkg/vpnkit-expose-port/Dockerfile index b8838c389..8305b78f1 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS build +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index 944bdc415..005cbffa9 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index 80b299cb6..d8ecdb4a0 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 61d028119..71f768c9c 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 6470a4a28..4508f0688 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: sysfs - image: linuxkit/sysfs:v0.2 + image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: ntpd - image: linuxkit/openntpd:v0.2 + image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 6557a0f12..d9d1fa721 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,28 +2,28 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: sysfs - image: linuxkit/sysfs:v0.2 + image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: ntpd - image: linuxkit/openntpd:v0.2 + image: linuxkit/openntpd:e3cd26ff2974f2d93c88c28efacf69e15bcdb983 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index c1d94006f..c9d61ac87 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 9d3e39ab6..ea02a509c 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index c2e3d692f..7e78cc11a 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a # with runc, logwrite, startmemlogd - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 # with runc, logwrite, startmemlogd + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 3d7e8936f..0b5962bd0 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 5760d81db..729cdc03e 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index a1d8f1cac..e99cb99c7 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:v0.2 + image: linuxkit/sshd:b24724013759bbcb084600d1157735ccfc9aa615 - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 49c34143f..6927a5904 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,18 +2,18 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d services: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index c69a0d838..660e4ec94 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,23 +2,23 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/src/cmd/linuxkit/vendor.conf b/src/cmd/linuxkit/vendor.conf index 8060ac422..2127f65e5 100644 --- a/src/cmd/linuxkit/vendor.conf +++ b/src/cmd/linuxkit/vendor.conf @@ -26,7 +26,7 @@ github.com/moby/datakit 97b3d230535397a813323902c23751e176481a86 github.com/moby/hyperkit a285521725f44f3d10ca1042c2c07d3a6e24bed8 # When updating also: # curl -fsSL -o src/cmd/linuxkit/build.go https://raw.githubusercontent.com/moby/tool/«hash»/cmd/moby/build.go -github.com/moby/tool c9d52b57874b36a474206a867d9bc3ea7bacaffe +github.com/moby/tool 749585dd13ad043087556c8a341c1dc99041639f github.com/moby/vpnkit 0e4293bb1058598c4b0a406ed171f52573ef414c github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 github.com/opencontainers/image-spec v1.0.0 diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/README.md b/src/cmd/linuxkit/vendor/github.com/moby/tool/README.md index 2d5aeff55..7f2909a9b 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/README.md +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/README.md @@ -2,13 +2,9 @@ [Moby Project](https://mobyproject.org) -The Moby Project is an open framework to assemble specialized container systems without reinventing the wheel. +The Moby Project is an open framework created by Docker to assemble specialized container systems without reinventing the wheel. -Moby is an open framework created by Docker to assemble specialized container systems without reinventing the wheel. It provides a “lego set” of dozens of standard components and a framework for assembling them into custom platforms. At the core of Moby is a framework to assemble specialized container systems which provides: - -* Components -* Tools -* Assemblies +At the core of Moby is a framework which provides a “lego set” of dozens of standard components and tools for assembling them into custom platforms. For more information, please visit the [Moby Project home page](https://mobyproject.org). diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go index 701fa1a82..7f88886b6 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/output.go @@ -14,16 +14,16 @@ import ( ) const ( - isoBios = "linuxkit/mkimage-iso-bios:3315508388e62f7a599fa5c2d5318e78017ef553" - isoEfi = "linuxkit/mkimage-iso-efi:6afada67184c7f68add9562375c662a4559eaa18" - rawBios = "linuxkit/mkimage-raw-bios:31e7ef4ed982bad6ab9ff1f1185514492c325571" - rawEfi = "linuxkit/mkimage-raw-efi:82db3af46d299be160590fb1633bbfebc891a927" - gcp = "linuxkit/mkimage-gcp:df4f46fbcabcfef84af2ff34ff1ef7e7673bc329" - vhd = "linuxkit/mkimage-vhd:796acfc515c22afb8f32d6b5c4bdd456b7f79d8c" - vmdk = "linuxkit/mkimage-vmdk:deb9018d06dbb9da29464a4320187ce7e4ae1856" - dynamicvhd = "linuxkit/mkimage-dynamic-vhd:172fb196713a4aff677b88422026512600b1ca55" - rpi3 = "linuxkit/mkimage-rpi3:553c6c2d13b7d54f6b73b3b0c1c15f2e47ffb0df" - qcow2Efi = "linuxkit/mkimage-qcow2-efi:9bc3de981188da099eaf44cc467f5bbb29c13033" + isoBios = "linuxkit/mkimage-iso-bios:8c1020d428e78cbe6fa9da023b94d2cb7994cfb9" + isoEfi = "linuxkit/mkimage-iso-efi:d1990ff78a7b15e6f1f368378f2120f55dcf30ab" + rawBios = "linuxkit/mkimage-raw-bios:fa0da669c33543bb04966338aa3091cff9f88398" + rawEfi = "linuxkit/mkimage-raw-efi:eb489af91687d2f8c0456c7058784c0ecba2107c" + gcp = "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1" + vhd = "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242" + vmdk = "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5" + dynamicvhd = "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6" + rpi3 = "linuxkit/mkimage-rpi3:e76686a5b4fad750bd857bfa239d777d4ab21d6f" + qcow2Efi = "linuxkit/mkimage-qcow2-efi:193ea2d93bbb437552cf58549f166e738d517c24" ) var outFuns = map[string]func(string, io.Reader, int) error{ diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index c30e8ad1e..8be95edf3 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 2acf9d485..503059751 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index f45702461..70d5ffb76 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 3701a98d0..23c67c0d9 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 3701a98d0..23c67c0d9 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 3701a98d0..23c67c0d9 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 3701a98d0..23c67c0d9 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index afdd9ba39..c34f4c157 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 3701a98d0..23c67c0d9 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index df9202ff3..c8f321a65 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df services: - name: acpid - image: linuxkit/acpid:v0.2 + image: linuxkit/acpid:a1399f824db917488d048c5e23ca3cec6e5317d8 trust: org: - linuxkit diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 5ab597b45..3b131a369 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.123 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 483ba79d3..d14191543 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.89 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index 63380c61f..07c7826f4 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 diff --git a/test/cases/020_kernel/007_config_4.15.x/test.yml b/test/cases/020_kernel/007_config_4.15.x/test.yml index 9c73252a7..db2292834 100644 --- a/test/cases/020_kernel/007_config_4.15.x/test.yml +++ b/test/cases/020_kernel/007_config_4.15.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.15.12 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index 58900e23f..022b92dc9 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.123 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 0500c4a2c..6a64189a7 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.89 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index f35c2dbc2..4cc1baf1a 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/017_kmod_4.15.x/test.yml b/test/cases/020_kernel/017_kmod_4.15.x/test.yml index d235fc780..1c3d95c51 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/test.yml +++ b/test/cases/020_kernel/017_kmod_4.15.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.15.12 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 50b73cf34..76338cb2f 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.123 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 49ed3e0df..4ef1aa1c8 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.89 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 trust: org: - linuxkit diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index f6cc9b7f1..2fddaa67d 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 trust: org: - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 3b59d8719..56e25e213 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,25 +2,25 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: sysfs - image: linuxkit/sysfs:v0.2 + image: linuxkit/sysfs:f7fc4dfbdc7e09f8aab0063699d9a75932b08c3f - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.2 + image: linuxkit/rngd:8bcfb9a90470161a04f25e58407852a3d1ad499a - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index dbc7c3b89..cd5bbad95 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 0267c944f..937cf90d6 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: binfmt - image: linuxkit/binfmt:v0.2 + image: linuxkit/binfmt:98398d827e80b56e487d2ae94ed86a0006acb702 - name: test image: alpine:3.7 binds: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 74984aaa6..23bbad0c5 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 2f85293ee..cb5b00eaa 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:0c99fe453549483a8706b369521393b61ef9c896 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index e8481eb9c..109bd964e 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: 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 dc304b807..e6dac29ab 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 @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 6a7f4e074..e5304a4d0 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,13 +2,13 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: extend - image: linuxkit/extend:v0.2 + image: linuxkit/extend:e824c312be97f73b27a91ae1b9462cf97953f8ca - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 83de7c8b0..e1ec26264 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 @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: modprobe - image: linuxkit/modprobe:v0.2 + image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 c880e39bf..40e279ef8 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: modprobe - image: linuxkit/modprobe:v0.2 + image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:v0.2 + image: linuxkit/extend:e824c312be97f73b27a91ae1b9462cf97953f8ca command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 2c0180e56..59fe54bea 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 @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 4e34a960a..a1a4fc3ae 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: extend - image: linuxkit/extend:v0.2 + image: linuxkit/extend:e824c312be97f73b27a91ae1b9462cf97953f8ca command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 fb6b35c4d..14242a880 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 @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 93d8f7fea..6114d9855 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 @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.7 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 f61ed1641..87c1b9368 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 @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.7 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 892cfe96e..b119f8caf 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 @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: modprobe - image: linuxkit/modprobe:v0.2 + image: linuxkit/modprobe:67d9b334e4d84f480158e0a4974f547a469489a0 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 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 1d7e5fbd0..ceb3f7a09 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 @@ -2,14 +2,14 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index ad7c01b85..c4b12f143 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,23 +2,23 @@ kernel: image: linuxkit/kernel:4.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 binds: - /check.sh:/check.sh command: ["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 088170316..ff483f146 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 @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:v0.2 + image: linuxkit/format:a0a0469c74e3c5617d2fdffb6c38e402133fb680 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:v0.2 + image: linuxkit/mount:03795dccf510edfc14aeb0ab5e87cd9f7da3586a command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 702bc5b88..3ff93c86a 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,17 +2,17 @@ kernel: image: linuxkit/kernel:4.9.x cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.2 + image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 402a754c9..61e398fcb 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: mkimage - image: linuxkit/mkimage:v0.2 + image: linuxkit/mkimage:dccd1028bc96b91702236be8bbacb04477aacc4c - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d trust: diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 2e04b902d..a65991860 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 9c52854a9..f140175e2 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,11 +2,11 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: sysctl - image: linuxkit/sysctl:v0.2 + image: linuxkit/sysctl:e7106b5e3db64a9ec21eb1479727627ecf52137d - name: test image: alpine:3.7 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 6ded53076..93a2c5a8f 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - - linuxkit/ca-certificates:v0.2 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df + - linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.2 + image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.2 + image: linuxkit/ip:14cd8bfc3a62e759ee6c925d697171ba18a91d70 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index b7c2833e2..e246f2793 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index f9e77a65a..ae05c9913 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,12 +4,12 @@ kernel: image: linuxkit/kernel:4.14.29 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 + - linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.2 + image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index db4acd687..42b4a77da 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 + - linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72 + - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: test-ns image: linuxkit/test-ns: