diff --git a/examples/aws.yml b/examples/aws.yml index c30c623c7..7322f8cc1 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/azure.yml b/examples/azure.yml index 5bab8082c..2e7500d13 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -15,7 +15,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 0ed45fce8..5eaad911b 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -22,7 +22,7 @@ onboot: services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index cd3ee67c3..37652b50b 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,9 +4,9 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:v0.6 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: # support metadata for optional config in /run/config @@ -52,7 +52,7 @@ services: image: linuxkit/acpid:v0.6 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index ae75ec833..c3cfdeff7 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -18,7 +18,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 8d66a9279..4e54e578b 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/getty.yml b/examples/getty.yml index e36d88919..e5822ad36 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index ba056f2e1..724571eb3 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true runtime: diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 8a81142a2..7158340b4 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: influxdb diff --git a/examples/logging.yml b/examples/logging.yml index c433ff883..fea3862c8 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 - linuxkit/memlogd:v0.6 onboot: @@ -17,7 +17,7 @@ onboot: services: # Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true # A service which generates log messages for testing diff --git a/examples/minimal.yml b/examples/minimal.yml index dc0af8848..d6c2c2d9c 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index c08f3a6ca..747fbcb77 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,12 +2,12 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/openstack.yml b/examples/openstack.yml index 4468927dd..cad9ff313 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -19,7 +19,7 @@ services: - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/packet.yml b/examples/packet.yml index 61f16c3ba..a0e54b4d4 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,9 +3,9 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 - linuxkit/firmware:v0.6 onboot: @@ -24,11 +24,11 @@ services: - name: rngd image: linuxkit/rngd:v0.6 - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 1c0916842..669abb7e5 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 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 ca740eb2c..9f613f80d 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.71-rt cmdline: "console=tty0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/scaleway.yml b/examples/scaleway.yml index dc43717d2..27d7b5b72 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -19,7 +19,7 @@ onboot: image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/sshd.yml b/examples/sshd.yml index 29f9c40ec..5c6fdbb53 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -14,7 +14,7 @@ onboot: command: ["/sbin/rngd", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 files: - path: root/.ssh/authorized_keys source: ~/.ssh/id_rsa.pub diff --git a/examples/swap.yml b/examples/swap.yml index a3abb9071..c27aea82d 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index 25d46493b..0acc522a0 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index 4c2682ee6..ac22c3d7a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,16 +2,16 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index f769c63bc..a4cb9ccb5 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 @@ -19,7 +19,7 @@ onboot: command: ["sh", "-c", "mkdir /host_var/vpnkit && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] services: - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 - name: vpnkit-forwarder image: linuxkit/vpnkit-forwarder:v0.6 binds: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index a21a33df1..11ff33daf 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/examples/vultr.yml b/examples/vultr.yml index 8d66a9279..4e54e578b 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -16,13 +16,13 @@ onboot: image: linuxkit/metadata:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd image: linuxkit/rngd:v0.6 - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 binds: - /run/config/ssh/authorized_keys:/root/.ssh/authorized_keys - name: nginx diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 3ebb20a4f..08c8c8006 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -40,7 +40,7 @@ onboot: net: /run/netns/wg1 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true net: /run/netns/wg1 diff --git a/linuxkit.yml b/linuxkit.yml index b0b23c5ad..8eafc300b 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -18,7 +18,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index e0642a6b7..36c7ecdd0 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 as alpine +FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/getty/build.yml b/pkg/getty/build.yml index 4644d3d5c..d10af6834 100644 --- a/pkg/getty/build.yml +++ b/pkg/getty/build.yml @@ -11,6 +11,7 @@ config: - /usr/bin/runc:/usr/bin/runc - /containers:/containers - /var/log:/var/log + - /var/lib/containerd:/var/lib/containerd - /dev:/dev - /sys:/sys capabilities: diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 5914d5c08..d777aa3de 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 AS build +FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 AS mirror +FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index eed3929c3..ed6d0a957 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -11,7 +11,7 @@ RUN \ make \ && true ENV GOPATH=/go PATH=$PATH:/go/bin -ENV RUNC_COMMIT=00dc70017d222b178a002ed30e9321b12647af2d +ENV RUNC_COMMIT=58592df56734acf62e574865fe40b9e53e967910 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \ git clone https://github.com/opencontainers/runc.git diff --git a/pkg/sshd/build.yml b/pkg/sshd/build.yml index 3d8216d40..73f43d1b3 100644 --- a/pkg/sshd/build.yml +++ b/pkg/sshd/build.yml @@ -11,6 +11,7 @@ config: - /usr/bin/runc:/usr/bin/runc - /containers:/containers - /var/log:/var/log + - /var/lib/containerd:/var/lib/containerd - /dev:/dev - /sys:/sys capabilities: diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 8447e9a09..3fa76f54c 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index d03da058b..a417c9756 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 67facf7be..ce1dd1b61 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -21,7 +21,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index dbbb51b7f..0f4df0849 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index cc237e525..4c387d60e 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index fe2c95a84..63de5b3d0 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 358fa2a05..15eb79258 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 - samoht/fdd onboot: @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:v0.6 services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 2e365e0a0..874d9dcee 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: sysctl image: linuxkit/sysctl:v0.6 @@ -28,9 +28,9 @@ onboot: - /lib:/lib # for ifconfig services: - name: sshd - image: linuxkit/sshd:v0.6 + image: linuxkit/sshd:c4bc89cf0d66733c923ab9cb46198b599eb99320 - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true files: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 9481815a7..9e04e3a42 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,9 +2,9 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -13,7 +13,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true trust: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index fa4eb50fd..b8cf7ad1f 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,9 +2,9 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 env: - INSECURE=true - name: rngd diff --git a/scripts/push-manifest.sh b/scripts/push-manifest.sh index edb499375..79666cfb2 100755 --- a/scripts/push-manifest.sh +++ b/scripts/push-manifest.sh @@ -26,26 +26,34 @@ case $(uname -s) in Darwin) # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get) + CREDHELPER="/Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin" else - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get) + CREDHELPER="/Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain" fi - USER=$(echo "$CRED" | jq -r '.Username') - PASS=$(echo "$CRED" | jq -r '.Secret') - MT_ARGS="--username $USER --password $PASS" ;; Linux) - CRED=$(cat ~/.docker/config.json | jq -r '.auths."https://index.docker.io/v1/".auth' | base64 -d -) - USER=$(echo $CRED | cut -d ':' -f 1) - PASS=$(echo $CRED | cut -d ':' -f 2-) - # manifest-tool can use docker credentials directly - MT_ARGS= + CREDSTORE=$(cat ~/.docker/config.json | jq -r '.credsStore // empty') + if [ -n "$CREDSTORE" ] ; then + CREDHELPER="docker-credential-$CREDSTORE" + else + CRED=$(cat ~/.docker/config.json | jq -r '.auths."https://index.docker.io/v1/".auth' | base64 -d -) + USER=$(echo $CRED | cut -d ':' -f 1) + PASS=$(echo $CRED | cut -d ':' -f 2-) + # manifest-tool can use docker credentials directly + MT_ARGS= + fi ;; *) echo "Unsupported platform" exit 1 ;; esac +if [ -n "$CREDHELPER" ] ; then + CRED=$(echo "https://index.docker.io/v1/" | "$CREDHELPER" get) + USER=$(echo "$CRED" | jq -r '.Username') + PASS=$(echo "$CRED" | jq -r '.Secret') + MT_ARGS="--username $USER --password $PASS" +fi # Push manifest list OUT=$(manifest-tool $MT_ARGS push from-args \ diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index ee95e601e..c77764ab9 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -17,8 +17,8 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: mkimage image: linuxkit/mkimage:v0.6 diff --git a/src/cmd/linuxkit/pkglib/manifest_push_script.go b/src/cmd/linuxkit/pkglib/manifest_push_script.go index 422309b7a..7befcfeea 100644 --- a/src/cmd/linuxkit/pkglib/manifest_push_script.go +++ b/src/cmd/linuxkit/pkglib/manifest_push_script.go @@ -29,26 +29,34 @@ case $(uname -s) in Darwin) # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get) + CREDHELPER="/Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin" else - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get) + CREDHELPER="/Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain" fi - USER=$(echo "$CRED" | jq -r '.Username') - PASS=$(echo "$CRED" | jq -r '.Secret') - MT_ARGS="--username $USER --password $PASS" ;; Linux) - CRED=$(cat ~/.docker/config.json | jq -r '.auths."https://index.docker.io/v1/".auth' | base64 -d -) - USER=$(echo $CRED | cut -d ':' -f 1) - PASS=$(echo $CRED | cut -d ':' -f 2-) - # manifest-tool can use docker credentials directly - MT_ARGS= + CREDSTORE=$(cat ~/.docker/config.json | jq -r '.credsStore // empty') + if [ -n "$CREDSTORE" ] ; then + CREDHELPER="docker-credential-$CREDSTORE" + else + CRED=$(cat ~/.docker/config.json | jq -r '.auths."https://index.docker.io/v1/".auth' | base64 -d -) + USER=$(echo $CRED | cut -d ':' -f 1) + PASS=$(echo $CRED | cut -d ':' -f 2-) + # manifest-tool can use docker credentials directly + MT_ARGS= + fi ;; *) echo "Unsupported platform" exit 1 ;; esac +if [ -n "$CREDHELPER" ] ; then + CRED=$(echo "https://index.docker.io/v1/" | "$CREDHELPER" get) + USER=$(echo "$CRED" | jq -r '.Username') + PASS=$(echo "$CRED" | jq -r '.Secret') + MT_ARGS="--username $USER --password $PASS" +fi # Push manifest list OUT=$(manifest-tool $MT_ARGS push from-args \ diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index c3cdadc8c..1059321f1 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index c5caa94b3..4da44b6fd 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index c5caa94b3..4da44b6fd 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 5e1daeb63..b0987fe61 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 57131c340..ad1eaf271 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 57131c340..ad1eaf271 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 57131c340..ad1eaf271 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 57131c340..ad1eaf271 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 55a61f801..99374b6d0 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 57131c340..ad1eaf271 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 57131c340..ad1eaf271 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 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 c40bbe7f8..4dee27275 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 services: - name: acpid image: linuxkit/acpid:v0.6 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 44c24a4d0..4c16bda44 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.162 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index f346084eb..b22fc1ee9 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.135 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index 87a21656b..ce95841cb 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 diff --git a/test/cases/020_kernel/004_config_4.18.x/test.yml b/test/cases/020_kernel/004_config_4.18.x/test.yml index 4295ce11a..1ae5dfdf5 100644 --- a/test/cases/020_kernel/004_config_4.18.x/test.yml +++ b/test/cases/020_kernel/004_config_4.18.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.18.16 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index ceb6f2536..8c1350fe3 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check-kernel-config image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8 diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index afae35e80..dfd883dde 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.4.162 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 74e909ada..d3575e46d 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.9.135 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/012_kmod_4.14.x/test.yml b/test/cases/020_kernel/012_kmod_4.14.x/test.yml index f15349448..e6f333e76 100644 --- a/test/cases/020_kernel/012_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/012_kmod_4.14.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/014_kmod_4.18.x/test.yml b/test/cases/020_kernel/014_kmod_4.18.x/test.yml index 066749f4c..a4017c358 100644 --- a/test/cases/020_kernel/014_kmod_4.18.x/test.yml +++ b/test/cases/020_kernel/014_kmod_4.18.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.18.16 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/015_kmod_4.19.x/test.yml b/test/cases/020_kernel/015_kmod_4.19.x/test.yml index 430e00b73..628807d94 100644 --- a/test/cases/020_kernel/015_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/015_kmod_4.19.x/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.19 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: check image: kmod-test diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 9e76e5892..e10570513 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe 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 7d5a5cb7a..cfc7d11fe 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 6cf506c52..07272adbf 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: test image: alpine:3.8 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index d043a6d2a..f23c31099 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: binfmt image: linuxkit/binfmt:v0.6 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 19b03dede..dc965b4f8 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe - linuxkit/ca-certificates:v0.6 onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index cb335d27b..8d9a6f081 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:v0.6 command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:4b491a89aa2935ba6c7b2dc558b421b3c2cb2ce4 + image: linuxkit/test-containerd:962438524e0a9ff6524e4e187bbeace1d7beba05 - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 trust: diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index adb2452ba..08c9262ab 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 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 4cc6172ea..ba9a6e619 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 cfddca838..1d800bdd8 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: extend image: linuxkit/extend:v0.6 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 282588d9c..f8397ceab 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: modprobe image: linuxkit/modprobe:v0.6 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 c5a0eca46..432018d06 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: modprobe image: linuxkit/modprobe:v0.6 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 7a765bcc9..e9102ac27 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 dd9b0d30e..b46808ecf 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: extend image: linuxkit/extend:v0.6 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 52a03f61b..14923a7ca 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 bbfcac80b..26667f414 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 7ef7b275c..ee9b12670 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 cedcbed53..bdf4e8857 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: modprobe image: linuxkit/modprobe:v0.6 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 a2dd7432c..3b255300c 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 f67c676cd..1e6b22137 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 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 2cf20dd11..4b4ae27be 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 @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: format image: linuxkit/format:v0.6 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 5a0847710..1f166ee1f 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:v0.6 + image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478 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 432c90676..b6b3ffbbd 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: mkimage image: linuxkit/mkimage:v0.6 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index a6794e474..3ab723cb3 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: poweroff image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index b02bdf69c..ba7736d90 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,8 +2,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: sysctl image: linuxkit/sysctl:v0.6 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index c04a4eed8..109440688 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index fb518fc8b..73f5c093a 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 - linuxkit/memlogd:v0.6 services: diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 85ff18af2..0d435ec65 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 - linuxkit/ca-certificates:v0.6 - linuxkit/memlogd:v0.6 services: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 6f511a97d..e5ed5db59 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index 1f777f2ec..9de17c85a 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 - - linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe + - linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6 onboot: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index c866ddbf6..8dbed5bc0 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39 AS mirror +FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 869e1da1b..74b1573c9 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,8 +3,8 @@ kernel: image: linuxkit/kernel:4.14.78 cmdline: "console=ttyS0" init: - - linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008 - - linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8 + - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1 + - linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe onboot: - name: test-ns image: linuxkit/test-ns: diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 2142ea7b6..c91e58ed2 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -53,7 +53,7 @@ RUN go get -u github.com/LK4D4/vndr # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.1.4 +ENV CONTAINERD_COMMIT=v1.2.0 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/push-manifest.sh b/tools/alpine/push-manifest.sh index 08294ad48..0a23631cb 100755 --- a/tools/alpine/push-manifest.sh +++ b/tools/alpine/push-manifest.sh @@ -48,26 +48,34 @@ case $(uname -s) in Darwin) # Prior to 2018-03-27 D4M used a .bin suffix on the keychain utility binary name. Support the old name for a while if [ -f /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin ]; then - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin get) + CREDHELPER="/Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain.bin" else - CRED=$(echo "https://index.docker.io/v1/" | /Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain get) - fi - USER=$(echo "$CRED" | jq -r '.Username') - PASS=$(echo "$CRED" | jq -r '.Secret') - MT_ARGS="--username $USER --password $PASS" + CREDHELPER="/Applications/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain" + fi ;; Linux) - CRED=$(cat ~/.docker/config.json | jq -r '.auths."https://index.docker.io/v1/".auth' | base64 -d -) - USER=$(echo $CRED | cut -d ':' -f 1) - PASS=$(echo $CRED | cut -d ':' -f 2-) - # manifest-tool can use docker credentials directly - MT_ARGS= + CREDSTORE=$(cat ~/.docker/config.json | jq -r '.credsStore // empty') + if [ -n "$CREDSTORE" ] ; then + CREDHELPER="docker-credential-$CREDSTORE" + else + CRED=$(cat ~/.docker/config.json | jq -r '.auths."https://index.docker.io/v1/".auth' | base64 -d -) + USER=$(echo $CRED | cut -d ':' -f 1) + PASS=$(echo $CRED | cut -d ':' -f 2-) + # manifest-tool can use docker credentials directly + MT_ARGS= + fi ;; *) echo "Unsupported platform" exit 1 ;; esac +if [ -n "$CREDHELPER" ] ; then + CRED=$(echo "https://index.docker.io/v1/" | "$CREDHELPER" get) + USER=$(echo "$CRED" | jq -r '.Username') + PASS=$(echo "$CRED" | jq -r '.Secret') + MT_ARGS="--username $USER --password $PASS" +fi # Push manifest list OUT=$(manifest-tool $MT_ARGS push from-spec --ignore-missing "$YAML") diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 348c07943..58157414c 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:397ade1c9ee609a2ed6066365a78e0ee2a96e2d5-s390x +# linuxkit/alpine:6e3d117514a4fb46b4e394e0d2cbc32cf37ca20d-s390x # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -71,15 +71,15 @@ flex-libs-2.6.4-r1 fortify-headers-0.9-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 -g++-6.4.0-r8 +g++-6.4.0-r9 gc-7.6.4-r2 -gcc-6.4.0-r8 +gcc-6.4.0-r9 gdbm-1.13-r1 gettext-0.19.8.1-r2 gettext-asprintf-0.19.8.1-r2 gettext-dev-0.19.8.1-r2 gettext-libs-0.19.8.1-r2 -git-2.18.0-r0 +git-2.18.1-r0 glib-2.56.1-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 @@ -113,7 +113,7 @@ libaio-0.3.111-r0 libarchive-3.3.2-r3 libarchive-tools-3.3.2-r3 libassuan-2.5.1-r0 -libatomic-6.4.0-r8 +libatomic-6.4.0-r9 libattr-2.4.47-r7 libblkid-2.32-r0 libbsd-0.8.6-r2 @@ -137,10 +137,10 @@ libepoxy-1.4.3-r1 libevent-2.1.8-r5 libfdisk-2.32-r0 libffi-3.2.1-r4 -libgcc-6.4.0-r8 +libgcc-6.4.0-r9 libgcrypt-1.8.3-r0 libgmpxx-6.1.2-r1 -libgomp-6.4.0-r8 +libgomp-6.4.0-r9 libgpg-error-1.30-r0 libintl-0.19.8.1-r2 libisoburn-1.4.8-r0 @@ -152,6 +152,7 @@ libltdl-2.4.6-r5 libmagic-5.32-r0 libmnl-1.0.4-r0 libmount-2.32-r0 +libnfsidmap-2.3.1-r4 libnftnl-libs-1.1.1-r0 libnl-1.1.4-r0 libnl3-3.2.28-r1 @@ -169,7 +170,7 @@ libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 libssl1.0-1.0.2p-r0 -libstdc++-6.4.0-r8 +libstdc++-6.4.0-r9 libtasn1-4.13-r0 libtirpc-1.0.3-r0 libtirpc-dev-1.0.3-r0 @@ -184,7 +185,7 @@ libxau-1.0.8-r2 libxcb-1.13-r2 libxdmcp-1.1.2-r4 libxkbcommon-0.7.1-r1 -libxml2-2.9.8-r0 +libxml2-2.9.8-r1 linux-headers-4.4.6-r2 llvm5-5.0.1-r4 llvm5-dev-5.0.1-r4 @@ -212,8 +213,8 @@ ncurses-libs-6.1_p20180818-r1 ncurses-terminfo-6.1_p20180818-r1 ncurses-terminfo-base-6.1_p20180818-r1 nettle-3.4-r1 -nfs-utils-2.3.1-r3 -nfs-utils-openrc-2.3.1-r3 +nfs-utils-2.3.1-r4 +nfs-utils-openrc-2.3.1-r4 nghttp2-libs-1.32.0-r0 npth-1.5-r1 oniguruma-6.8.2-r0 @@ -277,7 +278,7 @@ tar-1.30-r0 tcl-8.6.7-r0 tcpdump-4.9.2-r3 tini-0.18.0-r0 -tzdata-2018d-r1 +tzdata-2018f-r0 udev-init-scripts-32-r2 udev-init-scripts-openrc-32-r2 usbredir-0.7.1-r0 @@ -287,7 +288,7 @@ util-linux-dev-2.32-r0 vde2-libs-2.3.2-r9 vim-8.1.0115-r0 wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20180918-r0 +wireguard-tools-0.0.20181018-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r14 wpa_supplicant-openrc-2.6-r14 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 236b7a02c..ab9c70734 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:4768505d40f23e198011b6f2c796f985fe50ec39-amd64 +# linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed-amd64 # automatically generated list of installed packages abuild-3.2.0-r0 alpine-baselayout-3.1.0-r0 @@ -72,15 +72,15 @@ fortify-headers-0.9-r0 fts-1.2.7-r1 fts-dev-1.2.7-r1 fuse-2.9.8-r0 -g++-6.4.0-r8 +g++-6.4.0-r9 gc-7.6.4-r2 -gcc-6.4.0-r8 +gcc-6.4.0-r9 gdbm-1.13-r1 gettext-0.19.8.1-r2 gettext-asprintf-0.19.8.1-r2 gettext-dev-0.19.8.1-r2 gettext-libs-0.19.8.1-r2 -git-2.18.0-r0 +git-2.18.1-r0 glib-2.56.1-r0 gmp-6.1.2-r1 gmp-dev-6.1.2-r1 @@ -117,7 +117,7 @@ libaio-0.3.111-r0 libarchive-3.3.2-r3 libarchive-tools-3.3.2-r3 libassuan-2.5.1-r0 -libatomic-6.4.0-r8 +libatomic-6.4.0-r9 libatomic_ops-7.6.4-r0 libattr-2.4.47-r7 libblkid-2.32-r0 @@ -144,10 +144,10 @@ libexecinfo-1.1-r0 libexecinfo-dev-1.1-r0 libfdisk-2.32-r0 libffi-3.2.1-r4 -libgcc-6.4.0-r8 +libgcc-6.4.0-r9 libgcrypt-1.8.3-r0 libgmpxx-6.1.2-r1 -libgomp-6.4.0-r8 +libgomp-6.4.0-r9 libgpg-error-1.30-r0 libintl-0.19.8.1-r2 libisoburn-1.4.8-r0 @@ -160,6 +160,7 @@ libmagic-5.32-r0 libmnl-1.0.4-r0 libmount-2.32-r0 libmspack-0.7.1_alpha-r0 +libnfsidmap-2.3.1-r4 libnftnl-libs-1.1.1-r0 libnl-1.1.4-r0 libnl3-3.2.28-r1 @@ -178,7 +179,7 @@ libseccomp-dev-2.3.3-r1 libsmartcols-2.32-r0 libssh2-1.8.0-r3 libssl1.0-1.0.2p-r0 -libstdc++-6.4.0-r8 +libstdc++-6.4.0-r9 libtasn1-4.13-r0 libtirpc-1.0.3-r0 libtirpc-dev-1.0.3-r0 @@ -195,7 +196,7 @@ libxau-1.0.8-r2 libxcb-1.13-r2 libxdmcp-1.1.2-r4 libxkbcommon-0.7.1-r1 -libxml2-2.9.8-r0 +libxml2-2.9.8-r1 linux-headers-4.4.6-r2 llvm5-5.0.1-r4 llvm5-dev-5.0.1-r4 @@ -226,8 +227,8 @@ ncurses-libs-6.1_p20180818-r1 ncurses-terminfo-6.1_p20180818-r1 ncurses-terminfo-base-6.1_p20180818-r1 nettle-3.4-r1 -nfs-utils-2.3.1-r3 -nfs-utils-openrc-2.3.1-r3 +nfs-utils-2.3.1-r4 +nfs-utils-openrc-2.3.1-r4 nghttp2-libs-1.32.0-r0 npth-1.5-r1 oniguruma-6.8.2-r0 @@ -293,7 +294,7 @@ tar-1.30-r0 tcl-8.6.7-r0 tcpdump-4.9.2-r3 tini-0.18.0-r0 -tzdata-2018d-r1 +tzdata-2018f-r0 udev-init-scripts-32-r2 udev-init-scripts-openrc-32-r2 usbredir-0.7.1-r0 @@ -303,7 +304,7 @@ util-linux-dev-2.32-r0 vde2-libs-2.3.2-r9 vim-8.1.0115-r0 wayland-libs-server-1.15.0-r0 -wireguard-tools-0.0.20180918-r0 +wireguard-tools-0.0.20181018-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r14 wpa_supplicant-openrc-2.6-r14