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

ensure userns is disabled and pass env file to docker container
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2020-03-22 16:47:48 +01:00
parent 8c20b0a285
commit 0ec9e4daa4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/etc/systemd/system/tidy.service.j2
View File

@ -7,7 +7,6 @@ After=docker.service network-online.target
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/sysconfig/tidy
ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true' ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true' ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
@ -15,8 +14,10 @@ ExecStartPre=/usr/bin/docker pull {{ dockertidy_image }}
ExecStart=/usr/bin/docker run --rm \ ExecStart=/usr/bin/docker run --rm \
--name %p \ --name %p \
--hostname %p \ --hostname %p \
--env-file /etc/sysconfig/tidy \
--volume {{ dockertidy_docker_socket_path }}:/var/run/docker.sock \ --volume {{ dockertidy_docker_socket_path }}:/var/run/docker.sock \
--privileged=true \ --privileged=true \
--userns=host \
{{ dockertidy_image }} \ {{ dockertidy_image }} \
[Install] [Install]