diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 1d4a30aed..07cf28c90 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -6,7 +6,7 @@ init: - linuxkit/vpnkit-expose-port:fa4ab4ac78b83fe392e39b861b4114c3bb02d170 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: # support metadata for optional config in /var/config diff --git a/examples/aws.yml b/examples/aws.yml index d4c9fe013..1645a41a0 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 1f3edd7ac..0117f5b78 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index ede8412e7..1ab00f762 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 4f7fe2b7a..021384ed5 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 642b32615..c77f77600 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 70c2b2725..8d6991b96 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 22c30a12a..cc0a1e35f 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 services: - name: getty image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 diff --git a/examples/packet.yml b/examples/packet.yml index 2b0561499..6637cc3bf 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: rngd1 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 2603e4936..3eca0e162 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 diff --git a/examples/sshd.yml b/examples/sshd.yml index 53f0e7494..43949646b 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index 02da030c5..2b5e8d7cb 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index 139235580..15325e31e 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 305a27356..5fb6a418f 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index c8d510059..f54857e82 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index c2f3e684c..c441d8d83 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 diff --git a/examples/vultr.yml b/examples/vultr.yml index 1925f3961..58d36d905 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 9735bd298..0bd9dc1e6 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 748c230fa..5a12d2543 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 8e61902ae..71ed2296a 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,18 +1,7 @@ -FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 as alpine -RUN \ - apk add \ - btrfs-progs-dev \ - gcc \ - git \ - go \ - libc-dev \ - linux-headers \ - make \ - tzdata \ - && true +FROM linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3 as alpine +RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd -RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" RUN cp bin/containerd bin/ctr bin/containerd-shim /usr/bin/ RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index bad092aab..e28c86c88 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 7fe13f83c..3363730db 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 3dbdf93de..318970fd3 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index a6c2d88bd..d44db729e 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index fd0e1f450..ee223b728 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 5bd4b3bb6..f0c3496d7 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 # with runc, logwrite, startmemlogd - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 13834213f..ec9adc47b 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 5afc8ef5d..8dd1099d8 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index d2da5422e..fbc7e9efa 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 6e79de741..5458d0230 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 34aa4c707..9f8d7bccf 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e8d8f3507..bc82bf257 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 1c67362f9..7a591f242 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 services: - name: acpid image: linuxkit/acpid:79e5c20de96e1633c9c40935b99dde45aefba37b diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index a74c29497..e6ac30cf1 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: sysctl diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 8777bbd39..a933f635f 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index be7eadd34..1d2a2e026 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 59918f6ba..796e46cdc 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 7022fa7ea..a26e0d661 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: ltp image: linuxkit/test-ltp:38cec1526acc8b1a2ce4b4ece78a810078c807e1 diff --git a/test/hack/test.yml b/test/hack/test.yml index 46dafdac8..b530cd0f0 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:6fe9d31a53bbd200183bb31edd795305e868d5a7 - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a - - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 + - linuxkit/containerd:ad6710e069cb538c76314a28e09d6b49958c88e0 onboot: - name: dhcpcd image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index a26fa20db..4f038cb82 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN go get -u github.com/golang/lint/golint RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/LK4D4/vndr -# checkout containerd +# checkout and compile containerd # 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 @@ -50,6 +50,9 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ cd $GOPATH/src/github.com/containerd/containerd && \ git checkout $CONTAINERD_COMMIT +RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make +RUN cd $GOPATH/src/github.com/containerd/containerd && \ + make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" FROM $BASE diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 163d440c1..8947c7fd5 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:415e9417004bbd8940a4c2303195b20a5dbd8c9a-arm64 +# linuxkit/alpine:a662efbaf4226d0ac358cc009ead9a95b3b1dd99-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index b202a4abb..968701e24 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:79987c65c66700171c073151c1d3f0372597bec2-amd64 +# linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0