ansible/xoxys.docker_engine
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add options to auto-enable userns-remap
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2023-02-18 15:08:12 +01:00
parent c7477abeff
commit 8712f4307f
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/config.yml
View File

@ -49,9 +49,9 @@
state: directory state: directory
mode: "{{ item.mode }}" mode: "{{ item.mode }}"
- name: Write service override - name: Write service override.conf
template: template:
src: etc/systemd/system/docker.service.d/override.j2 src: etc/systemd/system/docker.service.d/override.conf.j2
dest: /etc/systemd/system/docker.service.d/override.conf dest: /etc/systemd/system/docker.service.d/override.conf
mode: 0644 mode: 0644
notify: __docker_restart notify: __docker_restart

2
templates/etc/sysconfig/docker.j2
View File

@ -1,4 +1,6 @@
{{ ansible_managed | comment }} {{ ansible_managed | comment }}
OPTIONS='{{' --userns-remap=' + dockerengine_nsremap_user + ':' + dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}'
# Proxy settings # Proxy settings
{% if dockerengine_http_proxy is defined %} {% if dockerengine_http_proxy is defined %}
HTTP_PROXY={{ dockerengine_http_proxy }} HTTP_PROXY={{ dockerengine_http_proxy }}

6
templates/etc/systemd/system/docker.service.d/override.conf.j2 Normal file
View File

@ -0,0 +1,6 @@
[Service]
EnvironmentFile=-/etc/sysconfig/docker
ExecStart=
ExecStart=/usr/bin/dockerd -H fd:// \
--containerd=/run/containerd/containerd.sock \
$OPTIONS

4
templates/etc/systemd/system/docker.service.d/override.j2
View File

@ -1,4 +0,0 @@
[Service]
EnvironmentFile=-/etc/sysconfig/docker
ExecStart=
ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock