Skip to content

Commit

Permalink
fix: add socket file and daemon configs
Browse files Browse the repository at this point in the history
  • Loading branch information
ricolin committed Nov 23, 2023
1 parent de46b22 commit f950faf
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 9 deletions.
5 changes: 4 additions & 1 deletion roles/docker/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ docker_state_dir: /run/docker
docker_oom_score: 0

docker_debug_level: "info"
docker_max_log_size: -1
docker_max_log_size: "50m"
docker_max_log_file: "5"
docker_use_iptables: "false"
docker_ip_forward: "false"

docker_limit_proc_num: "infinity"
docker_limit_core: "infinity"
Expand Down
15 changes: 15 additions & 0 deletions roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@
notify:
- Restart docker

- name: Install "iptables" package
ansible.builtin.package:
name: iptables
state: present
when: docker_use_iptables | bool

- name: Create systemd socket file for docker
ansible.builtin.template:
src: docker.socket.j2
dest: /usr/lib/systemd/system/docker.socket
mode: "0644"
notify:
- Reload systemd
- Restart docker

- name: Create docker config file
ansible.builtin.template:
src: daemon.json.j2
Expand Down
28 changes: 20 additions & 8 deletions roles/docker/templates/daemon.json.j2
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
{
"log-driver": "json-file",
"log-opts": {
"max-size": {{ docker_max_log_size }}
},
"exec-root": "{{ docker_state_dir }}",
"data-root": "{{ docker_storage_dir }}",
"log-level": "{{ docker_debug_level | default('info') }}",
"oom-score-adjust": {{ docker_oom_score }}
"log-driver": "json-file",
"exec-root": "{{ docker_state_dir }}",
"data-root": "{{ docker_storage_dir }}",
"log-level": "{{ docker_debug_level | default('info') }}",
"oom-score-adjust": {{ docker_oom_score }},
"bridge": "none",
"default-ulimits": {
"nofile": {
"hard": 1048576,
"name": "nofile",
"soft": 1048576
}
},
"ip-forward": {{ docker_ip_forward }},
"iptables": {{ docker_use_iptables }},
"live-restore": true,
"log-opts": {
"max-file": "{{ docker_max_log_file }}",
"max-size": "{{ docker_max_log_size }}"
}
}
13 changes: 13 additions & 0 deletions roles/docker/templates/docker.socket.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Docker Socket for the API

[Socket]
# If /var/run is not implemented as a symlink to /run, you may need to
# specify ListenStream=/var/run/docker.sock instead.
ListenStream=/run/docker.sock
SocketMode=0660
SocketUser=root
SocketGroup=root

[Install]
WantedBy=sockets.target

0 comments on commit f950faf

Please sign in to comment.