1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #169 from andrewhsu/sync

[master] bring in changes that went first to 18.09 branch
This commit is contained in:
Andrew Hsu 2018-08-28 13:21:06 -07:00 committed by GitHub
commit 21458dd413

View file

@ -10,6 +10,7 @@ Wants=network-online.target
ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process
ExecStart=/usr/bin/dockerd
TimeoutSec=0
RestartSec=2
Restart=always
# On RPM Based distributions PATH isn't defined so we define it here
# /opt/containerd/bin is in front so dockerd grabs the correct runc binary