diff --git a/contrib/crosvm/README.md b/contrib/crosvm/README.md index c7adeb88b..031463f3e 100644 --- a/contrib/crosvm/README.md +++ b/contrib/crosvm/README.md @@ -38,7 +38,7 @@ init: - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true trust: diff --git a/examples/aws.yml b/examples/aws.yml index 8dbba4114..14f24a9ca 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:v0.4 - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index f9e1487c3..9f5f8a543 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index ece921cf4..37fb994c3 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -22,7 +22,7 @@ onboot: services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 9ee26542e..b79305e37 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -52,7 +52,7 @@ services: image: linuxkit/acpid:v0.4 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index 96fe7a067..c98f8f212 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 372a7c973..2c2463dd1 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:v0.4 services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd image: linuxkit/rngd:v0.4 - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index cae943b10..ff5896163 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 # 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 e99975c5e..eb15d7d5d 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true runtime: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 91a9b5562..1bd30c56e 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: influxdb diff --git a/examples/minimal.yml b/examples/minimal.yml index 7a53968c5..8d3ba3253 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 9eabfb330..7a6ee8d47 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/examples/openstack.yml b/examples/openstack.yml index b9e26a0d9..2fb2eeeab 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -19,7 +19,7 @@ services: - name: rngd image: linuxkit/rngd:v0.4 - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.yml b/examples/packet.yml index 50782c23a..8d4b0fa97 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -24,11 +24,11 @@ services: - name: rngd image: linuxkit/rngd:v0.4 - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 926bdd28f..cc4b04608 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 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 da80a5616..ebbf1743c 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:v0.4 services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/examples/sshd.yml b/examples/sshd.yml index 18a17ce2a..7ae8d0d4c 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.4 - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index a06e363e2..1097680c5 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index 3df860a41..b7bd9ff36 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index bdff02d4a..e90d90916 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:v0.4 services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 4d05bbaec..a347f003e 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.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:v0.4 binds: diff --git a/examples/vultr.yml b/examples/vultr.yml index 372a7c973..2c2463dd1 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:v0.4 services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd image: linuxkit/rngd:v0.4 - name: sshd - image: linuxkit/sshd:v0.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 72c00c342..63233a480 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true net: /run/netns/wg1 diff --git a/linuxkit.yml b/linuxkit.yml index eb4069798..dadeb4614 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/pkg/getty/etc/motd b/pkg/getty/etc/motd index 2414d0d94..259f21c12 100644 --- a/pkg/getty/etc/motd +++ b/pkg/getty/etc/motd @@ -2,3 +2,4 @@ Welcome to LinuxKit! NOTE: This system is namespaced. The namespace you are currently in may not be the root. +System services are namespaced; to access, use `ctr -n linuxkit.service ...` diff --git a/pkg/sshd/etc/motd b/pkg/sshd/etc/motd index 2414d0d94..259f21c12 100644 --- a/pkg/sshd/etc/motd +++ b/pkg/sshd/etc/motd @@ -2,3 +2,4 @@ Welcome to LinuxKit! NOTE: This system is namespaced. The namespace you are currently in may not be the root. +System services are namespaced; to access, use `ctr -n linuxkit.service ...` diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index c29a16dd5..5a9f705ca 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index c627c7821..2217733db 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:v0.4 services: - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index fd4e82e61..7b603bc72 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.4 + image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index d692743f3..14cea4504 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.4 - name: getty - image: linuxkit/getty:v0.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 47230502b..42211170f 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 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 cf901855b..9d6385b38 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.4 + image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes)