Merge "Missing ExecStart in docker.service"

This commit is contained in:
Jenkins 2017-06-02 09:45:22 +00:00 committed by Gerrit Code Review
commit dc6f7579d5

View File

@ -102,12 +102,14 @@ section:
[Service]
MountFlags=shared
EnvironmentFile=/etc/sysconfig/docker
ExecStart=
ExecStart=/usr/bin/docker daemon $INSECURE_REGISTRY
# Ubuntu
[Service]
MountFlags=shared
EnvironmentFile=-/etc/default/docker
ExecStart=
ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
Restart Docker by executing the following commands: