From 1ebc079dd2818f7c6591651a44a71c55327c5207 Mon Sep 17 00:00:00 2001 From: syrell Date: Thu, 22 Feb 2024 23:07:10 +0100 Subject: [PATCH] Modified Docker daemon option name to not overlap --- roles/docker/README.adoc | 2 +- roles/docker/defaults/main.yml | 2 +- roles/docker/tasks/docker.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/docker/README.adoc b/roles/docker/README.adoc index 45e4ca2..7c243cf 100644 --- a/roles/docker/README.adoc +++ b/roles/docker/README.adoc @@ -39,7 +39,7 @@ A list of UNIX users to add to the docker group. [source,yaml] ---- -docker_daemon_options: +docker_options: docker_daemon_options: log-opts: max-size: "100m" diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c374dbd..3ad1def 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -15,7 +15,7 @@ docker_packages: - "containerd.io" docker_users: - "syrell" -docker_daemon_options: +docker_options: docker_daemon_options: log-opts: max-size: "100m" diff --git a/roles/docker/tasks/docker.yml b/roles/docker/tasks/docker.yml index 62ddee0..2c11540 100644 --- a/roles/docker/tasks/docker.yml +++ b/roles/docker/tasks/docker.yml @@ -26,14 +26,14 @@ path: /etc/docker state: directory mode: 0755 - when: docker_daemon_options.keys() | length > 0 + when: docker_options.keys() | length > 0 - name: Configure Docker daemon options copy: - content: "{{ docker_daemon_options | to_nice_json }}" + content: "{{ docker_options | to_nice_json }}" dest: /etc/docker/daemon.json mode: 0644 - when: docker_daemon_options.keys() | length > 0 + when: docker_options.keys() | length > 0 notify: restart docker - name: Ensure Docker is started and enabled at boot.