diff --git a/Dockerfile b/Dockerfile index be6e325..c86c260 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,18 +4,18 @@ ### Version definitions # use ./hack/show-latest-commits.sh to get the latest commits -# 2020-03-07T12:15:26Z -ARG ROOTLESSKIT_COMMIT=304c2fac12efd58d22251ee1a4b41710efbe454b +# 2020-03-07T19:02:08Z +ARG ROOTLESSKIT_COMMIT=7a75cc5316c0345c092cc5f7da07a9bb1fb58553 # 2019-12-18T03:10:18Z ARG SLIRP4NETNS_COMMIT=a8414d1d1629f6f7a93b60b55e183a93d10d9a1c -# 2020-03-06T19:44:44Z -ARG CONTAINERD_COMMIT=3868dd754064b843579e2aac0fa846185869c2a7 -# 2020-02-20T08:27:20Z -ARG CONTAINERD_FUSE_OVERLAYFS_COMMIT=bb896865146c4c0fdb06933f7fddb5603019e0ed -# 2020-03-07T06:25:09Z -ARG CRIO_COMMIT=6adf00c8531cc3f0967066e047ba330f2bdf549a -# 2020-03-07T09:13:34Z -ARG KUBERNETES_COMMIT=71ad0a90205c12e8ebbe6872db30097026916659 +# 2020-03-08T06:49:26Z +ARG CONTAINERD_COMMIT=92cfc5b1fb91e0e09bd9ef18de082cd648e2bdc0 +# 2020-03-09T08:58:15Z +ARG CONTAINERD_FUSE_OVERLAYFS_COMMIT=86d17da27d9d344ab1681245176cc31190076d5d +# 2020-03-08T00:25:48Z +ARG CRIO_COMMIT=7726458685da447d4e57b9f207639908a761f5ab +# 2020-03-09T00:55:34Z +ARG KUBERNETES_COMMIT=5383e01d2aba769dcf89c3b9c5092a6432193b61 # Version definitions (cont.) ARG CONMON_RELEASE=v2.0.11 diff --git a/install.sh b/install.sh index f3cdbec..d4de74e 100755 --- a/install.sh +++ b/install.sh @@ -308,7 +308,7 @@ BindsTo=u7s-rootlesskit.service PartOf=u7s-node.target [Service] -# containerd doesn't support NOTIFY_SOCKET yet (containerd#4043) +# TODO: enable Type=Notify (with NotifyAccess=all) when CRI runtimes support cgroup ExecStart=${base}/boot/${cri}.sh ${service_common} EOF @@ -322,6 +322,8 @@ PartOf=u7s-node.target Before=u7s-containerd.service [Service] +Type=notify +NotifyAccess=all ExecStart=${base}/boot/containerd-fuse-overlayfs-grpc.sh ${service_common} EOF