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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
a3131e27
Unverified
Commit
a3131e27
authored
5 years ago
by
Hector S
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Removed env vars DOCKER_NETWORK_OPTIONS and INSECURE_REGISTRY from docker.service.j2 (#6126)
parent
ed12936b
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/container-engine/docker/templates/docker.service.j2
+1
-3
1 addition, 3 deletions
roles/container-engine/docker/templates/docker.service.j2
with
1 addition
and
3 deletions
roles/container-engine/docker/templates/docker.service.j2
+
1
−
3
View file @
a3131e27
...
@@ -30,9 +30,7 @@ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is ve
...
@@ -30,9 +30,7 @@ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is ve
{% endif %}
{% endif %}
$DOCKER_OPTS \
$DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \
$DOCKER_DNS_OPTIONS
$DOCKER_DNS_OPTIONS \
$INSECURE_REGISTRY
{% if not is_ostree and systemd_version.stdout|int >= 226 %}
{% if not is_ostree and systemd_version.stdout|int >= 226 %}
TasksMax=infinity
TasksMax=infinity
{% endif %}
{% endif %}
...
...
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