diff --git a/examples/addbinds.yml b/examples/addbinds.yml index e01fcdcd9..625d42f06 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 4707291e0..c455af552 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 6e3848eb6..8d2b6a766 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -19,10 +19,10 @@ onboot: image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba command: ["/usr/bin/mountie", "/dev/sda1", "/var/external"] - name: loop - image: linuxkit/losetup:db35344a21e44a55195540a8670886f60aa77201 + image: linuxkit/losetup:bd8b9d59785e9be62f8374c359c0736ad33744d4 command: ["/usr/bin/loopy", "--create", "/var/external/storage_file"] - name: dm-crypt - image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb + image: linuxkit/dm-crypt:313085c3279e5c64ef3777973a139f30e4a48306 command: ["/usr/bin/crypto", "crypt_loop_dev", "/dev/loop0"] - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index d9f8b298f..e0fac0f02 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc command: ["/usr/bin/format", "/dev/sda"] - name: dm-crypt - image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb + image: linuxkit/dm-crypt:313085c3279e5c64ef3777973a139f30e4a48306 command: ["/usr/bin/crypto", "crypt_dev", "/dev/sda1"] - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 7b9930372..11296a6a8 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -5,13 +5,13 @@ kernel: init: - linuxkit/vpnkit-expose-port:b0a5ede4c53aa718b48fb9a86e4725ab6ae7f96e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 - name: sysctl image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a - name: sysfs diff --git a/examples/docker.yml b/examples/docker.yml index 1badaa708..3cc8a8b94 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 4b85d6ef5..669501ffd 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 94b61c87a..e34e526f2 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index c6e856298..9277f7699 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: dhcpcd diff --git a/examples/logging.yml b/examples/logging.yml index bea57af84..28bbe26cd 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -4,8 +4,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/memlogd:9b0e8a5b3f67672234170d88833163caf7898984 onboot: @@ -27,4 +27,4 @@ services: - name: write-and-rotate-logs image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 - name: kmsg - image: linuxkit/kmsg:df84eda2a82d5e24ddfe241831af3efb13a1a557 + image: linuxkit/kmsg:fa82d93cab0c1efa178cc51ffb82b83cc011148e diff --git a/examples/minimal.yml b/examples/minimal.yml index 7f869a6e2..cad352e44 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f8bb49fdc..78b59f38e 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 services: - name: getty image: linuxkit/getty:ebe3397aa9b08e8f310121fdb0aac9406e1c8e73 diff --git a/examples/openstack.yml b/examples/openstack.yml index 564cb8e9d..a3f0b695b 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 command: ["/usr/bin/metadata", "openstack"] services: - name: rngd diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 544eafe1b..072aa6087 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 services: - name: rngd image: linuxkit/rngd:bdabfe138f05f7d48396d2f435af16f5a6ccaa45 diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index aece00507..6bb7de308 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index c5e420f82..47df77ab0 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 services: - name: getty image: linuxkit/getty:ebe3397aa9b08e8f310121fdb0aac9406e1c8e73 diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index de41c6ba3..becf82137 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -4,8 +4,8 @@ kernel: ucode: intel-ucode.cpio init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/firmware:1363380034cc23556e95d595b9beb8df55aa6cbf onboot: @@ -18,7 +18,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 command: ["/usr/bin/metadata", "hetzner"] services: - name: rngd diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index c19508d18..77a25669b 100644 --- a/examples/platform-packet.yml +++ b/examples/platform-packet.yml @@ -4,8 +4,8 @@ kernel: ucode: intel-ucode.cpio init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/firmware:1363380034cc23556e95d595b9beb8df55aa6cbf onboot: @@ -18,7 +18,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 command: ["/usr/bin/metadata", "packet"] services: - name: rngd diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index 02e693af0..16ec75721 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index a0415f9c5..081776659 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 services: - name: getty image: linuxkit/getty:ebe3397aa9b08e8f310121fdb0aac9406e1c8e73 diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index f8cc02a53..0c139a9cc 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index d82220ded..6c2e7dad5 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 command: ["/usr/bin/metadata", "vultr"] services: - name: getty diff --git a/examples/redis-os.yml b/examples/redis-os.yml index a9066db48..e4c846409 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -5,8 +5,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/examples/sshd.yml b/examples/sshd.yml index 1c61ada36..65109ad4d 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 9cacb5e9b..3f84d7dbe 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: ip image: linuxkit/ip:b98c32fab9c8997c5d05677af979f05dfcd8b3f1 diff --git a/examples/swap.yml b/examples/swap.yml index b9f108539..bb33de347 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 9d6ab9bc7..e3e250cf8 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 4bb49a8c8..7c2747fa9 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 74fe63396..227741e27 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 6fd3ea9ec..6a3391220 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 6163bb66d..80888040b 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index aefaeb744..0f6657e6a 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 as alpine +FROM linuxkit/alpine:12f0af976c42d4125a3ff3f5e636c95c0a7caa2a as alpine RUN apk add tzdata binutils WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/dm-crypt/build.yml b/pkg/dm-crypt/build.yml index a255f0c84..2553e55e9 100644 --- a/pkg/dm-crypt/build.yml +++ b/pkg/dm-crypt/build.yml @@ -3,6 +3,10 @@ config: binds: - /dev:/dev - /etc/dm-crypt:/etc/dm-crypt + devices: + # all devices (/dev/mapper is a character device) + - path: all + type: a capabilities: - CAP_SYS_ADMIN - CAP_MKNOD diff --git a/pkg/extend/build.yml b/pkg/extend/build.yml index 75c834692..bdedcfd83 100644 --- a/pkg/extend/build.yml +++ b/pkg/extend/build.yml @@ -2,6 +2,10 @@ image: extend config: binds: - /dev:/dev + devices: + # all block devices + - path: all + type: b capabilities: - CAP_SYS_ADMIN - CAP_MKNOD diff --git a/pkg/kmsg/build.yml b/pkg/kmsg/build.yml index 730796102..7dbfa0fb9 100644 --- a/pkg/kmsg/build.yml +++ b/pkg/kmsg/build.yml @@ -2,5 +2,11 @@ image: kmsg config: binds: - /dev/kmsg:/dev/kmsg + devices: + - path: "/dev/kmsg" + type: c + major: 1 + minor: 11 + mode: 0666 capabilities: - CAP_SYSLOG diff --git a/pkg/losetup/build.yml b/pkg/losetup/build.yml index 0f158a560..baf3f438b 100644 --- a/pkg/losetup/build.yml +++ b/pkg/losetup/build.yml @@ -3,5 +3,9 @@ config: binds: - /dev:/dev - /var:/var + devices: + # all block devices + - path: all + type: b capabilities: - CAP_SYS_ADMIN diff --git a/pkg/metadata/build.yml b/pkg/metadata/build.yml index 30425e602..fffc6c447 100644 --- a/pkg/metadata/build.yml +++ b/pkg/metadata/build.yml @@ -7,6 +7,10 @@ config: - /sys:/sys - /etc/resolv.conf:/etc/resolv.conf - /etc/ssl/certs:/etc/ssl/certs + devices: + # all block devices + - path: all + type: b tmpfs: - /tmp readonly: true diff --git a/pkg/mkimage/build.yml b/pkg/mkimage/build.yml index 9b69ad29e..c15e68095 100644 --- a/pkg/mkimage/build.yml +++ b/pkg/mkimage/build.yml @@ -8,3 +8,6 @@ config: - CAP_MKNOD binds: - /dev:/dev + devices: + - path: all + type: b diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index 10466a667..0f753b80a 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -12,7 +12,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off -ENV RUNC_COMMIT=v1.0.0-rc10 +ENV RUNC_COMMIT=v1.0.2 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 8e6144db9..66d10e3c1 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 065eca92e..370e51a2c 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index ad8d4ce9a..a84722a3e 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 3236f0161..9a3901c23 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 60770df1c..35f06aa7a 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 06a86abab..10fd874ee 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: sysctl image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 017222db2..cbb471f77 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -3,8 +3,8 @@ kernel: cmdline: "console=tty0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 6a4aa41a8..72a616c51 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/src/cmd/linuxkit/moby/config.go b/src/cmd/linuxkit/moby/config.go index d54243825..ead81f91e 100644 --- a/src/cmd/linuxkit/moby/config.go +++ b/src/cmd/linuxkit/moby/config.go @@ -747,9 +747,6 @@ func ConfigToOCI(yaml *Image, config imagespec.ImageConfig, idMap map[string]uin // default options match what Docker does procOptions := []string{"nosuid", "nodev", "noexec", "relatime"} devOptions := []string{"nosuid", "strictatime", "mode=755", "size=65536k"} - if readonly { - devOptions = append(devOptions, "ro") - } ptsOptions := []string{"nosuid", "noexec", "newinstance", "ptmxmode=0666", "mode=0620"} sysOptions := []string{"nosuid", "noexec", "nodev"} if readonly { diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 619335078..95827c816 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -19,10 +19,10 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: mkimage - image: linuxkit/mkimage:6a13c5814c95ccfb02518f8824a7c09bcea266fe + image: linuxkit/mkimage:fa71899c159d8c1ae63a02a22fe8db113c4e540c - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f trust: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 5eade05f8..983389391 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 79f4ee630..28c6c9d24 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -4,8 +4,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index b455df0c3..d5a23531a 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index d5df1277a..ef6a5cf8e 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index d5df1277a..ef6a5cf8e 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 c351eef36..71834576b 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 2a892b576..254b50ae6 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 2a892b576..254b50ae6 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 2a892b576..254b50ae6 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 2a892b576..254b50ae6 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 b4bda6066..c9814821c 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 2a892b576..254b50ae6 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 2a892b576..254b50ae6 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f 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 5137f2b47..681c6169c 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 services: - name: acpid image: linuxkit/acpid:d2ddd88c7918466f875e7c5c3e527b51dfb0b0ea diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 2a892b576..254b50ae6 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index 547d65a18..847113dbc 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:b916af1ec0ed92efb13b25899ef9e43970dab1c2 diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index 5abb575ab..3135cd176 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:b916af1ec0ed92efb13b25899ef9e43970dab1c2 diff --git a/test/cases/020_kernel/015_config_5.12.x/test.yml b/test/cases/020_kernel/015_config_5.12.x/test.yml index 9a42e6937..ec566586d 100644 --- a/test/cases/020_kernel/015_config_5.12.x/test.yml +++ b/test/cases/020_kernel/015_config_5.12.x/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:b916af1ec0ed92efb13b25899ef9e43970dab1c2 diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index b7db0a5dc..05d7302a9 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index 078e43e5f..9c3dd1f86 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/115_kmod_5.12.x/test.yml b/test/cases/020_kernel/115_kmod_5.12.x/test.yml index 1ecf39b38..3b68e75cf 100644 --- a/test/cases/020_kernel/115_kmod_5.12.x/test.yml +++ b/test/cases/020_kernel/115_kmod_5.12.x/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index f1715327c..c2c7ed2fc 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -3,4 +3,4 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 619c555d8..7ee6a1bd8 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index cbe313855..7887d7ee3 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: test image: alpine:3.13 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 47a138ab5..5eb66e805 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: binfmt image: linuxkit/binfmt:5567917e7de481e4867d31c7490a0ebdb70e04a5 diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index b2eba7d12..5066aa76c 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0 onboot: - name: bpftrace-test diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 15498294a..72749a14b 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 4724ccf02..a4c00b644 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: dhcpcd @@ -18,6 +18,6 @@ onboot: image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:701421314e1b114c4787255431e066a681e80f16 + image: linuxkit/test-containerd:77c4ad6aca18917b655342a9e758e9a164668496 - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 296894c3e..4f96df40d 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 4bb193e37..184ae6aee 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb + image: linuxkit/dm-crypt:313085c3279e5c64ef3777973a139f30e4a48306 command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.13 diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 646715971..bc99328da 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb + image: linuxkit/dm-crypt:313085c3279e5c64ef3777973a139f30e4a48306 command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] - name: test image: alpine:3.13 diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index 006ea44ba..ee1d28c7e 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dm-crypt - image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb + image: linuxkit/dm-crypt:313085c3279e5c64ef3777973a139f30e4a48306 command: ["/usr/bin/crypto", "-k", "/some/other/enc_key", "it_is_encrypted", "/dev/sda"] binds: - /dev/:/dev 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 c0cf5df93..5892fa852 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 2c3bc14e4..9028d63f6 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: extend - image: linuxkit/extend:d0d5e69ba5716bd48d260b15510ca258ae17f990 + image: linuxkit/extend:59d7fdc4aa8901f94e2506c41d7c7358463b83f9 - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba command: ["/usr/bin/mountie", "/var/lib/docker"] 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 ef2ab06af..90b47a347 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: modprobe image: linuxkit/modprobe:e2045c96cd2d3ef08eaf452396462d9205667690 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 0f5664468..dec3782cf 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -3,13 +3,13 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: modprobe image: linuxkit/modprobe:e2045c96cd2d3ef08eaf452396462d9205667690 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:d0d5e69ba5716bd48d260b15510ca258ae17f990 + image: linuxkit/extend:59d7fdc4aa8901f94e2506c41d7c7358463b83f9 command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba 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 6cc9cb890..9e2d110ba 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 9c31f33e9..9d62d1dab 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: extend - image: linuxkit/extend:d0d5e69ba5716bd48d260b15510ca258ae17f990 + image: linuxkit/extend:59d7fdc4aa8901f94e2506c41d7c7358463b83f9 command: ["/usr/bin/extend", "-type", "xfs"] - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index ccf4609ef..04ac40354 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 2c3bc14e4..9028d63f6 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: extend - image: linuxkit/extend:d0d5e69ba5716bd48d260b15510ca258ae17f990 + image: linuxkit/extend:59d7fdc4aa8901f94e2506c41d7c7358463b83f9 - name: mount image: linuxkit/mount:a9a5f731261891bd880e108e6fa2be5bac2f63ba command: ["/usr/bin/mountie", "/var/lib/docker"] 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 ab7230c36..7a6b58d2c 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 5a25ca063..d33683075 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 7ff40ca8d..02edf4d8e 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 1c9d25f7d..a77c8d683 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: modprobe image: linuxkit/modprobe:e2045c96cd2d3ef08eaf452396462d9205667690 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 15e2ab4ef..c21a23c84 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 02585b300..45fa95e50 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index 9c615f48e..aeb973e8c 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc 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 ca750296c..fa8849784 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 @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format image: linuxkit/format:cf335053c7d0b4cd8cc2d136e9392ea5904a71dc diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index a57b42627..4c35d49e2 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: dhcpcd diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index 06289ffdf..f961f7ccb 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: metadata - image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d + image: linuxkit/metadata:a18ef20139eba44a80e1213c746471dc67d1b023 - name: test image: alpine:3.13 binds: diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 3cfc1e7cc..ffb025987 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -3,10 +3,10 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: losetup - image: linuxkit/losetup:db35344a21e44a55195540a8670886f60aa77201 + image: linuxkit/losetup:bd8b9d59785e9be62f8374c359c0736ad33744d4 command: ["/usr/bin/loopy", "-c", "/var/test.img"] - name: test image: alpine:3.13 @@ -14,6 +14,10 @@ onboot: binds: - /check.sh:/check.sh - /dev:/dev + devices: + # all block devices + - path: all + type: b command: ["sh", "./check.sh"] - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 6fcd8fb48..73e31f280 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -3,9 +3,9 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: mkimage - image: linuxkit/mkimage:6a13c5814c95ccfb02518f8824a7c09bcea266fe + image: linuxkit/mkimage:fa71899c159d8c1ae63a02a22fe8db113c4e540c - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 2f90ea6b2..3749966c8 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index dc256d3ef..521b50e33 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: sysctl image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml index 6fd6104a2..2bd8e5fa2 100644 --- a/test/cases/040_packages/020_init_containerd/test.yml +++ b/test/cases/040_packages/020_init_containerd/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a services: - name: test @@ -13,6 +13,12 @@ services: binds: - /check.sh:/check.sh - /dev/console:/dev/console + devices: + - path: "/dev/console" + type: c + major: 5 + minor: 1 + mode: "0666" capabilities: - CAP_SYS_BOOT command: ["sh", "/check.sh"] diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index c13224bad..c3edd8b5a 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: - name: dhcpcd diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index e27cf9ba5..a4528aaa5 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/memlogd:9b0e8a5b3f67672234170d88833163caf7898984 services: @@ -21,6 +21,12 @@ services: - /check.sh:/check.sh - /dev/console:/dev/console - /var/log:/var/log + devices: + - path: "/dev/console" + type: c + major: 5 + minor: 1 + mode: "0666" command: ["sh", "./check.sh"] pid: host capabilities: diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index b2987523e..2c3a86ae0 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -3,13 +3,13 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/memlogd:9b0e8a5b3f67672234170d88833163caf7898984 services: - name: kmsg - image: linuxkit/kmsg:df84eda2a82d5e24ddfe241831af3efb13a1a557 + image: linuxkit/kmsg:fa82d93cab0c1efa178cc51ffb82b83cc011148e - name: write-and-rotate-logs image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 - name: check-the-logs @@ -18,6 +18,12 @@ services: - /check.sh:/check.sh - /dev/console:/dev/console - /var/log:/var/log + devices: + - path: "/dev/console" + type: c + major: 5 + minor: 1 + mode: "0666" command: ["sh", "./check.sh"] pid: host capabilities: diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index cc29e731e..ff5f97e11 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/kernel-bcc:5.4.113 onboot: - name: check-bcc diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d5f399d07..249bb6599 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -3,8 +3,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 31d78110d..ff860f67b 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -5,8 +5,8 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - - linuxkit/containerd:cc02c2af9c928c2faeccbe4edc78bd297ad91866 + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 + - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: - name: dhcpcd image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 6171b56b6..c21f32122 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror +FROM linuxkit/alpine:12f0af976c42d4125a3ff3f5e636c95c0a7caa2a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml index 52b324254..d62e24de3 100644 --- a/test/pkg/containerd/build.yml +++ b/test/pkg/containerd/build.yml @@ -11,6 +11,10 @@ config: - /usr/bin/runc:/usr/bin/runc - /usr/bin/containerd:/usr/bin/containerd - /usr/bin/containerd-shim:/usr/bin/containerd-shim + devices: + # all block devices + - path: all + type: b mounts: - type: cgroup options: ["rw","nosuid","noexec","nodev","relatime"] diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 80b59629e..88bfb7d11 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 - - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: test-ns image: linuxkit/test-ns: diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 620bd2cce..278bb6251 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -23,14 +23,6 @@ RUN for repopkgs in /tmp/packages.repo.*; do \ apk update --repositories-file=${repofile} --cache-dir ${cachedir} && \ apk fetch --repositories-file=${repofile} --cache-dir ${cachedir} --recursive -o /mirror/$(apk --print-arch) $(cat ${mergedfile}); done -# we CANNOT allow musl-dev or musl > 1.2.2-r0, which ships with alpine:3.13, because 1.2.2-r2, which ships with alpine:edge / alpine:3.14 -# uses the new faccessat2 system call which gives errors, see https://wiki.alpinelinux.org/wiki/Draft_Release_Notes_for_Alpine_3.14.0#faccessat2 -RUN target="1.2.2-r0" && \ - verlte() { [ "$1" = $(printf '%s\n%s' "$1" "$2" | sort -V | head -n1) ] ; } && \ - for file in /mirror/$(apk --print-arch)/musl-*.apk; do \ - version=$(tar -xf ${file} -O .PKGINFO | awk '$1 == "pkgver" {print $3}') && \ - if ! verlte ${version} ${target} ; then echo "removing ${file}" && rm ${file}; fi; done - # install abuild and sudo for signing RUN apk add --no-cache abuild sudo @@ -61,7 +53,7 @@ RUN go get -u github.com/LK4D4/vndr # when building, note that containerd does not use go modules in the below commit, # while go1.16 defaults to using it, so must disable with GO111MODULE=off ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.4.4 +ENV CONTAINERD_COMMIT=v1.4.11 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/push-manifest.sh b/tools/alpine/push-manifest.sh index a457cef92..f074eabed 100755 --- a/tools/alpine/push-manifest.sh +++ b/tools/alpine/push-manifest.sh @@ -20,7 +20,7 @@ IMG_s390x=$(head -1 versions.s390x | sed 's,[#| ]*,,') # Extract the TAG from the tree hash - just like how "linuxkit pkg show-tag" does it - name and build the manifest target name TAG=$(git ls-tree --full-tree HEAD -- $(pwd) | awk '{print $3}') DIRTY=$(git diff-index HEAD -- $(pwd)) -if [ -n "$DIRTY"]; then +if [ -n "$DIRTY" ]; then echo "will not push out manifest when git tree is dirty" >&2 exit 1 fi diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 375cfc1ed..792adcfc6 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,9 +1,9 @@ -# linuxkit/alpine:4967a81f63c6fab8cfa686ba051ebe8e0f0fd8ee- +# linuxkit/alpine:240ccc905805c2b24d7b552603c972912026e8e0-arm64 # automatically generated list of installed packages abuild-3.7.0-r0 alpine-baselayout-3.2.0-r8 -alpine-keys-2.2-r0 -apk-tools-2.12.5-r0 +alpine-keys-2.4-r0 +apk-tools-2.12.7-r0 argon2-libs-20190702-r1 argp-standalone-1.3-r4 attr-2.4.48-r0 @@ -17,7 +17,7 @@ bash-5.1.0-r0 bc-1.07.1-r1 binutils-2.35.2-r1 binutils-dev-2.35.2-r1 -binutils-gold-2.35.2-r1 +binutils-gold-2.37-r3 bison-3.7.4-r0 blkid-2.36.1-r1 bridge-utils-1.7-r0 @@ -34,7 +34,7 @@ ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 cdrkit-1.1.11-r3 cfdisk-2.36.1-r1 -cifs-utils-6.12-r0 +cifs-utils-6.13-r0 clang-10.0.1-r0 clang-dev-10.0.1-r0 clang-extra-tools-10.0.1-r0 @@ -45,14 +45,14 @@ coreutils-8.32-r2 cryptsetup-2.3.4-r1 cryptsetup-libs-2.3.4-r1 cryptsetup-openrc-2.3.4-r1 -curl-7.76.1-r0 +curl-7.79.1-r0 dbus-libs-1.12.20-r1 device-mapper-2.02.187-r1 device-mapper-event-libs-2.02.187-r1 device-mapper-libs-2.02.187-r1 device-mapper-udev-2.02.187-r1 -dhcpcd-8.1.6-r1 -dhcpcd-openrc-8.1.6-r1 +dhcpcd-8.1.9-r0 +dhcpcd-openrc-8.1.9-r0 diffutils-3.7-r0 dosfstools-4.1-r1 dtc-1.6.0-r1 @@ -90,10 +90,10 @@ git-perl-2.30.2-r0 glib-2.66.8-r0 gmp-6.2.1-r0 gmp-dev-6.2.1-r0 -gnupg-2.2.27-r0 +gnupg-2.2.31-r0 gnutls-3.7.1-r0 -go-1.16.4-r0 -grep-3.6-r0 +go-1.17.2-r0 +grep-3.7-r0 guile-2.0.14-r2 guile-libs-2.0.14-r2 hexdump-2.36.1-r1 @@ -124,9 +124,9 @@ kmod-28-r0 kmod-libs-28-r0 kmod-openrc-28-r0 krb5-conf-1.0-r2 -krb5-dev-1.18.3-r1 -krb5-libs-1.18.3-r1 -krb5-server-ldap-1.18.3-r1 +krb5-dev-1.18.4-r0 +krb5-libs-1.18.4-r0 +krb5-server-ldap-1.18.4-r0 libacl-2.2.53-r0 libaio-0.3.112-r1 libarchive-3.5.1-r0 @@ -140,13 +140,13 @@ libburn-1.5.2-r0 libbz2-1.0.8-r1 libc-dev-0.7.2-r3 libc-utils-0.7.2-r3 -libc6-compat-1.2.2-r0 +libc6-compat-1.2.2-r1 libcap-2.46-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.45.7-r0 -libcrypto1.1-1.1.1k-r0 -libcurl-7.76.1-r0 +libcrypto1.1-1.1.1l-r0 +libcurl-7.79.1-r0 libdrm-2.4.104-r0 libeconf-0.3.8-r0 libedit-20191231.3.1-r1 @@ -159,8 +159,8 @@ libfdisk-2.36.1-r1 libfdt-1.6.0-r1 libffi-3.3-r2 libgcc-10.2.1_pre1-r3 -libgcc-10.3.1_git20210424-r0 -libgcrypt-1.8.7-r0 +libgcc-10.3.1_git20210921-r1 +libgcrypt-1.8.8-r1 libgmpxx-6.2.1-r0 libgomp-10.2.1_pre1-r3 libgpg-error-1.41-r0 @@ -190,9 +190,9 @@ libseccomp-dev-2.5.1-r1 libseccomp-static-2.5.1-r1 libsecret-0.20.4-r0 libsmartcols-2.36.1-r1 -libssl1.1-1.1.1k-r0 +libssl1.1-1.1.1l-r0 libstdc++-10.2.1_pre1-r3 -libstdc++-10.3.1_git20210424-r0 +libstdc++-10.3.1_git20210921-r1 libtasn1-4.16.0-r1 libtirpc-1.3.1-r0 libtirpc-conf-1.3.1-r0 @@ -210,12 +210,12 @@ libuuid-2.36.1-r1 libuv-1.40.0-r0 libverto-0.3.1-r1 libwbclient-4.13.8-r0 -libx11-1.7.0-r0 +libx11-1.7.1-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxkbcommon-1.0.3-r0 -libxml2-2.9.10-r6 +libxml2-2.9.12-r0 linux-headers-5.7.8-r0 llvm10-10.0.1-r1 llvm10-dev-10.0.1-r1 @@ -226,7 +226,9 @@ lsscsi-0.31-r0 lua5.3-libs-5.3.6-r0 luajit-2.2.0-r3 luajit-dev-2.2.0-r3 +lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 +lvm2-openrc-2.02.187-r1 lz4-libs-1.9.2-r0 lzip-1.21-r0 lzo-2.10-r2 @@ -242,34 +244,35 @@ mpfr4-4.1.0-r0 mtools-4.0.26-r0 multipath-tools-0.8.5-r0 multipath-tools-openrc-0.8.5-r0 -musl-1.2.2-r0 -musl-dev-1.2.2-r0 -musl-utils-1.2.2-r0 +musl-1.2.2-r1 +musl-1.2.2-r7 +musl-dev-1.2.2-r1 +musl-utils-1.2.2-r1 ncurses-dev-6.2_p20210109-r0 ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 -nettle-3.7.2-r0 +nettle-3.7.3-r0 nfs-utils-2.5.2-r0 nfs-utils-openrc-2.5.2-r0 nghttp2-libs-1.42.0-r1 npth-1.6-r0 oniguruma-6.9.6-r0 -open-iscsi-2.1.3-r0 -open-iscsi-libs-2.1.3-r0 -open-iscsi-openrc-2.1.3-r0 +open-iscsi-2.1.3-r1 +open-iscsi-libs-2.1.3-r1 +open-iscsi-openrc-2.1.3-r1 open-isns-lib-0.100-r0 openntpd-6.8_p1-r0 -openrc-0.42.1-r19 +openrc-0.42.1-r20 openresolv-3.12.0-r0 -openssh-client-8.4_p1-r3 -openssh-keygen-8.4_p1-r3 -openssh-server-8.4_p1-r3 -openssh-server-common-8.4_p1-r3 -openssl-1.1.1k-r0 -openssl-dev-1.1.1k-r0 +openssh-client-8.4_p1-r4 +openssh-keygen-8.4_p1-r4 +openssh-server-8.4_p1-r4 +openssh-server-common-8.4_p1-r4 +openssl-1.1.1l-r0 +openssl-dev-1.1.1l-r0 p11-kit-0.23.22-r0 partx-2.36.1-r1 -patch-2.7.6-r6 +patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 pcsc-lite-libs-1.9.0-r0 @@ -296,8 +299,8 @@ readline-8.1.0-r0 rhash-libs-1.4.1-r0 rpcbind-1.2.5-r0 rpcbind-openrc-1.2.5-r0 -rsync-3.2.3-r1 -rsync-openrc-3.2.3-r1 +rsync-3.2.3-r4 +rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.0-r0 samba-util-libs-4.13.8-r0 scanelf-1.2.8-r0 @@ -314,7 +317,7 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r0 sqlite-libs-3.34.1-r0 -squashfs-tools-4.4-r1 +squashfs-tools-4.5-r0 ssl_client-1.32.1-r6 strace-5.10-r0 swig-4.0.2-r0 @@ -324,7 +327,7 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r0 tini-0.19.0-r0 -tzdata-2021a-r0 +tzdata-2021d-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.1-r0 @@ -334,7 +337,7 @@ util-linux-openrc-2.36.1-r1 utmps-0.1.0.0-r0 utmps-openrc-0.1.0.0-r0 vde2-libs-2.3.2-r12 -vim-8.2.2320-r0 +vim-8.2.3437-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.18.0-r5 wireguard-tools-1.0.20200827-r1 @@ -347,7 +350,7 @@ xfsprogs-5.10.0-r0 xfsprogs-extra-5.10.0-r0 xkeyboard-config-2.31-r0 xorriso-1.5.2-r0 -xxd-8.2.2320-r0 +xxd-8.2.3437-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 @@ -357,4 +360,4 @@ zfs-openrc-2.0.1-r0 zlib-1.2.11-r3 zlib-dev-1.2.11-r3 zlib-static-1.2.11-r3 -zstd-libs-1.4.5-r3 +zstd-libs-1.4.9-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 413ed121d..6883d640f 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,9 +1,9 @@ -# linuxkit/alpine:9708a9b3d80a167a80091144e2ee03aa96dcd70d- +# linuxkit/alpine:1b5c24936fdf0dc30d63d4f4e1d441fca6076962- # automatically generated list of installed packages abuild-3.7.0-r0 alpine-baselayout-3.2.0-r8 -alpine-keys-2.2-r0 -apk-tools-2.12.5-r0 +alpine-keys-2.4-r0 +apk-tools-2.12.7-r0 argon2-libs-20190702-r1 argp-standalone-1.3-r4 attr-2.4.48-r0 @@ -16,6 +16,7 @@ automake-1.16.3-r0 bash-5.1.0-r0 bc-1.07.1-r1 binutils-2.35.2-r1 +binutils-2.37-r3 binutils-dev-2.35.2-r1 bison-3.7.4-r0 blkid-2.36.1-r1 @@ -33,7 +34,7 @@ ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 cdrkit-1.1.11-r3 cfdisk-2.36.1-r1 -cifs-utils-6.12-r0 +cifs-utils-6.13-r0 clang-10.0.1-r0 clang-dev-10.0.1-r0 clang-extra-tools-10.0.1-r0 @@ -44,14 +45,14 @@ coreutils-8.32-r2 cryptsetup-2.3.4-r1 cryptsetup-libs-2.3.4-r1 cryptsetup-openrc-2.3.4-r1 -curl-7.76.1-r0 +curl-7.79.1-r0 dbus-libs-1.12.20-r1 device-mapper-2.02.187-r1 device-mapper-event-libs-2.02.187-r1 device-mapper-libs-2.02.187-r1 device-mapper-udev-2.02.187-r1 -dhcpcd-8.1.6-r1 -dhcpcd-openrc-8.1.6-r1 +dhcpcd-8.1.9-r0 +dhcpcd-openrc-8.1.9-r0 diffutils-3.7-r0 dosfstools-4.1-r1 dtc-1.6.0-r1 @@ -79,7 +80,7 @@ fts-dev-1.2.7-r1 g++-10.2.1_pre1-r3 gc-8.0.4-r4 gcc-10.2.1_pre1-r3 -gcc-10.3.1_git20210424-r0 +gcc-10.3.1_git20210921-r1 gdbm-1.19-r0 gettext-0.20.2-r2 gettext-asprintf-0.20.2-r2 @@ -90,10 +91,10 @@ git-perl-2.30.2-r0 glib-2.66.8-r0 gmp-6.2.1-r0 gmp-dev-6.2.1-r0 -gnupg-2.2.27-r0 +gnupg-2.2.31-r0 gnutls-3.7.1-r0 -go-1.16.4-r0 -grep-3.6-r0 +go-1.17.2-r0 +grep-3.7-r0 guile-2.0.14-r2 guile-libs-2.0.14-r2 hexdump-2.36.1-r1 @@ -124,16 +125,16 @@ kmod-28-r0 kmod-libs-28-r0 kmod-openrc-28-r0 krb5-conf-1.0-r2 -krb5-dev-1.18.3-r1 -krb5-libs-1.18.3-r1 -krb5-server-ldap-1.18.3-r1 +krb5-dev-1.18.4-r0 +krb5-libs-1.18.4-r0 +krb5-server-ldap-1.18.4-r0 libacl-2.2.53-r0 libaio-0.3.112-r1 libarchive-3.5.1-r0 libarchive-tools-3.5.1-r0 libassuan-2.5.4-r0 libatomic-10.2.1_pre1-r3 -libatomic-10.3.1_git20210424-r0 +libatomic-10.3.1_git20210921-r1 libattr-2.4.48-r0 libblkid-2.36.1-r1 libbsd-0.10.0-r0 @@ -141,13 +142,13 @@ libburn-1.5.2-r0 libbz2-1.0.8-r1 libc-dev-0.7.2-r3 libc-utils-0.7.2-r3 -libc6-compat-1.2.2-r0 +libc6-compat-1.2.2-r1 libcap-2.46-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.45.7-r0 -libcrypto1.1-1.1.1k-r0 -libcurl-7.76.1-r0 +libcrypto1.1-1.1.1l-r0 +libcurl-7.79.1-r0 libdrm-2.4.104-r0 libeconf-0.3.8-r0 libedit-20191231.3.1-r1 @@ -160,14 +161,14 @@ libfdisk-2.36.1-r1 libfdt-1.6.0-r1 libffi-3.3-r2 libgcc-10.2.1_pre1-r3 -libgcc-10.3.1_git20210424-r0 -libgcrypt-1.8.7-r0 +libgcc-10.3.1_git20210921-r1 +libgcrypt-1.8.8-r1 libgmpxx-6.2.1-r0 libgomp-10.2.1_pre1-r3 -libgomp-10.3.1_git20210424-r0 +libgomp-10.3.1_git20210921-r1 libgpg-error-1.41-r0 libgphobos-10.2.1_pre1-r3 -libgphobos-10.3.1_git20210424-r0 +libgphobos-10.3.1_git20210921-r1 libintl-0.20.2-r2 libisoburn-1.5.2-r0 libisofs-1.5.2-r0 @@ -193,9 +194,9 @@ libseccomp-dev-2.5.1-r1 libseccomp-static-2.5.1-r1 libsecret-0.20.4-r0 libsmartcols-2.36.1-r1 -libssl1.1-1.1.1k-r0 +libssl1.1-1.1.1l-r0 libstdc++-10.2.1_pre1-r3 -libstdc++-10.3.1_git20210424-r0 +libstdc++-10.3.1_git20210921-r1 libtasn1-4.16.0-r1 libtirpc-1.3.1-r0 libtirpc-conf-1.3.1-r0 @@ -211,12 +212,12 @@ libuuid-2.36.1-r1 libuv-1.40.0-r0 libverto-0.3.1-r1 libwbclient-4.13.8-r0 -libx11-1.7.0-r0 +libx11-1.7.1-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxkbcommon-1.0.3-r0 -libxml2-2.9.10-r6 +libxml2-2.9.12-r0 linux-headers-5.7.8-r0 llvm10-10.0.1-r1 llvm10-dev-10.0.1-r1 @@ -225,7 +226,9 @@ llvm10-static-10.0.1-r1 lsblk-2.36.1-r1 lsscsi-0.31-r0 lua5.3-libs-5.3.6-r0 +lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 +lvm2-openrc-2.02.187-r1 lz4-libs-1.9.2-r0 lzip-1.21-r0 lzo-2.10-r2 @@ -242,34 +245,36 @@ mpfr4-4.1.0-r0 mtools-4.0.26-r0 multipath-tools-0.8.5-r0 multipath-tools-openrc-0.8.5-r0 -musl-1.2.2-r0 -musl-dev-1.2.2-r0 -musl-utils-1.2.2-r0 +musl-1.2.2-r1 +musl-1.2.2-r7 +musl-dev-1.2.2-r1 +musl-dev-1.2.2-r7 +musl-utils-1.2.2-r1 ncurses-dev-6.2_p20210109-r0 ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 -nettle-3.7.2-r0 +nettle-3.7.3-r0 nfs-utils-2.5.2-r0 nfs-utils-openrc-2.5.2-r0 nghttp2-libs-1.42.0-r1 npth-1.6-r0 oniguruma-6.9.6-r0 -open-iscsi-2.1.3-r0 -open-iscsi-libs-2.1.3-r0 -open-iscsi-openrc-2.1.3-r0 +open-iscsi-2.1.3-r1 +open-iscsi-libs-2.1.3-r1 +open-iscsi-openrc-2.1.3-r1 open-isns-lib-0.100-r0 openntpd-6.8_p1-r0 -openrc-0.42.1-r19 +openrc-0.42.1-r20 openresolv-3.12.0-r0 -openssh-client-8.4_p1-r3 -openssh-keygen-8.4_p1-r3 -openssh-server-8.4_p1-r3 -openssh-server-common-8.4_p1-r3 -openssl-1.1.1k-r0 -openssl-dev-1.1.1k-r0 +openssh-client-8.4_p1-r4 +openssh-keygen-8.4_p1-r4 +openssh-server-8.4_p1-r4 +openssh-server-common-8.4_p1-r4 +openssl-1.1.1l-r0 +openssl-dev-1.1.1l-r0 p11-kit-0.23.22-r0 partx-2.36.1-r1 -patch-2.7.6-r6 +patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 pcsc-lite-libs-1.9.0-r0 @@ -296,8 +301,8 @@ readline-8.1.0-r0 rhash-libs-1.4.1-r0 rpcbind-1.2.5-r0 rpcbind-openrc-1.2.5-r0 -rsync-3.2.3-r1 -rsync-openrc-3.2.3-r1 +rsync-3.2.3-r4 +rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.0-r0 samba-util-libs-4.13.8-r0 scanelf-1.2.8-r0 @@ -314,7 +319,7 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r0 sqlite-libs-3.34.1-r0 -squashfs-tools-4.4-r1 +squashfs-tools-4.5-r0 ssl_client-1.32.1-r6 swig-4.0.2-r0 talloc-2.3.1-r0 @@ -323,7 +328,7 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r0 tini-0.19.0-r0 -tzdata-2021a-r0 +tzdata-2021d-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.1-r0 @@ -333,7 +338,7 @@ util-linux-openrc-2.36.1-r1 utmps-0.1.0.0-r0 utmps-openrc-0.1.0.0-r0 vde2-libs-2.3.2-r12 -vim-8.2.2320-r0 +vim-8.2.3437-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.18.0-r5 wireguard-tools-1.0.20200827-r1 @@ -346,7 +351,7 @@ xfsprogs-5.10.0-r0 xfsprogs-extra-5.10.0-r0 xkeyboard-config-2.31-r0 xorriso-1.5.2-r0 -xxd-8.2.2320-r0 +xxd-8.2.3437-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 @@ -356,4 +361,4 @@ zfs-openrc-2.0.1-r0 zlib-1.2.11-r3 zlib-dev-1.2.11-r3 zlib-static-1.2.11-r3 -zstd-libs-1.4.5-r3 +zstd-libs-1.4.9-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index d43a7be18..f0b602861 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,9 +1,9 @@ -# linuxkit/alpine:b3028815dbf119404ab68a25acfcf84c585ab432- +# linuxkit/alpine:375b78ac15e07d6bdb764f6de9f02a7244fc42c3-amd64 # automatically generated list of installed packages abuild-3.7.0-r0 alpine-baselayout-3.2.0-r8 -alpine-keys-2.2-r0 -apk-tools-2.12.5-r0 +alpine-keys-2.4-r0 +apk-tools-2.12.7-r0 argon2-libs-20190702-r1 argp-standalone-1.3-r4 attr-2.4.48-r0 @@ -16,6 +16,7 @@ automake-1.16.3-r0 bash-5.1.0-r0 bc-1.07.1-r1 binutils-2.35.2-r1 +binutils-2.37-r3 binutils-dev-2.35.2-r1 bison-3.7.4-r0 blkid-2.36.1-r1 @@ -33,7 +34,7 @@ ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 cdrkit-1.1.11-r3 cfdisk-2.36.1-r1 -cifs-utils-6.12-r0 +cifs-utils-6.13-r0 clang-10.0.1-r0 clang-dev-10.0.1-r0 clang-extra-tools-10.0.1-r0 @@ -44,14 +45,14 @@ coreutils-8.32-r2 cryptsetup-2.3.4-r1 cryptsetup-libs-2.3.4-r1 cryptsetup-openrc-2.3.4-r1 -curl-7.76.1-r0 +curl-7.79.1-r0 dbus-libs-1.12.20-r1 device-mapper-2.02.187-r1 device-mapper-event-libs-2.02.187-r1 device-mapper-libs-2.02.187-r1 device-mapper-udev-2.02.187-r1 -dhcpcd-8.1.6-r1 -dhcpcd-openrc-8.1.6-r1 +dhcpcd-8.1.9-r0 +dhcpcd-openrc-8.1.9-r0 diffutils-3.7-r0 dosfstools-4.1-r1 dtc-1.6.0-r1 @@ -79,7 +80,7 @@ fts-dev-1.2.7-r1 g++-10.2.1_pre1-r3 gc-8.0.4-r4 gcc-10.2.1_pre1-r3 -gcc-10.3.1_git20210424-r0 +gcc-10.3.1_git20210921-r1 gdbm-1.19-r0 gettext-0.20.2-r2 gettext-asprintf-0.20.2-r2 @@ -90,10 +91,10 @@ git-perl-2.30.2-r0 glib-2.66.8-r0 gmp-6.2.1-r0 gmp-dev-6.2.1-r0 -gnupg-2.2.27-r0 +gnupg-2.2.31-r0 gnutls-3.7.1-r0 -go-1.16.4-r0 -grep-3.6-r0 +go-1.17.2-r0 +grep-3.7-r0 guile-2.0.14-r2 guile-libs-2.0.14-r2 gummiboot-48.1-r0 @@ -125,9 +126,9 @@ kmod-28-r0 kmod-libs-28-r0 kmod-openrc-28-r0 krb5-conf-1.0-r2 -krb5-dev-1.18.3-r1 -krb5-libs-1.18.3-r1 -krb5-server-ldap-1.18.3-r1 +krb5-dev-1.18.4-r0 +krb5-libs-1.18.4-r0 +krb5-server-ldap-1.18.4-r0 lddtree-1.26-r2 libacl-2.2.53-r0 libaio-0.3.112-r1 @@ -135,7 +136,7 @@ libarchive-3.5.1-r0 libarchive-tools-3.5.1-r0 libassuan-2.5.4-r0 libatomic-10.2.1_pre1-r3 -libatomic-10.3.1_git20210424-r0 +libatomic-10.3.1_git20210921-r1 libattr-2.4.48-r0 libblkid-2.36.1-r1 libbsd-0.10.0-r0 @@ -143,13 +144,13 @@ libburn-1.5.2-r0 libbz2-1.0.8-r1 libc-dev-0.7.2-r3 libc-utils-0.7.2-r3 -libc6-compat-1.2.2-r0 +libc6-compat-1.2.2-r1 libcap-2.46-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.45.7-r0 -libcrypto1.1-1.1.1k-r0 -libcurl-7.76.1-r0 +libcrypto1.1-1.1.1l-r0 +libcurl-7.79.1-r0 libdrm-2.4.104-r0 libeconf-0.3.8-r0 libedit-20191231.3.1-r1 @@ -162,14 +163,14 @@ libfdisk-2.36.1-r1 libfdt-1.6.0-r1 libffi-3.3-r2 libgcc-10.2.1_pre1-r3 -libgcc-10.3.1_git20210424-r0 -libgcrypt-1.8.7-r0 +libgcc-10.3.1_git20210921-r1 +libgcrypt-1.8.8-r1 libgmpxx-6.2.1-r0 libgomp-10.2.1_pre1-r3 -libgomp-10.3.1_git20210424-r0 +libgomp-10.3.1_git20210921-r1 libgpg-error-1.41-r0 libgphobos-10.2.1_pre1-r3 -libgphobos-10.3.1_git20210424-r0 +libgphobos-10.3.1_git20210921-r1 libintl-0.20.2-r2 libisoburn-1.5.2-r0 libisofs-1.5.2-r0 @@ -197,9 +198,9 @@ libseccomp-dev-2.5.1-r1 libseccomp-static-2.5.1-r1 libsecret-0.20.4-r0 libsmartcols-2.36.1-r1 -libssl1.1-1.1.1k-r0 +libssl1.1-1.1.1l-r0 libstdc++-10.2.1_pre1-r3 -libstdc++-10.3.1_git20210424-r0 +libstdc++-10.3.1_git20210921-r1 libtasn1-4.16.0-r1 libtirpc-1.3.1-r0 libtirpc-conf-1.3.1-r0 @@ -217,12 +218,12 @@ libuuid-2.36.1-r1 libuv-1.40.0-r0 libverto-0.3.1-r1 libwbclient-4.13.8-r0 -libx11-1.7.0-r0 +libx11-1.7.1-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxkbcommon-1.0.3-r0 -libxml2-2.9.10-r6 +libxml2-2.9.12-r0 linux-headers-5.7.8-r0 llvm10-10.0.1-r1 llvm10-dev-10.0.1-r1 @@ -233,7 +234,9 @@ lsscsi-0.31-r0 lua5.3-libs-5.3.6-r0 luajit-2.2.0-r3 luajit-dev-2.2.0-r3 +lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 +lvm2-openrc-2.02.187-r1 lz4-libs-1.9.2-r0 lzip-1.21-r0 lzo-2.10-r2 @@ -251,21 +254,23 @@ mpfr4-4.1.0-r0 mtools-4.0.26-r0 multipath-tools-0.8.5-r0 multipath-tools-openrc-0.8.5-r0 -musl-1.2.2-r0 -musl-dev-1.2.2-r0 -musl-utils-1.2.2-r0 +musl-1.2.2-r1 +musl-1.2.2-r7 +musl-dev-1.2.2-r1 +musl-dev-1.2.2-r7 +musl-utils-1.2.2-r1 ncurses-dev-6.2_p20210109-r0 ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 -nettle-3.7.2-r0 +nettle-3.7.3-r0 nfs-utils-2.5.2-r0 nfs-utils-openrc-2.5.2-r0 nghttp2-libs-1.42.0-r1 npth-1.6-r0 oniguruma-6.9.6-r0 -open-iscsi-2.1.3-r0 -open-iscsi-libs-2.1.3-r0 -open-iscsi-openrc-2.1.3-r0 +open-iscsi-2.1.3-r1 +open-iscsi-libs-2.1.3-r1 +open-iscsi-openrc-2.1.3-r1 open-isns-lib-0.100-r0 open-vm-tools-11.2.0-r0 open-vm-tools-deploypkg-11.2.0-r0 @@ -274,18 +279,18 @@ open-vm-tools-openrc-11.2.0-r0 open-vm-tools-static-11.2.0-r0 open-vm-tools-vmbackup-11.2.0-r0 openntpd-6.8_p1-r0 -openrc-0.42.1-r19 +openrc-0.42.1-r20 openresolv-3.12.0-r0 -openssh-client-8.4_p1-r3 -openssh-keygen-8.4_p1-r3 -openssh-server-8.4_p1-r3 -openssh-server-common-8.4_p1-r3 -openssl-1.1.1k-r0 -openssl-dev-1.1.1k-r0 +openssh-client-8.4_p1-r4 +openssh-keygen-8.4_p1-r4 +openssh-server-8.4_p1-r4 +openssh-server-common-8.4_p1-r4 +openssl-1.1.1l-r0 +openssl-dev-1.1.1l-r0 ovmf-0.0.201908-r1 p11-kit-0.23.22-r0 partx-2.36.1-r1 -patch-2.7.6-r6 +patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 pcsc-lite-libs-1.9.0-r0 @@ -311,8 +316,8 @@ readline-8.1.0-r0 rhash-libs-1.4.1-r0 rpcbind-1.2.5-r0 rpcbind-openrc-1.2.5-r0 -rsync-3.2.3-r1 -rsync-openrc-3.2.3-r1 +rsync-3.2.3-r4 +rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.0-r0 samba-util-libs-4.13.8-r0 scanelf-1.2.8-r0 @@ -329,7 +334,7 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r0 sqlite-libs-3.34.1-r0 -squashfs-tools-4.4-r1 +squashfs-tools-4.5-r0 ssl_client-1.32.1-r6 strace-5.10-r0 swig-4.0.2-r0 @@ -340,7 +345,7 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r0 tini-0.19.0-r0 -tzdata-2021a-r0 +tzdata-2021d-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.1-r0 @@ -350,7 +355,7 @@ util-linux-openrc-2.36.1-r1 utmps-0.1.0.0-r0 utmps-openrc-0.1.0.0-r0 vde2-libs-2.3.2-r12 -vim-8.2.2320-r0 +vim-8.2.3437-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.18.0-r5 wireguard-tools-1.0.20200827-r1 @@ -363,7 +368,7 @@ xfsprogs-5.10.0-r0 xfsprogs-extra-5.10.0-r0 xkeyboard-config-2.31-r0 xorriso-1.5.2-r0 -xxd-8.2.2320-r0 +xxd-8.2.3437-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 @@ -373,4 +378,4 @@ zfs-openrc-2.0.1-r0 zlib-1.2.11-r3 zlib-dev-1.2.11-r3 zlib-static-1.2.11-r3 -zstd-libs-1.4.5-r3 +zstd-libs-1.4.9-r0