From 60dd54670fa3f0b24c6015ea954ae0d75e9cd4fa Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 20 Sep 2017 11:52:42 +0100 Subject: [PATCH] Update YAML files with new getty, ip, and sshd package hashes 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/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 | 4 ++-- linuxkit.yml | 2 +- projects/kubernetes/kube.yml | 4 ++-- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 4 ++-- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 4 ++-- 27 files changed, 34 insertions(+), 34 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 2963eee2e..9a8e6b5af 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -48,7 +48,7 @@ services: image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b # Enable getty for easier debugging - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/aws.yml b/examples/aws.yml index fd12a1ce2..5568ff2f4 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index b3c7f29bb..fcfb9d916 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/docker.yml b/examples/docker.yml index 57ca8bbdd..8c4565d51 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 4ed3c0101..2b24a33ae 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 1905e6d71..cd3ea7a30 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 7675362a2..e4ec97bc7 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f77e5c9d7..95b7dcecb 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index 83982b973..29a598854 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -22,7 +22,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 trust: org: - linuxkit diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 38ca9c566..8cf39ada4 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 5d532f8e6..849f56c24 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 88f6d527f..ceb499fb8 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index 50f34c202..139235580 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index c382db6c1..d7c0a17ca 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index e288f6fc7..3db41132c 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:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:42d80758e3b6a9f58cdfd25e53c775eebe951669 binds: diff --git a/examples/vultr.yml b/examples/vultr.yml index dff0bbd76..fb0f8335f 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 binds: - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 37d9fb975..9735bd298 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -13,7 +13,7 @@ onboot: image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:044287be54a62d1590dcd4d22543c1a1031479e6 + image: linuxkit/ip:adedf00ca91ed0ed91a40aa76ce23309b32fcb47 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:044287be54a62d1590dcd4d22543c1a1031479e6 + image: linuxkit/ip:adedf00ca91ed0ed91a40aa76ce23309b32fcb47 net: new binds: - /etc/wireguard:/etc/wireguard diff --git a/linuxkit.yml b/linuxkit.yml index 62320a7ea..bf016c20f 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index 87d9696a4..cf9d165a2 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd @@ -34,7 +34,7 @@ services: - name: ntpd image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 - name: sshd - image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 - name: kubelet image: linuxkitprojects/kubernetes:8f3f75005ce56b8588b669ce5d7b02c5d705bbd4 files: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index a1ac8d8c4..13834213f 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index c080ba679..5afc8ef5d 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index da800ff87..1ee5014bf 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:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0 + image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 9a25e955f..6e79de741 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:f3f5413abb78fae9020e35bd4788fa93df4530b7 - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index a4817b977..34aa4c707 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: - INSECURE=true - name: rngd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 7b92b5916..e1018a4f7 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -23,7 +23,7 @@ onboot: image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 services: - name: getty - image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 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 b9baedb2d..be7eadd34 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:797cb79e0a229fcd16ebf44a0da74bcec03968ec + image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 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 f051eb62c..59918f6ba 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:f3f5413abb78fae9020e35bd4788fa93df4530b7 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:044287be54a62d1590dcd4d22543c1a1031479e6 + image: linuxkit/ip:adedf00ca91ed0ed91a40aa76ce23309b32fcb47 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:044287be54a62d1590dcd4d22543c1a1031479e6 + image: linuxkit/ip:adedf00ca91ed0ed91a40aa76ce23309b32fcb47 net: new binds: - /etc/wireguard:/etc/wireguard