From 3adcae94c236240cdb4b7121729f572a247c48e2 Mon Sep 17 00:00:00 2001 From: Margarita Manterola Date: Wed, 10 Mar 2021 11:11:15 +0100 Subject: [PATCH] Revert adding explicit path to the containerd unit This unit is post-processed for torcx purposes and adding absolute paths breaks execution. --- .../app-emulation/containerd/files/containerd-1.0.0.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service index 722f363c1b..d5508823e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service @@ -6,8 +6,8 @@ After=network.target [Service] Delegate=yes Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml -ExecStartPre=/usr/bin/mkdir -p /run/docker/libcontainerd -ExecStartPre=/usr/bin/ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock +ExecStartPre=mkdir -p /run/docker/libcontainerd +ExecStartPre=ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock ExecStartPre=-/sbin/modprobe overlay ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG} KillMode=process