Docker 18.09.1 doesn't ship with docker-runc: it uses containerd's ru…

…nc instead
Netflix · Jan 29, 2019 · 73d4600 · 73d4600
1 parent 1199ace
commit 73d4600
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/hack/agent/Dockerfile b/hack/agent/Dockerfile
@@ -27,7 +27,7 @@ RUN echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stabl
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
 
 RUN export DEBIAN_FRONTEND=noninteractive && apt-get update &&\
-    apt-get install -y build-essential make cmake libattr1-dev dbus docker-ce=18.06.1~ce~3-0~ubuntu wget
+    apt-get install -y build-essential make cmake libattr1-dev dbus docker-ce=5:18.09.1~3-0~ubuntu-xenial wget
 
 COPY --from=golang:1.11-stretch /usr/local/go /usr/local/go
 ENV GOPATH /go

diff --git a/hack/builder/titus-executor-builder.sh b/hack/builder/titus-executor-builder.sh
@@ -105,6 +105,7 @@ fpm -t deb -s dir -C root \
   --deb-activate ldconfig \
   --depends libc6 \
   --depends 'apparmor >= 2.12-4ubuntu7' \
+  --depends 'docker-ce >= 5:18.09.1~3-0~ubuntu-xenial' \
   --deb-recommends lxcfs \
   --deb-recommends atlas-titus-agent \
   ${provides:-} \

diff --git a/root/lib/systemd/system/titus-metatron-sync@.service b/root/lib/systemd/system/titus-metatron-sync@.service
@@ -4,9 +4,9 @@ ConditionPathIsDirectory=/var/lib/titus-inits/%i/ns
 
 [Service]
 EnvironmentFile=/var/lib/titus-environments/%i.env
-ExecStartPre=/usr/bin/docker-runc --root /var/run/docker/runtime-runc/moby exec ${TITUS_CONTAINER_ID} /titus/metatron/bin/titus-metatrond --init
-ExecStart=/usr/bin/docker-runc --root /var/run/docker/runtime-runc/moby exec ${TITUS_CONTAINER_ID} /titus/metatron/bin/titus-metatrond
+ExecStartPre=/usr/sbin/runc --root /var/run/docker/runtime-runc/moby exec ${TITUS_CONTAINER_ID} /titus/metatron/bin/titus-metatrond --init
+ExecStart=/usr/sbin/runc --root /var/run/docker/runtime-runc/moby exec ${TITUS_CONTAINER_ID} /titus/metatron/bin/titus-metatrond
 
 Restart=on-failure
 RestartSec=1
-KillMode=mixed
+KillMode=mixed