Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #169 from andrewhsu/sync
Browse files Browse the repository at this point in the history
[master] bring in changes that went first to 18.09 branch
  • Loading branch information
andrewhsu authored Aug 28, 2018
2 parents d5abba2 + 53343f1 commit 21458dd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions contrib/init/systemd/docker.service
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 21458dd

Please sign in to comment.