diff --git a/examples/aws.yml b/examples/aws.yml index 311bb17be..bd985f1dd 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -5,20 +5,20 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.3 + image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 72f985ee7..c9b7cff2b 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -5,17 +5,17 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 2bf691494..ff4b5eaf5 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -5,30 +5,30 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysfs - image: linuxkit/sysfs:v0.3 + image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280 - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: ntpd - image: linuxkit/openntpd:v0.3 + image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2 - name: docker image: docker:17.10.0-ce-dind @@ -46,7 +46,7 @@ services: - /etc/docker/daemon.json:/etc/docker/daemon.json command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"] - name: cadvisor - image: linuxkit/cadvisor:v0.3 + image: linuxkit/cadvisor:9a4b626e808c6a961bf17c8c3eb8adbe55f94e20 files: - path: var/lib/docker directory: true diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 84e838243..734f7a44d 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -3,30 +3,30 @@ kernel: image: linuxkit/kernel:4.14.35 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/vpnkit-expose-port:v0.3 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host + - linuxkit/vpnkit-expose-port:4e2ea826aaefdd196c7473255654d06ad96c4c21 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: # support metadata for optional config in /run/config - name: metadata - image: linuxkit/metadata:v0.3 + image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: sysfs - image: linuxkit/sysfs:v0.3 + image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280 - name: binfmt - image: linuxkit/binfmt:v0.3 + image: linuxkit/binfmt:aa7909fd14c251948a83edb5398b4fb7d5153ad1 # Format and mount the disk image in /var/lib/docker - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib"] # make a swap file on the mounted disk - name: swap - image: linuxkit/swap:v0.3 + image: linuxkit/swap:d4241eabbc9086d30e462bfa6bb952fd4e6b74eb command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"] # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding - name: mount-vpnkit @@ -44,41 +44,41 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:v0.3 + image: linuxkit/acpid:6c05004a07f4f9228aec89605d5c72b184695d2a # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM - name: ntpd - image: linuxkit/openntpd:v0.3 + image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2 # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:v0.3 + image: linuxkit/vsudd:ef2fd68237c6fc1a3b97b37012ad81bf9643be4b binds: - /var/run:/var/run command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"] # vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373. # It needs access to the vpnkit 9P coordination share - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.3 + image: linuxkit/vpnkit-forwarder:49b506c4dab8789fd42b216c35a4eb1cca503b32 binds: - /var/vpnkit:/port net: host command: ["/vpnkit-forwarder", "-vsockPort", "62373"] # Monitor for image deletes and invoke a TRIM on the container filesystem - name: trim-after-delete - image: linuxkit/trim-after-delete:v0.3 + image: linuxkit/trim-after-delete:9e62cea1246d66659bc1a74987f5f4c40e04de83 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:v0.3 + image: linuxkit/host-timesync-daemon:921f623f1d12b7a79417370c4628752c495e7ee8 # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/docker.yml b/examples/docker.yml index 7637acdf3..dea61050d 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -5,28 +5,28 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: sysfs - image: linuxkit/sysfs:v0.3 + image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280 - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: ntpd - image: linuxkit/openntpd:v0.3 + image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2 - name: docker image: docker:17.09.0-ce-dind capabilities: diff --git a/examples/gcp.yml b/examples/gcp.yml index 92e3113a0..a8dbad28a 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -5,24 +5,24 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.3 + image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index 5d055fb5c..48f14ae8b 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -5,21 +5,21 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 5a7f8db50..9f3caf1c9 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -5,12 +5,12 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true runtime: @@ -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:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 2cd9f186a..a2b9d5351 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -5,14 +5,14 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: influxdb diff --git a/examples/minimal.yml b/examples/minimal.yml index f6e1e4d8b..688eb96c4 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -7,11 +7,11 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f0932bf06..0182e03c5 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,15 +7,15 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: node_exporter - image: linuxkit/node_exporter:v0.3 + image: linuxkit/node_exporter:693341bd019aeca0e9a6bf33bdbc5f46aa2bf2a1 trust: org: - linuxkit diff --git a/examples/openstack.yml b/examples/openstack.yml index 4e7a822b8..400a381de 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -5,21 +5,21 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.3 + image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd command: ["/usr/bin/metadata", "openstack"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index d5c3d2bc9..be75f1ca8 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -10,5 +10,5 @@ kernel: ucode: "" onboot: - name: modprobe - image: linuxkit/modprobe:v0.3 + image: linuxkit/modprobe:7605d92569d45df9e4a9fe4e12a777d2e7944976 command: ["modprobe", "nicvf"] diff --git a/examples/packet.yml b/examples/packet.yml index 5f36cc67c..2f0b8e621 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -6,29 +6,29 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 - - linuxkit/firmware:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 + - linuxkit/firmware:177575af191cf16e19c4989200e40f11422c3b32 onboot: - name: rngd1 - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 command: ["/sbin/rngd", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.3 + image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd command: ["/usr/bin/metadata", "packet"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 473481530..da382d181 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -9,11 +9,11 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true # Currently redis:4.0.6-alpine has trust issue with multi-arch diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index dcb8b0ae3..589432c3f 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -5,21 +5,21 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: open-vm-tools - image: linuxkit/open-vm-tools:v0.3 + image: linuxkit/open-vm-tools:435f47c1a8c004b3626da21eb17fcebcc628714a - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/sshd.yml b/examples/sshd.yml index 1094c4578..8d79f88a8 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -5,24 +5,24 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: rngd1 - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index 59d7aa786..712aa7062 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -5,30 +5,30 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/external"] - name: swap - image: linuxkit/swap:v0.3 + image: linuxkit/swap:d4241eabbc9086d30e462bfa6bb952fd4e6b74eb # to use unencrypted swap, use: # command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 trust: org: - linuxkit diff --git a/examples/tpm.yml b/examples/tpm.yml index fb208a9d2..9d83654b4 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -5,22 +5,22 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: tss - image: linuxkit/tss:v0.3 + image: linuxkit/tss:0f21e6d31c81a6eaa9f08638b87f678144ea9217 - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/examples/vmware.yml b/examples/vmware.yml index 789bd0ed9..47c201afe 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -5,19 +5,19 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index b7c531880..c35dcab79 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.7 @@ -19,9 +19,9 @@ 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:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb - name: vpnkit-forwarder - image: linuxkit/vpnkit-forwarder:v0.3 + image: linuxkit/vpnkit-forwarder:49b506c4dab8789fd42b216c35a4eb1cca503b32 binds: - /var/vpnkit:/port net: host diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index c3efda615..c7d834609 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -7,11 +7,11 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:v0.3 + image: linuxkit/vsudd:ef2fd68237c6fc1a3b97b37012ad81bf9643be4b binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/examples/vultr.yml b/examples/vultr.yml index 92e3113a0..a8dbad28a 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -5,24 +5,24 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata - image: linuxkit/metadata:v0.3 + image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index b30794023..221646853 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -5,15 +5,15 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.3 + image: linuxkit/ip:baf5dc379104f01356fb7ace881149a67d889e96 net: new binds: - /etc/wireguard:/etc/wireguard @@ -26,7 +26,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.3 + image: linuxkit/ip:baf5dc379104f01356fb7ace881149a67d889e96 net: new binds: - /etc/wireguard:/etc/wireguard @@ -40,12 +40,12 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true net: /run/netns/wg1 - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: nginx image: nginx:1.13.8-alpine net: /run/netns/wg0 diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile index ffae7c43c..fed6eb2e1 100644 --- a/pkg/acpid/Dockerfile +++ b/pkg/acpid/Dockerfile @@ -17,6 +17,3 @@ COPY --from=mirror /out/ / COPY --from=mirror2 /out/etc/acpi /etc/acpi CMD ["/sbin/acpid", "-f", "-d"] - -LABEL org.mobyproject.config='{"binds": ["/dev:/dev"], "pid": "host"}' - diff --git a/pkg/acpid/build.yml b/pkg/acpid/build.yml index cf21e8b14..41bb44319 100644 --- a/pkg/acpid/build.yml +++ b/pkg/acpid/build.yml @@ -1 +1,5 @@ image: acpid +config: + binds: + - /dev:/dev + pid: host diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 9048e343b..5fa98e754 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -22,4 +22,3 @@ COPY --from=mirror /go/bin/binfmt usr/bin/binfmt COPY --from=mirror /binfmt_misc /binfmt_misc/ COPY etc/binfmt.d/00_linuxkit.conf etc/binfmt.d/00_linuxkit.conf CMD ["/usr/bin/binfmt", "-dir", "/etc/binfmt.d/", "-mount", "/binfmt_misc"] -LABEL org.mobyproject.config='{"binds": ["/proc/sys/fs/binfmt_misc:/binfmt_misc"], "readonly": true, "net": "new", "ipc": "new"}' diff --git a/pkg/binfmt/build.yml b/pkg/binfmt/build.yml index c248c8dd7..06150b01d 100644 --- a/pkg/binfmt/build.yml +++ b/pkg/binfmt/build.yml @@ -1,3 +1,9 @@ image: binfmt arches: - amd64 +config: + binds: + - /proc/sys/fs/binfmt_misc:/binfmt_misc + readonly: true + net: new + ipc: new diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile index 42df6a5fc..3adbb1c36 100644 --- a/pkg/cadvisor/Dockerfile +++ b/pkg/cadvisor/Dockerfile @@ -37,4 +37,3 @@ COPY --from=build /usr/bin/cadvisor /usr/bin/cadvisor COPY /waitfordocker.sh /usr/bin/waitfordocker.sh ENTRYPOINT ["/usr/bin/waitfordocker.sh", "/usr/bin/cadvisor", "-logtostderr", "--disable_metrics=disk,tcp,udp"] -LABEL org.mobyproject.config='{"pid": "host", "binds": ["/var/lib/docker:/var/lib/docker:ro", "/var/run:/var/run", "/sys:/sys:ro", "/etc/resolv.conf:/etc/resolv.conf:ro"], "capabilities": ["all"]}' diff --git a/pkg/cadvisor/build.yml b/pkg/cadvisor/build.yml index 79a35bc80..7b1eb6c41 100644 --- a/pkg/cadvisor/build.yml +++ b/pkg/cadvisor/build.yml @@ -3,3 +3,12 @@ network: true arches: - amd64 - arm64 +config: + pid: host + binds: + - /var/lib/docker:/var/lib/docker:ro + - /var/run:/var/run + - /sys:/sys:ro + - /etc/resolv.conf:/etc/resolv.conf:ro + capabilities: + - all diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index c15a945db..3f8bf90e6 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -16,4 +16,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY /dhcpcd.conf /usr/ / CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] -LABEL org.mobyproject.config='{"binds": ["/run/resolvconf:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW", "CAP_SYS_ADMIN"]}' diff --git a/pkg/dhcpcd/build.yml b/pkg/dhcpcd/build.yml index 47241f0fa..40edd3179 100644 --- a/pkg/dhcpcd/build.yml +++ b/pkg/dhcpcd/build.yml @@ -1 +1,9 @@ image: dhcpcd +config: + binds: + - /run/resolvconf:/etc + capabilities: + - CAP_NET_ADMIN + - CAP_NET_BIND_SERVICE + - CAP_NET_RAW + - CAP_SYS_ADMIN diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile index 1990f3cac..0d1be79c4 100644 --- a/pkg/extend/Dockerfile +++ b/pkg/extend/Dockerfile @@ -30,4 +30,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY --from=build /go/bin/extend usr/bin/extend CMD ["/usr/bin/extend"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "net": "new", "ipc": "new"}' diff --git a/pkg/extend/build.yml b/pkg/extend/build.yml index 6f10de7f3..75c834692 100644 --- a/pkg/extend/build.yml +++ b/pkg/extend/build.yml @@ -1 +1,9 @@ image: extend +config: + binds: + - /dev:/dev + capabilities: + - CAP_SYS_ADMIN + - CAP_MKNOD + net: new + ipc: new diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile index 5c4bec43c..d3b08844d 100644 --- a/pkg/format/Dockerfile +++ b/pkg/format/Dockerfile @@ -30,4 +30,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY --from=build /go/bin/format usr/bin/format CMD ["/usr/bin/format"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "net": "new", "ipc": "new"}' diff --git a/pkg/format/build.yml b/pkg/format/build.yml index a205794ef..9fb9016f7 100644 --- a/pkg/format/build.yml +++ b/pkg/format/build.yml @@ -1 +1,9 @@ image: format +config: + binds: + - /dev:/dev + capabilities: + - CAP_SYS_ADMIN + - CAP_MKNOD + net: new + ipc: new diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 53ab5288f..71f95d994 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -32,4 +32,3 @@ COPY --from=mirror /out/ / COPY usr/ /usr/ COPY etc/ /etc/ CMD ["/usr/bin/rungetty.sh"] -LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/containers:/containers","/var/log:/var/log","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/pkg/getty/build.yml b/pkg/getty/build.yml index 05912cb5b..4644d3d5c 100644 --- a/pkg/getty/build.yml +++ b/pkg/getty/build.yml @@ -1 +1,17 @@ image: getty +config: + pid: host + net: host + binds: + - /etc/resolv.conf:/etc/resolv.conf + - /run:/run + - /tmp:/tmp + - /etc:/hostroot/etc + - /usr/bin/ctr:/usr/bin/ctr + - /usr/bin/runc:/usr/bin/runc + - /containers:/containers + - /var/log:/var/log + - /dev:/dev + - /sys:/sys + capabilities: + - all diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile index 622f178d9..796ed0fd4 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -19,4 +19,3 @@ CMD [] WORKDIR / COPY --from=mirror /go/bin/host-timesync-daemon /usr/bin/host-timesync-daemon CMD ["/usr/bin/host-timesync-daemon", "-port", "0xf3a4"] -LABEL org.mobyproject.config='{"binds": [ "/dev/rtc0:/dev/rtc0" ], "capabilities": ["CAP_SYS_TIME"]}' diff --git a/pkg/host-timesync-daemon/build.yml b/pkg/host-timesync-daemon/build.yml index c3ec54bd7..4423a0153 100644 --- a/pkg/host-timesync-daemon/build.yml +++ b/pkg/host-timesync-daemon/build.yml @@ -2,3 +2,8 @@ image: host-timesync-daemon network: true arches: - amd64 +config: + binds: + - /dev/rtc0:/dev/rtc0 + capabilities: + - CAP_SYS_TIME diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile index a1a730d7f..67f7a4893 100644 --- a/pkg/ip/Dockerfile +++ b/pkg/ip/Dockerfile @@ -24,4 +24,3 @@ ENTRYPOINT [] CMD [] WORKDIR / COPY --from=mirror /out/ / -LABEL org.mobyproject.config='{"capabilities": ["CAP_NET_ADMIN", "CAP_NET_RAW"]}' diff --git a/pkg/ip/build.yml b/pkg/ip/build.yml index 0994a7321..5cb96539a 100644 --- a/pkg/ip/build.yml +++ b/pkg/ip/build.yml @@ -1,2 +1,6 @@ image: ip network: true +config: + capabilities: + - CAP_NET_ADMIN + - CAP_NET_RAW diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile index 5f62870cc..778f329e4 100644 --- a/pkg/mkimage/Dockerfile +++ b/pkg/mkimage/Dockerfile @@ -20,4 +20,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY mkimage.sh /usr/bin/ CMD ["mkimage.sh"] -LABEL org.mobyproject.config='{"readonly": true, "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "binds": ["/dev:/dev"]}' diff --git a/pkg/mkimage/build.yml b/pkg/mkimage/build.yml index 1fa6e4f1c..9b69ad29e 100644 --- a/pkg/mkimage/build.yml +++ b/pkg/mkimage/build.yml @@ -1,3 +1,10 @@ image: mkimage arches: - amd64 +config: + readonly: true + capabilities: + - CAP_SYS_ADMIN + - CAP_MKNOD + binds: + - /dev:/dev diff --git a/pkg/modprobe/Dockerfile b/pkg/modprobe/Dockerfile index 6853e3b92..518839e56 100644 --- a/pkg/modprobe/Dockerfile +++ b/pkg/modprobe/Dockerfile @@ -10,4 +10,3 @@ ENTRYPOINT [] CMD [] WORKDIR / COPY --from=mirror /out/ / -LABEL org.mobyproject.config='{"binds": ["/lib/modules:/lib/modules", "/sys:/sys"], "capabilities": ["CAP_SYS_MODULE"]}' diff --git a/pkg/modprobe/build.yml b/pkg/modprobe/build.yml index 5c653ad79..f6f36ab00 100644 --- a/pkg/modprobe/build.yml +++ b/pkg/modprobe/build.yml @@ -1 +1,7 @@ image: modprobe +config: + binds: + - /lib/modules:/lib/modules + - /sys:/sys + capabilities: + - CAP_SYS_MODULE diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 2943c9b4a..0651df42d 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -24,4 +24,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY --from=build /go/bin/mountie usr/bin/mountie CMD ["/usr/bin/mountie"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var:rshared,rbind", "/:/hostroot"], "capabilities": ["CAP_SYS_ADMIN"], "rootfsPropagation": "shared", "net": "new", "ipc": "new"}' diff --git a/pkg/mount/build.yml b/pkg/mount/build.yml index 93801b226..8f8634a7a 100644 --- a/pkg/mount/build.yml +++ b/pkg/mount/build.yml @@ -1 +1,11 @@ image: mount +config: + binds: + - /dev:/dev + - /var:/var:rshared,rbind + - /:/hostroot + capabilities: + - CAP_SYS_ADMIN + rootfsPropagation: shared + net: new + ipc: new diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile index c1aa49825..263320e4e 100644 --- a/pkg/node_exporter/Dockerfile +++ b/pkg/node_exporter/Dockerfile @@ -23,5 +23,3 @@ ENTRYPOINT ["/bin/node_exporter", "--path.procfs", "/host/proc", \ "--path.sysfs", "/host/sys", \ "--collector.filesystem.ignored-mount-points", \ "^/(sys|proc|dev|host|etc)($|/)"] -LABEL org.mobyproject.config='{"pid": "host", "binds": ["/proc:/host/proc", "/sys:/host/sys", "/:/rootfs"], "capabilities": ["all"]}' - diff --git a/pkg/node_exporter/build.yml b/pkg/node_exporter/build.yml index 883b46c31..3abcd9d9f 100644 --- a/pkg/node_exporter/build.yml +++ b/pkg/node_exporter/build.yml @@ -1,2 +1,10 @@ image: node_exporter network: true +config: + pid: host + binds: + - /proc:/host/proc + - /sys:/host/sys + - /:/rootfs + capabilities: + - all diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile index 2261b7a11..b28eb4d02 100644 --- a/pkg/open-vm-tools/Dockerfile +++ b/pkg/open-vm-tools/Dockerfile @@ -15,5 +15,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY scripts /etc/vmware-tools/scripts CMD ["/usr/bin/vmtoolsd"] - -LABEL org.mobyproject.config='{"pid": "host", "capabilities": ["CAP_SYS_BOOT"]}' diff --git a/pkg/open-vm-tools/build.yml b/pkg/open-vm-tools/build.yml index 4c99f31a8..8626238f3 100644 --- a/pkg/open-vm-tools/build.yml +++ b/pkg/open-vm-tools/build.yml @@ -1,3 +1,7 @@ image: open-vm-tools arches: - amd64 +config: + pid: host + capabilities: + - CAP_SYS_BOOT diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile index 6f0208808..2de2e7b68 100644 --- a/pkg/openntpd/Dockerfile +++ b/pkg/openntpd/Dockerfile @@ -16,4 +16,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY etc/ /etc/ CMD ["/usr/sbin/ntpd", "-d", "-s"] -LABEL org.mobyproject.config='{"binds": ["/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' diff --git a/pkg/openntpd/build.yml b/pkg/openntpd/build.yml index d9bf82d9b..af23c59c0 100644 --- a/pkg/openntpd/build.yml +++ b/pkg/openntpd/build.yml @@ -1 +1,10 @@ image: openntpd +config: + binds: + - /etc/resolv.conf:/etc/resolv.conf + capabilities: + - CAP_SYS_TIME + - CAP_SYS_NICE + - CAP_SYS_CHROOT + - CAP_SETUID + - CAP_SETGID diff --git a/pkg/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile index 24d3ca928..540c5d3da 100644 --- a/pkg/qemu-ga/Dockerfile +++ b/pkg/qemu-ga/Dockerfile @@ -10,4 +10,3 @@ WORKDIR / ENTRYPOINT [] COPY --from=build /out / CMD ["/usr/bin/qemu-ga", "-p", "/dev/vport0p1"] -LABEL org.mobyproject.config='{"net": "host"}' diff --git a/pkg/qemu-ga/build.yml b/pkg/qemu-ga/build.yml index 70e6af2d3..77913c867 100644 --- a/pkg/qemu-ga/build.yml +++ b/pkg/qemu-ga/build.yml @@ -1 +1,3 @@ image: qemu-ga +config: + net: host diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index db0fc0c02..403793ee6 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -15,4 +15,3 @@ CMD [] WORKDIR / COPY --from=mirror /go/bin/rngd /sbin/rngd CMD ["/sbin/rngd"] -LABEL org.mobyproject.config='{"capabilities": ["CAP_SYS_ADMIN"], "oomScoreAdj": -800, "readonly": true, "net": "new", "ipc": "new"}' diff --git a/pkg/rngd/build.yml b/pkg/rngd/build.yml index b3cbd7f5c..7b7c55ff0 100644 --- a/pkg/rngd/build.yml +++ b/pkg/rngd/build.yml @@ -1 +1,8 @@ image: rngd +config: + capabilities: + - CAP_SYS_ADMIN + oomScoreAdj: -800 + readonly: true + net: new + ipc: new diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile index 495ecb174..db1d89405 100644 --- a/pkg/sshd/Dockerfile +++ b/pkg/sshd/Dockerfile @@ -22,4 +22,3 @@ COPY etc/ /etc/ COPY usr/ /usr/ RUN mkdir -p /etc/ssh /root/.ssh && chmod 0700 /root/.ssh CMD ["/sbin/tini", "/usr/bin/ssh.sh"] -LABEL org.mobyproject.config='{"pid": "host", "binds": ["/root/.ssh:/root/.ssh", "/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/containers:/containers","/var/log:/var/log","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/pkg/sshd/build.yml b/pkg/sshd/build.yml index 7c04a29f8..3d8216d40 100644 --- a/pkg/sshd/build.yml +++ b/pkg/sshd/build.yml @@ -1 +1,17 @@ image: sshd +config: + pid: host + binds: + - /root/.ssh:/root/.ssh + - /etc/resolv.conf:/etc/resolv.conf + - /run:/run + - /tmp:/tmp + - /etc:/hostroot/etc + - /usr/bin/ctr:/usr/bin/ctr + - /usr/bin/runc:/usr/bin/runc + - /containers:/containers + - /var/log:/var/log + - /dev:/dev + - /sys:/sys + capabilities: + - all diff --git a/pkg/swap/Dockerfile b/pkg/swap/Dockerfile index 65cfcf2e0..2f359dd70 100644 --- a/pkg/swap/Dockerfile +++ b/pkg/swap/Dockerfile @@ -16,4 +16,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY /swap.sh . ENTRYPOINT ["swap.sh"] -LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var"], "capabilities": ["CAP_SYS_ADMIN", "CAP_MKNOD"], "net": "new", "ipc": "new"}' diff --git a/pkg/swap/build.yml b/pkg/swap/build.yml index 2c8a3583e..1b8c7ec53 100644 --- a/pkg/swap/build.yml +++ b/pkg/swap/build.yml @@ -1 +1,10 @@ image: swap +config: + binds: + - /dev:/dev + - /var:/var + capabilities: + - CAP_SYS_ADMIN + - CAP_MKNOD + net: new + ipc: new diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile index b988a36e9..a54728fd6 100644 --- a/pkg/sysfs/Dockerfile +++ b/pkg/sysfs/Dockerfile @@ -13,4 +13,3 @@ WORKDIR / COPY --from=mirror /go/bin/sysfs /usr/bin/sysfs COPY etc/ /etc/ CMD ["/usr/bin/sysfs"] -LABEL org.mobyproject.config='{"net": "new", "ipc": "new"}' diff --git a/pkg/sysfs/build.yml b/pkg/sysfs/build.yml index 642d0d047..59fe8dd68 100644 --- a/pkg/sysfs/build.yml +++ b/pkg/sysfs/build.yml @@ -1 +1,4 @@ image: sysfs +config: + net: new + ipc: new diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile index 17524d116..40d4e8476 100644 --- a/pkg/trim-after-delete/Dockerfile +++ b/pkg/trim-after-delete/Dockerfile @@ -23,4 +23,3 @@ WORKDIR / COPY --from=mirror /out/ / COPY --from=mirror /go/bin/trim-after-delete /usr/bin/trim-after-delete CMD ["/usr/bin/trim-after-delete", "--", "/sbin/fstrim", "/var/lib/docker"] -LABEL org.mobyproject.config='{"binds": ["/var/run:/var/run", "/var/lib/docker:/var/lib/docker"], "capabilities": ["CAP_SYS_ADMIN"]}' diff --git a/pkg/trim-after-delete/build.yml b/pkg/trim-after-delete/build.yml index 3ddef36f7..24ebf38a9 100644 --- a/pkg/trim-after-delete/build.yml +++ b/pkg/trim-after-delete/build.yml @@ -1 +1,7 @@ image: trim-after-delete +config: + binds: + - /var/run:/var/run + - /var/lib/docker:/var/lib/docker + capabilities: + - CAP_SYS_ADMIN diff --git a/pkg/tss/Dockerfile b/pkg/tss/Dockerfile index 7950915a2..08a868ae5 100644 --- a/pkg/tss/Dockerfile +++ b/pkg/tss/Dockerfile @@ -61,4 +61,3 @@ RUN busybox chmod 0644 /etc/passwd /etc/group && \ busybox rm /bin/busybox /bin/sh CMD ["/sbin/tcsd","-f"] -LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/dev:/dev"], "capabilities": ["all"]}' diff --git a/pkg/tss/build.yml b/pkg/tss/build.yml index e72bb1b91..cea1558cf 100644 --- a/pkg/tss/build.yml +++ b/pkg/tss/build.yml @@ -2,3 +2,10 @@ image: tss network: true arches: - amd64 +config: + pid: host + net: host + binds: + - /dev:/dev + capabilities: + - all diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index bc1896249..13aa0a0e9 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -5,25 +5,25 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: sysfs - image: linuxkit/sysfs:v0.3 + image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: ntpd - image: linuxkit/openntpd:v0.3 + image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 8ad281a24..eb5641e75 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -5,25 +5,25 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: sysfs - image: linuxkit/sysfs:v0.3 + image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: ntpd - image: linuxkit/openntpd:v0.3 + image: linuxkit/openntpd:9851e80f16e4292b12fbe97b9d7f1c3dd40d1ea2 - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 0a32d43b1..2e24e965c 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -5,17 +5,17 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 3d7444796..a424d7827 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,20 +2,20 @@ kernel: image: linuxkit/kernel:4.14.35 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 # with runc, logwrite, startmemlogd + - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index cd4f0e18e..7640c7c75 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -7,11 +7,11 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 2859e607b..910d6d8e8 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -5,20 +5,20 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 - samoht/fdd onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index b9a82518f..c25a5e0b5 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcp-client image: miragesdk/dhcp-client:22aa9d527820534295a8cd59901c0c5197af6585 net: host @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:v0.3 + image: linuxkit/sshd:8f11ee09b101ab7f41c7a6409a8d7a8d49957fbb - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index cd15266a5..b3a0e32ac 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -5,15 +5,15 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 services: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 4f4dc567d..4c843dfae 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -5,20 +5,20 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 env: - INSECURE=true - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: nginx image: nginx:1.13.8-alpine capabilities: diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index d3955f3f7..22f1ac266 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index c59731801..cf9405387 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 services: - name: acpid - image: linuxkit/acpid:v0.3 + image: linuxkit/acpid:6c05004a07f4f9228aec89605d5c72b184695d2a trust: org: - linuxkit diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 94705cc4c..5909ace63 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -5,22 +5,22 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: sysfs - image: linuxkit/sysfs:v0.3 + image: linuxkit/sysfs:98b340d360541f1e1e62bc30b62ab6a7e3dc9280 - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: rngd - image: linuxkit/rngd:v0.3 + image: linuxkit/rngd:429e1308b8cad9dbe04b7a91fcebec17ee6f7591 - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index f6280447a..1ea6e1f21 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: binfmt - image: linuxkit/binfmt:v0.3 + image: linuxkit/binfmt:aa7909fd14c251948a83edb5398b4fb7d5153ad1 - name: test image: alpine:3.7 binds: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index e2806350e..93cf29041 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 66106781e..aeec2af26 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -5,17 +5,17 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib"] - name: test image: linuxkit/test-containerd:8b99385a8b21b238c0c9db0af102d5b54bbe324e diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 527f551f9..622373ae6 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 43add6be8..499851d54 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index e4e724fea..5bb7e91c3 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -6,9 +6,9 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: extend - image: linuxkit/extend:v0.3 + image: linuxkit/extend:d9f58e40ed6f474757da6554dc214a0812f099df - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 9450f1144..f879b7860 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -6,13 +6,13 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: modprobe - image: linuxkit/modprobe:v0.3 + image: linuxkit/modprobe:7605d92569d45df9e4a9fe4e12a777d2e7944976 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 8caa94a44..815b92535 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -6,13 +6,13 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: modprobe - image: linuxkit/modprobe:v0.3 + image: linuxkit/modprobe:7605d92569d45df9e4a9fe4e12a777d2e7944976 command: ["modprobe", "btrfs"] - name: extend - image: linuxkit/extend:v0.3 + image: linuxkit/extend:d9f58e40ed6f474757da6554dc214a0812f099df command: ["/usr/bin/extend", "-type", "btrfs"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 08c92df7e..2485b0f47 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -6,10 +6,10 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 90d22e993..150127a23 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -6,10 +6,10 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: extend - image: linuxkit/extend:v0.3 + image: linuxkit/extend:d9f58e40ed6f474757da6554dc214a0812f099df command: ["/usr/bin/extend", "-type", "xfs"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index a44846db9..d42701e51 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -6,10 +6,10 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 76485c324..e5f6051ad 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -6,10 +6,10 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-label", "docker"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 38c0d8420..8ed71f93a 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -6,10 +6,10 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "@DEVICE@"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index efab21945..d3c78a2bb 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -6,13 +6,13 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: modprobe - image: linuxkit/modprobe:v0.3 + image: linuxkit/modprobe:7605d92569d45df9e4a9fe4e12a777d2e7944976 command: ["modprobe", "btrfs"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-type", "btrfs" ] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 7528519e1..7db005b82 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -6,10 +6,10 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-type", "xfs" ] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 3c3c0cd8a..f230501fe 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -6,19 +6,19 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"] - name: test - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 binds: - /check.sh:/check.sh command: ["sh", "./check.sh"] diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index dd59e77d1..f447a1e99 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -6,16 +6,16 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-label", "docker"] - name: format - image: linuxkit/format:v0.3 + image: linuxkit/format:d24885a226c42a40f7ed44dd3789a6a035254d98 command: ["/usr/bin/format", "-label", "foo"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: mount - image: linuxkit/mount:v0.3 + image: linuxkit/mount:763e67d733342281f3bdc55d7208b9c442837afe command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test image: alpine:3.7 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 797765ef4..0c52003fc 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -5,14 +5,14 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.3 + image: linuxkit/getty:b286a610ccbebc45251f3a9df3619d76318e2244 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 70d80c233..13c257e18 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: mkimage - image: linuxkit/mkimage:v0.3 + image: linuxkit/mkimage:b06b6487f585efef71d5a99a93d36301842a94cf - name: poweroff image: linuxkit/poweroff:5740687bf0a6a0480922c0f59b3a4ca77c866cae trust: diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index bfe7958c0..eb70fecef 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d onboot: - name: sysctl - image: linuxkit/sysctl:v0.3 + image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8 - name: test image: alpine:3.7 net: host diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 2b4773cec..3cb9bfb9f 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -5,13 +5,13 @@ init: - linuxkit/init:d0bf64f4cea42bea71e7d8f8832ba497bb822e89 - linuxkit/runc:acba8886e4b1318457c711700f695a02fef9493d - linuxkit/containerd:100d0d046c5061d75ee43e4ac5017a759109cae4 - - linuxkit/ca-certificates:v0.3 + - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:v0.3 + image: linuxkit/dhcpcd:01069780f536da8eb7745df7478a97253403b63d command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 - image: linuxkit/ip:v0.3 + image: linuxkit/ip:baf5dc379104f01356fb7ace881149a67d889e96 net: new binds: - /etc/wireguard:/etc/wireguard @@ -24,7 +24,7 @@ onboot: bindNS: net: /run/netns/wg0 - name: wg1 - image: linuxkit/ip:v0.3 + image: linuxkit/ip:baf5dc379104f01356fb7ace881149a67d889e96 net: new binds: - /etc/wireguard:/etc/wireguard