Skip to content

Commit

Permalink
Merge pull request linuxkit#2982 from ijc/containerd-v1.0.3
Browse files Browse the repository at this point in the history
Bump to containerd v1.0.3
  • Loading branch information
ijc authored Apr 3, 2018
2 parents 9f50d08 + 2d6b147 commit 8b434f4
Show file tree
Hide file tree
Showing 91 changed files with 259 additions and 259 deletions.
6 changes: 3 additions & 3 deletions examples/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/cadvisor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/docker-for-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kernel:
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:3f60b78f78bfb83c14dd459ff7a3f58dacb33ad0 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
# support metadata for optional config in /run/config
Expand Down
6 changes: 3 additions & 3 deletions examples/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/getty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/hostmount-writeable-overlay.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/influxdb-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: dhcpcd
Expand Down
6 changes: 3 additions & 3 deletions examples/minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
Expand Down
6 changes: 3 additions & 3 deletions examples/node_exporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
services:
- name: getty
image: linuxkit/getty:9e2c184fdd708720d47e663f03ad137c074d4f21
Expand Down
6 changes: 3 additions & 3 deletions examples/openstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/packet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kernel:
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
- linuxkit/firmware:33b2483a7e2cc54cc4a58dbe9c3662f7f067f70d
onboot:
Expand Down
6 changes: 3 additions & 3 deletions examples/redis-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
Expand Down
6 changes: 3 additions & 3 deletions examples/rt-for-vmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.29-rt
cmdline: "console=tty0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/sshd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/swap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/tpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.38
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/vmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/vpnkit-forwarder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
Expand Down
6 changes: 3 additions & 3 deletions examples/vsudd-containerd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165
Expand Down
6 changes: 3 additions & 3 deletions examples/vultr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/wireguard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions linuxkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee as alpine
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as alpine
RUN apk add tzdata

WORKDIR $GOPATH/src/github.com/containerd/containerd
Expand Down
4 changes: 2 additions & 2 deletions pkg/init/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS build
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers

ADD usermode-helper.c ./
Expand All @@ -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:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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

Expand Down
2 changes: 1 addition & 1 deletion pkg/runc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN \
make \
&& true
ENV GOPATH=/go PATH=$PATH:/go/bin
ENV RUNC_COMMIT=a618ab5a0186905949ee463dbb762c3d23e12a80
ENV RUNC_COMMIT=69663f0bd4b60df09991c08812a60108003fa340
RUN mkdir -p $GOPATH/src/github.com/opencontainers && \
cd $GOPATH/src/github.com/opencontainers && \
git clone https://github.com/opencontainers/runc.git
Expand Down
2 changes: 1 addition & 1 deletion projects/clear-containers/clear-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
onboot:
- name: sysctl
image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c
Expand Down
6 changes: 3 additions & 3 deletions projects/compose/compose-dynamic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions projects/compose/compose-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.32
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions projects/ima-namespace/ima-namespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239
- linuxkit/containerd:d03b69c7d23fdae0fec1b6e62a72d362992135df
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- linuxkit/runc:17e8c06e48ac220be79b2476e39b4d7feb905524
- linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
- linuxkit/ca-certificates:04a6dc9e5c901ee128c353f690bd97aeb7d97ae8
- linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
onboot:
Expand Down
2 changes: 1 addition & 1 deletion projects/landlock/landlock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ kernel:
image: mobylinux/kernel-landlock:4.9.x
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:7af4e32f31f04d6c63d457c502d2f69344db7d72
- linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
Expand Down
Loading

0 comments on commit 8b434f4

Please sign in to comment.