From 7f11aeed8a06cff6c28c88328230255e578db130 Mon Sep 17 00:00:00 2001 From: Carrol Cox Date: Mon, 14 Oct 2019 18:24:58 +0500 Subject: [PATCH] [FIX] linting * Disable custom config by default --- defaults/main.yml | 4 ++-- tasks/main.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 189ef24..0325147 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,8 +5,9 @@ docker_package: "docker-{{ docker_edition }}" docker_package_state: present # Service options. -docker_service_state: started +docker_service_custom_config: false docker_service_enabled: true +docker_service_state: started docker_restart_handler_state: restarted # Docker Compose options. @@ -21,7 +22,6 @@ lazydocker_version: '0.7.4' lazydocker_path: '/usr/local/bin/lazydocker' lazydocker_url: "https://github.com/jesseduffield/lazydocker/releases/download/v{{ lazydocker_version }}/lazydocker_{{ lazydocker_version }}_Linux_x86_64.tar.gz" - # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. docker_apt_release_channel: stable docker_apt_arch: amd64 diff --git a/tasks/main.yml b/tasks/main.yml index b109fd5..6236ad6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,6 +16,8 @@ template: src: etc/docker/daemon.json.j2 dest: /etc/docker/daemon.json + when: + - docker_service_custom_config | bool notify: restart docker - name: Install docker