Skip to content

Commit

Permalink
update sample and test yamls for metadata and rngd
Browse files Browse the repository at this point in the history
Signed-off-by: Avi Deitcher <avi@deitcher.net>
  • Loading branch information
deitch committed Dec 29, 2022
1 parent 865f0f5 commit 4a9690d
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: ntpd
image: linuxkit/openntpd:731094dcb14b01cfb6f7b40b8ba1f6bbec4e195b

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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
- name: sysctl
image: linuxkit/sysctl:57fb529fa99470f3b76ea5462ca97037315d51ea
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
command: ["/usr/bin/metadata", "openstack"]
services:
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: sshd
image: linuxkit/sshd:05abc22ed33f71c84b99aec6d6cedc70ae308af9
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:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
services:
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- 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:57fb529fa99470f3b76ea5462ca97037315d51ea
services:
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
services:
- name: getty
image: linuxkit/getty:ce1531b1333f81532fad505bd6449f306fb00b6f
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: sshd
image: linuxkit/sshd:05abc22ed33f71c84b99aec6d6cedc70ae308af9
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:6ffd1d54b9dad4acc57d2a6387ce37d3434d672a
onboot:
- name: rngd1
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
command: ["/sbin/rngd", "-1"]
- name: sysctl
image: linuxkit/sysctl:57fb529fa99470f3b76ea5462ca97037315d51ea
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
command: ["/usr/bin/metadata", "hetzner"]
services:
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: getty
image: linuxkit/getty:ce1531b1333f81532fad505bd6449f306fb00b6f
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:6ffd1d54b9dad4acc57d2a6387ce37d3434d672a
onboot:
- name: rngd1
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
command: ["/sbin/rngd", "-1"]
- name: sysctl
image: linuxkit/sysctl:57fb529fa99470f3b76ea5462ca97037315d51ea
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
command: ["/usr/bin/metadata", "packet"]
services:
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: getty
image: linuxkit/getty:ce1531b1333f81532fad505bd6449f306fb00b6f
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:57fb529fa99470f3b76ea5462ca97037315d51ea
- name: rngd1
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
command: ["/sbin/rngd", "-1"]
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
services:
- name: getty
image: linuxkit/getty:ce1531b1333f81532fad505bd6449f306fb00b6f
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:d787b9099b86a2a98ed926567cad528d238e0fab
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
command: ["/usr/bin/metadata", "vultr"]
services:
- name: getty
image: linuxkit/getty:ce1531b1333f81532fad505bd6449f306fb00b6f
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: sshd
image: linuxkit/sshd:05abc22ed33f71c84b99aec6d6cedc70ae308af9
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:57fb529fa99470f3b76ea5462ca97037315d51ea
- name: rngd1
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
command: ["/sbin/rngd", "-1"]
services:
- name: getty
image: linuxkit/getty:ce1531b1333f81532fad505bd6449f306fb00b6f
env:
- INSECURE=true
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:e35f050070e184c5a8b05fd98a17b82f0f726276
- name: rngd
image: linuxkit/rngd:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: ntpd
image: linuxkit/openntpd:731094dcb14b01cfb6f7b40b8ba1f6bbec4e195b
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: ntpd
image: linuxkit/openntpd:731094dcb14b01cfb6f7b40b8ba1f6bbec4e195b
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- 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:4025aa4b452d0713dd630c0294189a9d51abd71f
image: linuxkit/rngd:ff9ea3aa4ee004d1193c1afa9743a6b5d03a7cf4
- name: dhcpcd
image: linuxkit/dhcpcd:d787b9099b86a2a98ed926567cad528d238e0fab
- 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:491a7fac7e31a897cc3759935adf30287cd1a3a2
onboot:
- name: metadata
image: linuxkit/metadata:93c307adaf4bb76daa47cfddabbc88cc2ff15654
image: linuxkit/metadata:b91f96aed2525067011207ae31e3db1b07d221c5
- name: test
image: alpine:3.13
binds:
Expand Down

0 comments on commit 4a9690d

Please sign in to comment.