github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-18 17:01:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3212 from ijc/containerd-v1.2.0

Browse Source 
containerd v1.2.0
This commit is contained in:
Ian Campbell 2018-10-30 15:05:31 +00:00 committed by GitHub
commit 292dbdf46f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 349 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/aws.yml
View File

@ -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

8
examples/azure.yml
View File

@ -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

8
examples/cadvisor.yml
View File

@ -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

8
examples/docker-for-mac.yml
View File

@ -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

8
examples/docker.yml
View File

@ -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

10
examples/gcp.yml
View File

@ -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

8
examples/getty.yml
View File

@ -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

8
examples/hostmount-writeable-overlay.yml
View File

@ -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:

8
examples/influxdb-os.yml
View File

@ -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

8
examples/logging.yml
View File

@ -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

8
examples/minimal.yml
View File

@ -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:

8
examples/node_exporter.yml
View File

@ -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

8
examples/openstack.yml
View File

@ -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

10
examples/packet.yml
View File

@ -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

8
examples/redis-os.yml
View File

@ -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

8
examples/rt-for-vmware.yml
View File

@ -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

8
examples/scaleway.yml
View File

@ -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

10
examples/sshd.yml
View File

@ -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

8
examples/swap.yml
View File

@ -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

8
examples/tpm.yml
View File

@ -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

8
examples/vmware.yml
View File

@ -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

8
examples/vpnkit-forwarder.yml
View File

@ -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:

6
examples/vsudd-containerd.yml
View File

@ -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

10
examples/vultr.yml
View File

@ -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

8
examples/wireguard.yml
View File

@ -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

8
linuxkit.yml
View File

@ -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

2
pkg/containerd/Dockerfile
View File

@ -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

1
pkg/getty/build.yml
View File

@ -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:

4
pkg/init/Dockerfile
View File

@ -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

2
pkg/runc/Dockerfile
View File

@ -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

1
pkg/sshd/build.yml
View File

@ -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:

2
projects/clear-containers/clear-containers.yml
View File

@ -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

8
projects/compose/compose-dynamic.yml
View File

@ -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

8
projects/compose/compose-static.yml
View File

@ -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

6
projects/ima-namespace/ima-namespace.yml
View File

@ -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:

2
projects/landlock/landlock.yml
View File

@ -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

8
projects/memorizer/memorizer.yml
View File

@ -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:

8
projects/miragesdk/examples/fdd.yml
View File

@ -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

10
projects/miragesdk/examples/mirage-dhcp.yml
View File

@ -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:

8
projects/okernel/examples/okernel_simple.yaml
View File

@ -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:

8
projects/shiftfs/shiftfs.yml
View File

@ -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

28
scripts/push-manifest.sh
View File

@ -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 \

4
src/cmd/linuxkit/moby/linuxkit.go
View File

@ -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

28
src/cmd/linuxkit/pkglib/manifest_push_script.go
View File

@ -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 \

4
test/cases/000_build/000_formats/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/010_run_iso/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/020_run_efi/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/050_run_aws/test.yml
View File

@ -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

4
test/cases/010_platforms/000_qemu/100_container/test.yml
View File

@ -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

4
test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml
View File

@ -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

4
test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml
View File

@ -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

6
test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
View File

@ -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

4
test/cases/020_kernel/000_config_4.4.x/test.yml
View File

@ -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

4
test/cases/020_kernel/001_config_4.9.x/test.yml
View File

@ -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

4
test/cases/020_kernel/002_config_4.14.x/test.yml
View File

@ -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

4
test/cases/020_kernel/004_config_4.18.x/test.yml
View File

@ -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

4
test/cases/020_kernel/005_config_4.19.x/test.yml
View File

@ -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

4
test/cases/020_kernel/010_kmod_4.4.x/test.yml
View File

@ -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

4
test/cases/020_kernel/011_kmod_4.9.x/test.yml
View File

@ -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

4
test/cases/020_kernel/012_kmod_4.14.x/test.yml
View File

@ -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

4
test/cases/020_kernel/014_kmod_4.18.x/test.yml
View File

@ -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

4
test/cases/020_kernel/015_kmod_4.19.x/test.yml
View File

@ -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

4
test/cases/020_kernel/110_namespace/common.yml
View File

@ -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

6
test/cases/030_security/000_docker-bench/test.yml
View File

@ -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

4
test/cases/030_security/010_ports/test.yml
View File

@ -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

4
test/cases/040_packages/002_binfmt/test.yml
View File

@ -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

4
test/cases/040_packages/003_ca-certificates/test.yml
View File

@ -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

8
test/cases/040_packages/003_containerd/test.yml
View File

@ -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:

4
test/cases/040_packages/004_dhcpcd/test.yml
View File

@ -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

4
test/cases/040_packages/005_extend/000_ext4/test-create.yml
View File

@ -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

4
test/cases/040_packages/005_extend/000_ext4/test.yml
View File

@ -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

4
test/cases/040_packages/005_extend/001_btrfs/test-create.yml
View File

@ -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

4
test/cases/040_packages/005_extend/001_btrfs/test.yml
View File

@ -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

4
test/cases/040_packages/005_extend/002_xfs/test-create.yml
View File

@ -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

4
test/cases/040_packages/005_extend/002_xfs/test.yml
View File

@ -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

4
test/cases/040_packages/006_format_mount/000_auto/test.yml
View File

@ -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

4
test/cases/040_packages/006_format_mount/001_by_label/test.yml
View File

@ -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

4
test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
View File

@ -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

4
test/cases/040_packages/006_format_mount/003_btrfs/test.yml
View File

@ -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

4
test/cases/040_packages/006_format_mount/004_xfs/test.yml
View File

@ -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

4
test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
View File

@ -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

4
test/cases/040_packages/006_format_mount/010_multiple/test.yml
View File

@ -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

8
test/cases/040_packages/007_getty-containerd/test.yml
View File

@ -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)

4
test/cases/040_packages/013_mkimage/mkimage.yml
View File

@ -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

4
test/cases/040_packages/013_mkimage/run.yml
View File

@ -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

4
test/cases/040_packages/019_sysctl/test.yml
View File

@ -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

6
test/cases/040_packages/023_wireguard/test.yml
View File

@ -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

6
test/cases/040_packages/030_logwrite/test.yml
View File

@ -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:

6
test/cases/040_packages/031_kmsg/test.yml
View File

@ -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:

6
test/hack/test-ltp.yml
View File

@ -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

6
test/hack/test.yml
View File

@ -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

2
test/pkg/containerd/Dockerfile
View File

@ -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)

4
test/pkg/ns/template.yml
View File

@ -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:<hash>

2
tools/alpine/Dockerfile
View File

@ -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 && \

30
tools/alpine/push-manifest.sh
View File

@ -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")

27
tools/alpine/versions.s390x
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More