From 71bccd6967e32d4a7df0e8c1d8dfc116b8ee2200 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Thu, 29 Jun 2017 14:59:34 +0100 Subject: [PATCH] examples: Update to use new getty and sshd images Signed-off-by: Dave Tucker --- blueprints/docker-for-mac.yml | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 4 ++-- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 4 ++-- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vultr.yml | 4 ++-- linuxkit.yml | 2 +- projects/kubernetes/kube-master.yml | 4 ++-- projects/kubernetes/kube-node.yml | 4 ++-- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/shiftfs/shiftfs.yml | 2 +- test/cases/040_packages/007_getty-containerd/test-ctr.yml | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/blueprints/docker-for-mac.yml b/blueprints/docker-for-mac.yml index f9c9fc767..1057906b7 100644 --- a/blueprints/docker-for-mac.yml +++ b/blueprints/docker-for-mac.yml @@ -34,7 +34,7 @@ onboot: services: # Enable getty for easier debugging - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/examples/aws.yml b/examples/aws.yml index 83b9c49b7..3eb18999a 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: "linuxkit/rngd:b50b22dd574c5377708977af769f053009fff6d5" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 977d41f66..94a49f001 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:6c1ca76dbf808d5c27d10cbf22a8d4399be5c8ae" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/docker.yml b/examples/docker.yml index dbfe71ec8..19d8f98c5 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -20,7 +20,7 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index a6ee1f9d2..b2e4ab4c5 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,13 +16,13 @@ onboot: image: "linuxkit/metadata:09781c8a8097e5aa3ae522c74856d80e1da3b915" services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd image: "linuxkit/rngd:b50b22dd574c5377708977af769f053009fff6d5" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 96cff755d..3ab2f11c8 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:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 8bc3f7eea..64563e317 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:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0a97404b7..2ec7fd53b 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:1e3e8f207421de8deac8cedc26a138d6b1661a0d services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index 70fd71745..308d1cd77 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:6c1ca76dbf808d5c27d10cbf22a8d4399be5c8ae" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6365b7f71..acdb2f255 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:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 821c7cffc..9e15d3859 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd @@ -19,7 +19,7 @@ services: - name: dhcpcd image: "linuxkit/dhcpcd:6c1ca76dbf808d5c27d10cbf22a8d4399be5c8ae" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 7a1640ab1..3369a64c6 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:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index f7e2bbbbe..d21465474 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 6b6c413a8..1d4edae2d 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:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" - name: vpnkit-forwarder image: "linuxkit/vpnkit-forwarder:e2776b82ddfe82ed7f90e55d7a2b424e62e9a279" binds: diff --git a/examples/vultr.yml b/examples/vultr.yml index 9d0a964dc..47b3290fa 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,13 +16,13 @@ onboot: image: "linuxkit/metadata:09781c8a8097e5aa3ae522c74856d80e1da3b915" services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd image: "linuxkit/rngd:b50b22dd574c5377708977af769f053009fff6d5" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/linuxkit.yml b/linuxkit.yml index 6c111c02e..931802ee3 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index f0d8018f3..8976a0272 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd @@ -36,7 +36,7 @@ services: - name: ntpd image: "linuxkit/openntpd:a4c642d52e985922fcd97db52e471db123cc6841" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" - name: docker image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a" capabilities: diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index c0ca7983e..6889139db 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd @@ -36,7 +36,7 @@ services: - name: ntpd image: "linuxkit/openntpd:a4c642d52e985922fcd97db52e471db123cc6841" - name: sshd - image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" - name: docker image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a" capabilities: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index bc13bc6b3..8cd6ea817 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:f095b62ddca658e99d5751872c933ef3d5d18cec" + image: "linuxkit/sshd:7535658a08a01c61e2851e4bc1f6346e89412de8" - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 187d69a96..4821e958a 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" env: - INSECURE=true - name: rngd diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test-ctr.yml index cbbf5fb3a..0313772ac 100644 --- a/test/cases/040_packages/007_getty-containerd/test-ctr.yml +++ b/test/cases/040_packages/007_getty-containerd/test-ctr.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05" + image: "linuxkit/getty:6d35e3fe138aaeaf099b5b4f31b3f12ba725cb49" files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes)