From 0ab77ee84331b7045ca32caa55c211898ea1e948 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 2 Nov 2017 13:06:21 +0000 Subject: [PATCH] Update YAMLs with getty/ip/sshd packages Signed-off-by: Rolf Neugebauer --- blueprints/docker-for-mac/base.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/openstack.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.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 | 6 +++--- linuxkit.yml | 2 +- projects/kubernetes/kube.yml | 4 ++-- projects/swarmd/swarmd.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 4 ++-- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 0c4a95b0e..90e52cc02 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -52,7 +52,7 @@ services: image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b # Enable getty for easier debugging - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/aws.yml b/examples/aws.yml index 2a68ab431..80e35aabb 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 9dbaeb3ac..f6765aa49 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/docker.yml b/examples/docker.yml index 4d95950c3..d5d354ec2 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index e0a1c8e14..887e03f8c 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index c12e4bf76..f9380770a 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 4d710bdf2..668642b01 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index ef555c6bf..507c0bb70 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/openstack.yml b/examples/openstack.yml index 8e260dbc2..e0ff62b07 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -19,7 +19,7 @@ services: - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.yml b/examples/packet.yml index f02820bc5..3ff9726cc 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -22,7 +22,7 @@ services: - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a trust: org: - linuxkit diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 393bd482e..24ac2da47 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 3bc145a87..65beb26da 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index d5ff381a5..54d0c3b6e 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index b5ec7c9db..ede130955 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index 58eb7e016..1f60ca4d4 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:a9ad57ed738a31ea9380cd73236866c312b35489 services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 1479d38f5..58f4940a5 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:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:c7e61d9250de0b21455dc5c8bb885bd8faa31621 binds: diff --git a/examples/vultr.yml b/examples/vultr.yml index 9b4af77a9..a655b4f2b 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9 - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 4cb3c3c17..38c7d80cb 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,7 +40,7 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true net: /run/netns/wg1 diff --git a/linuxkit.yml b/linuxkit.yml index 79baa0993..f6347e146 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index d1eb3ccc0..1e0fad688 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -26,7 +26,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/"] services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: rngd @@ -34,7 +34,7 @@ services: - name: ntpd image: linuxkit/openntpd:07a80c3e3e816658318ac027e1253ff9a228b8de - name: sshd - image: linuxkit/sshd:f55ec010619e19178d5daecb4e595e84ecbf7d67 + image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a - name: kubelet image: linuxkitprojects/kubernetes:4d8ef8789cc04cb0e8cf42dc3f34e03ec70daf3d files: diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index bf25172d8..869d04b09 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -23,7 +23,7 @@ onboot: image: linuxkit/metadata:9506d124d0a3ff645c9781c47f207423abf6154d services: - name: getty - image: linuxkit/getty:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa env: - INSECURE=true - name: qemu-ga diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 276fcf314..b9ac038da 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:626ccc8e1766c40447f29a790d3a7cfff126f2a2 + image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index eaaf09ee1..d55424ea3 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:54971b6664cb7b52912e909a8f6a45e5a5c94506 + image: linuxkit/ip:e6f92b663e004be58c5d1fb43830d9155d625d28 net: new binds: - /etc/wireguard:/etc/wireguard