Skip to content

Commit

Permalink
Merge pull request #3262 from ijc/containerd-v1.2.2
Browse files Browse the repository at this point in the history
Containerd v1.2.2
  • Loading branch information
ijc committed Jan 9, 2019
2 parents c033d68 + 7386a32 commit eb7e075
Show file tree
Hide file tree
Showing 96 changed files with 304 additions and 302 deletions.
6 changes: 3 additions & 3 deletions examples/aws.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/azure.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/cadvisor.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/docker-for-mac.yml
Expand Up @@ -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:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
# support metadata for optional config in /run/config
Expand Down
6 changes: 3 additions & 3 deletions examples/docker.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/gcp.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/getty.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/hostmount-writeable-overlay.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/influxdb-os.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: dhcpcd
Expand Down
6 changes: 3 additions & 3 deletions examples/logging.yml
Expand Up @@ -3,9 +3,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
- linuxkit/memlogd:v0.6
onboot:
Expand Down
6 changes: 3 additions & 3 deletions examples/minimal.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.6
Expand Down
6 changes: 3 additions & 3 deletions examples/node_exporter.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
services:
- name: getty
image: linuxkit/getty:2eb742cd7a68e14cf50577c02f30147bc406e478
Expand Down
6 changes: 3 additions & 3 deletions examples/openstack.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/packet.yml
Expand Up @@ -3,9 +3,9 @@ kernel:
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
- linuxkit/firmware:v0.6
onboot:
Expand Down
6 changes: 3 additions & 3 deletions examples/redis-os.yml
Expand Up @@ -4,9 +4,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.6
Expand Down
6 changes: 3 additions & 3 deletions examples/rt-for-vmware.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.87-rt
cmdline: "console=tty0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/scaleway.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/sshd.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/swap.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/tpm.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.38
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/vmware.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/vpnkit-forwarder.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.6
Expand Down
6 changes: 3 additions & 3 deletions examples/vsudd-containerd.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.6
Expand Down
6 changes: 3 additions & 3 deletions examples/vultr.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions examples/wireguard.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
6 changes: 3 additions & 3 deletions linuxkit.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed as alpine
FROM linuxkit/alpine:0de3332a65895be3a610a99377545c157ca4b138 as alpine
RUN apk add tzdata

WORKDIR $GOPATH/src/github.com/containerd/containerd
Expand Down
4 changes: 2 additions & 2 deletions pkg/init/Dockerfile
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS build
FROM linuxkit/alpine:0de3332a65895be3a610a99377545c157ca4b138 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:ace75d0ec6978762d445083d6c8c6336bdb658ed AS mirror
FROM linuxkit/alpine:0de3332a65895be3a610a99377545c157ca4b138 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
4 changes: 2 additions & 2 deletions pkg/runc/Dockerfile
@@ -1,4 +1,4 @@
FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 as alpine
FROM linuxkit/alpine:0de3332a65895be3a610a99377545c157ca4b138 as alpine
RUN \
apk add \
bash \
Expand All @@ -11,7 +11,7 @@ RUN \
make \
&& true
ENV GOPATH=/go PATH=$PATH:/go/bin
ENV RUNC_COMMIT=58592df56734acf62e574865fe40b9e53e967910
ENV RUNC_COMMIT=96ec2177ae841256168fcf76954f7177af9446eb
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
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:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
onboot:
- name: sysctl
image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c
Expand Down
6 changes: 3 additions & 3 deletions projects/compose/compose-dynamic.yml
Expand Up @@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.14.91
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1
- linuxkit/runc:83d0edb4552b1a5df1f0976f05f442829eac38fe
- linuxkit/containerd:326b096cd5fbab0f864e52721d036cade67599d6
- linuxkit/init:e0dced91adbfba34c53cd673760e011f410638ff
- linuxkit/runc:b87c49e73eb14ba73d23eabf75423e987a043209
- linuxkit/containerd:cf158d5f56c5b4867f29f0fc3ec49ea505e99333
- linuxkit/ca-certificates:v0.6
onboot:
- name: sysctl
Expand Down

0 comments on commit eb7e075

Please sign in to comment.