Skip to content

Commit

Permalink
update rngd and metadata dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Avi Deitcher <avi@deitcher.net>
  • Loading branch information
deitch committed Jan 3, 2023
1 parent e6e0ed3 commit 186ba7d
Show file tree
Hide file tree
Showing 31 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion examples/addbinds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
# this will keep all of the existing ones as well
- /var/tmp:/var/tmp
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
files:
- path: etc/getty.shadow
# sample sets password for root to "abcdefgh" (without quotes)
Expand Down
2 changes: 1 addition & 1 deletion examples/cadvisor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: ntpd
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038

Expand Down
2 changes: 1 addition & 1 deletion examples/dm-crypt-loop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
files:
- path: etc/dm-crypt/key
# the below key is just to keep the example self-contained
Expand Down
2 changes: 1 addition & 1 deletion examples/dm-crypt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
files:
- path: etc/dm-crypt/key
# the below key is just to keep the example self-contained
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-for-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ init:
onboot:
# support metadata for optional config in /run/config
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
- name: sysctl
image: linuxkit/sysctl:725c1cb15fbb210cb9a7530b3a1edb233a4f6361
- name: sysfs
Expand Down
2 changes: 1 addition & 1 deletion examples/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: ntpd
Expand Down
2 changes: 1 addition & 1 deletion examples/getty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
#env:
# - INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
files:
- path: etc/getty.shadow
# sample sets password for root to "abcdefgh" (without quotes)
Expand Down
2 changes: 1 addition & 1 deletion examples/hostmount-writeable-overlay.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
destination: writeable-host-etc
options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"]
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: nginx
image: nginx:1.13.8-alpine
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion examples/node_exporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: node_exporter
Expand Down
4 changes: 2 additions & 2 deletions examples/openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ onboot:
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
command: ["/usr/bin/metadata", "openstack"]
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: sshd
image: linuxkit/sshd:7e71b29a4223436c741d73149f880f7bf5d44dd7
binds.add:
Expand Down
4 changes: 2 additions & 2 deletions examples/platform-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ onboot:
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd2
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"]
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ onboot:
image: linuxkit/sysctl:725c1cb15fbb210cb9a7530b3a1edb233a4f6361
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: sshd
Expand Down
4 changes: 2 additions & 2 deletions examples/platform-gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ onboot:
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
services:
- name: getty
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: sshd
image: linuxkit/sshd:7e71b29a4223436c741d73149f880f7bf5d44dd7
binds.add:
Expand Down
6 changes: 3 additions & 3 deletions examples/platform-hetzner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ init:
- linuxkit/firmware:8f89601312327c78999a880ee104ceae9a25d20e
onboot:
- name: rngd1
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
command: ["/sbin/rngd", "-1"]
- name: sysctl
image: linuxkit/sysctl:725c1cb15fbb210cb9a7530b3a1edb233a4f6361
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
command: ["/usr/bin/metadata", "hetzner"]
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: getty
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
Expand Down
6 changes: 3 additions & 3 deletions examples/platform-packet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ init:
- linuxkit/firmware:8f89601312327c78999a880ee104ceae9a25d20e
onboot:
- name: rngd1
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
command: ["/sbin/rngd", "-1"]
- name: sysctl
image: linuxkit/sysctl:725c1cb15fbb210cb9a7530b3a1edb233a4f6361
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
command: ["/usr/bin/metadata", "packet"]
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: getty
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-rt-for-vmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: open-vm-tools
Expand Down
6 changes: 3 additions & 3 deletions examples/platform-scaleway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:725c1cb15fbb210cb9a7530b3a1edb233a4f6361
- name: rngd1
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
command: ["/sbin/rngd", "-1"]
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
services:
- name: getty
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
2 changes: 1 addition & 1 deletion examples/platform-vmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: nginx
Expand Down
4 changes: 2 additions & 2 deletions examples/platform-vultr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ onboot:
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
command: ["/usr/bin/metadata", "vultr"]
services:
- name: getty
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: sshd
image: linuxkit/sshd:7e71b29a4223436c741d73149f880f7bf5d44dd7
binds.add:
Expand Down
4 changes: 2 additions & 2 deletions examples/sshd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:725c1cb15fbb210cb9a7530b3a1edb233a4f6361
- name: rngd1
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
command: ["/sbin/rngd", "-1"]
services:
- name: getty
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: sshd
Expand Down
2 changes: 1 addition & 1 deletion examples/swap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
2 changes: 1 addition & 1 deletion examples/tpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- name: tss
image: linuxkit/tss:9cfa8c15f2120415aab35efcfdede5b3b5fe5b4c
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
files:
- path: etc/getty.shadow
# sample sets password for root to "abcdefgh" (without quotes)
Expand Down
2 changes: 1 addition & 1 deletion examples/wireguard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- INSECURE=true
net: /run/netns/wg1
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: nginx
image: nginx:1.13.8-alpine
net: /run/netns/wg0
Expand Down
2 changes: 1 addition & 1 deletion linuxkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: nginx
image: nginx:1.19.5-alpine
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion projects/compose/compose-dynamic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: ntpd
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
- name: docker
Expand Down
2 changes: 1 addition & 1 deletion projects/compose/compose-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: ntpd
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
- name: docker
Expand Down
2 changes: 1 addition & 1 deletion projects/ima-namespace/ima-namespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: nginx
image: nginx:1.13.8-alpine
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion projects/miragesdk/examples/fdd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
files:
Expand Down
2 changes: 1 addition & 1 deletion projects/shiftfs/shiftfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: nginx
image: nginx:1.13.8-alpine
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion test/cases/030_security/000_docker-bench/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ onboot:
command: ["/usr/bin/mountie", "/var/lib/docker"]
services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
image: linuxkit/rngd:317a0a2fe99dda4c876f7ea60003e0a540d2228c
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: docker
Expand Down
2 changes: 1 addition & 1 deletion test/cases/040_packages/013_metadata/000_cidata/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ init:
- linuxkit/runc:f01b88c7033180d50ae43562d72707c6881904e4
onboot:
- name: metadata
image: linuxkit/metadata:ede4898c9fa2c93e13911b73d25f2c607176d397
image: linuxkit/metadata:e7d84c0948e4d0ba457d560541a37c545be876f6
- name: test
image: alpine:3.13
binds:
Expand Down

0 comments on commit 186ba7d

Please sign in to comment.