Merge pull request #151 from docker/develop

Merging the develop changes into master
This commit is contained in:
Eli Uriegas 2018-08-21 11:15:07 -07:00 committed by GitHub
commit d5abba2e2c
1 changed files with 19 additions and 0 deletions

View File

@ -0,0 +1,19 @@
[Unit]
Description=Docker Application Container Engine
Documentation=https://docs.docker.com
BindsTo=containerd.service
After=network-online.target firewalld.service
Wants=network-online.target
[Service]
# Install containerd-shim-process if it's not already installed
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
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
Environment="PATH=/opt/containerd/bin:/sbin:/usr/bin:/usr/local/bin:$PATH"
[Install]
WantedBy=multi-user.target