diff --git a/examples/openstack.yml b/examples/openstack.yml index b1a01e115..ffa3a6cb2 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -19,7 +19,7 @@ services: - name: rngd image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7 - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 6e4098241..c0c1bf824 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7 - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 604d9c286..b4735c101 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index c3f7f211a..47d417746 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -22,7 +22,7 @@ services: - name: rngd image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7 - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index bbbb50ae9..412e83c3e 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -28,7 +28,7 @@ services: env: - INSECURE=true - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index d29a193d4..bf017c3ff 100644 --- a/examples/platform-packet.yml +++ b/examples/platform-packet.yml @@ -28,7 +28,7 @@ services: env: - INSECURE=true - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 3632b5cbb..e473ec890 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -23,7 +23,7 @@ services: - name: rngd image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7 - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/sshd.yml b/examples/sshd.yml index 779973f42..2e07d75fd 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450 - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 63b1837f4..4ef726ee5 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:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:ea4dded7386b09dd647e854664b029be0a4f420f binds: diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 168517cdd..d3f1944bd 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -22,4 +22,4 @@ COPY --from=mirror /out/ / COPY etc/ /etc/ COPY usr/ /usr/ RUN mkdir -p /etc/ssh /root/.ssh && chmod 0700 /root/.ssh -CMD ["/sbin/tini", "/usr/bin/ssh.sh"] +CMD ["/sbin/tini", "-s", "/usr/bin/ssh.sh"] diff --git a/pkg/sshd/build.yml b/pkg/sshd/build.yml index 73f43d1b3..a4d095361 100644 --- a/pkg/sshd/build.yml +++ b/pkg/sshd/build.yml @@ -16,3 +16,6 @@ config: - /sys:/sys capabilities: - all + devices: + - path: all + type: a diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index d5a30a51c..fb8a0bbc3 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -28,7 +28,7 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:782720b1c320f4b31abd89711ac235d1d441217c + image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f - name: getty image: linuxkit/getty:3c6e89681a988c3d4e2610fcd7aaaa0247ded3ec env: