Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
79417e07
Commit
79417e07
authored
Dec 8, 2017
by
Thomas Sarboni
Committed by
Matthew Mosesohn
Dec 8, 2017
Browse files
Options
Downloads
Patches
Plain Diff
Fix systemd service unit for docker >= 17.03 (#1844)
parent
626b35e1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/docker/templates/docker.service.j2
+1
-1
1 addition, 1 deletion
roles/docker/templates/docker.service.j2
with
1 addition
and
1 deletion
roles/docker/templates/docker.service.j2
+
1
−
1
View file @
79417e07
...
...
@@ -18,7 +18,7 @@ Environment=GOTRACEBACK=crash
ExecReload=/bin/kill -s HUP $MAINPID
Delegate=yes
KillMode=process
ExecStart={{ docker_bin_dir }}/docker
daemon
\
ExecStart={{ docker_bin_dir }}/docker
{% if docker_version.stdout|version_compare('17.03', '<') %} daemon{% else %}d{% endif %}
\
$DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment