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 <ijc@docker.com>
This commit is contained in:
Ian Campbell 2018-10-29 17:42:45 +00:00
parent e78b25062c
commit a4ca9fa674
35 changed files with 40 additions and 38 deletions

View File

@ -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

View File

@ -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

View File

@ -22,7 +22,7 @@ onboot:
services:
- name: getty
image: linuxkit/getty:v0.6
image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478
env:
- INSECURE=true
- name: rngd

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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)