From a4ca9fa6743f1b863a34dd519b74defd36fc6de9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 29 Oct 2018 17:42:45 +0000 Subject: [PATCH] getty&ssh: bind `/var/lib/containerd` Needed for containerd v1.2.0 otherwise: $ ctr run -t docker.io/library/hello-world@sha256:f3b3b28a45160805bb16542c9531888519430e9e6d6ffc09d72261b0d26ff74f test [ 1311.667587] overlayfs: failed to resolve '/var/lib/containerd/io.containerd.snapshotter.v1.overlayfs/snapshots/5/fs': -2 ctr: failed to mount /tmp/containerd-mount111658703: no such file or directory Signed-off-by: Ian Campbell --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 4 ++-- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/logging.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.yml | 4 ++-- examples/redis-os.yml | 2 +- examples/rt-for-vmware.yml | 2 +- examples/scaleway.yml | 2 +- examples/sshd.yml | 4 ++-- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vultr.yml | 4 ++-- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- pkg/getty/build.yml | 1 + pkg/sshd/build.yml | 1 + projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- 35 files changed, 40 insertions(+), 38 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index c30c623c7..68eb44bfb 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 5bab8082c..dffa952aa 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 0ed45fce8..597b93d9d 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -22,7 +22,7 @@ onboot: services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index cd3ee67c3..6a30c2ddb 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -52,7 +52,7 @@ services: image: linuxkit/acpid:v0.6 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index ae75ec833..5bb1a92da 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -18,7 +18,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 8d66a9279..d6df002c7 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index e36d88919..cb427cef8 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index ba056f2e1..c51406a42 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true runtime: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 8a81142a2..024544cb6 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index c433ff883..0da24aa2b 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -17,7 +17,7 @@ onboot: services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true # A service which generates log messages for testing diff --git a/examples/minimal.yml b/examples/minimal.yml index dc0af8848..12190aec3 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index c08f3a6ca..90e3374ad 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/openstack.yml b/examples/openstack.yml index 4468927dd..57bc1c4d7 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -19,7 +19,7 @@ services: - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.yml b/examples/packet.yml index 61f16c3ba..5c6800dd0 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -24,11 +24,11 @@ services: - name: rngd image: linuxkit/rngd:v0.6 - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 1c0916842..db4a4682d 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -13,7 +13,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index ca740eb2c..18178442c 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/scaleway.yml b/examples/scaleway.yml index dc43717d2..a5085c22e 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -19,7 +19,7 @@ onboot: image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/sshd.yml b/examples/sshd.yml index 29f9c40ec..9dcbc00ec 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index a3abb9071..39d6c7957 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index 25d46493b..48a6fe9e2 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index 4c2682ee6..a61254fa0 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index f769c63bc..1110b1835 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -19,7 +19,7 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:v0.6 binds: diff --git a/examples/vultr.yml b/examples/vultr.yml index 8d66a9279..d6df002c7 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 3ebb20a4f..e3b708d71 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -40,7 +40,7 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true net: /run/netns/wg1 diff --git a/linuxkit.yml b/linuxkit.yml index b0b23c5ad..884c1a3c3 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/pkg/getty/build.yml b/pkg/getty/build.yml index 4644d3d5c..d10af6834 100644 --- a/pkg/getty/build.yml +++ b/pkg/getty/build.yml @@ -11,6 +11,7 @@ config: - /usr/bin/runc:/usr/bin/runc - /containers:/containers - /var/log:/var/log + - /var/lib/containerd:/var/lib/containerd - /dev:/dev - /sys:/sys capabilities: diff --git a/pkg/sshd/build.yml b/pkg/sshd/build.yml index 3d8216d40..73f43d1b3 100644 --- a/pkg/sshd/build.yml +++ b/pkg/sshd/build.yml @@ -11,6 +11,7 @@ config: - /usr/bin/runc:/usr/bin/runc - /containers:/containers - /var/log:/var/log + - /var/lib/containerd:/var/lib/containerd - /dev:/dev - /sys:/sys capabilities: diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index d03da058b..976affaa9 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 67facf7be..842042437 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index fe2c95a84..b89d4c11a 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 358fa2a05..46d0e0b91 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 2e365e0a0..984094b35 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 9481815a7..b5c4fb08f 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -13,7 +13,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index fa4eb50fd..2d0261bf3 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 5a0847710..43420c1fa 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes)