From 1ccadc233daec22d16d9b9e3192b07850b522305 Mon Sep 17 00:00:00 2001 From: ITQ Date: Wed, 8 Apr 2026 18:35:02 +0300 Subject: [PATCH] chore(): small improvements and fixes --- group_vars/all/docker.yaml | 3 ++- roles/dokploy/defaults/main.yaml | 2 +- roles/dokploy/tasks/delete.yaml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/group_vars/all/docker.yaml b/group_vars/all/docker.yaml index c6756a9..df0a977 100644 --- a/group_vars/all/docker.yaml +++ b/group_vars/all/docker.yaml @@ -3,7 +3,7 @@ docker_edition: "ce" docker_install_compose_plugin: true docker_users: - "{{ ansible_user }}" -docker_daemon_options: +_docker_daemon_options_base: debug: false init: false live-restore: true @@ -96,3 +96,4 @@ docker_daemon_options: labels: [] exec-opts: [] +docker_daemon_options: "{{ _docker_daemon_options_base | combine(docker_daemon_options_host | default({}), recursive=True) }}" diff --git a/roles/dokploy/defaults/main.yaml b/roles/dokploy/defaults/main.yaml index 62d537a..2eac20a 100644 --- a/roles/dokploy/defaults/main.yaml +++ b/roles/dokploy/defaults/main.yaml @@ -9,7 +9,7 @@ dokploy_advertise_addr: "" dokploy_postgres_image: postgres:16-alpine dokploy_redis_image: redis:8-alpine dokploy_dokploy_image: dokploy/dokploy:latest -dokploy_traefik_image: traefik:v3.6.1 +dokploy_traefik_image: traefik:v3.6 dokploy_postgres_user: dokploy dokploy_postgres_db: dokploy diff --git a/roles/dokploy/tasks/delete.yaml b/roles/dokploy/tasks/delete.yaml index 190a1d1..09d95ac 100644 --- a/roles/dokploy/tasks/delete.yaml +++ b/roles/dokploy/tasks/delete.yaml @@ -14,6 +14,7 @@ - _dokploy_remove_services is failed - "'could not find' not in (_dokploy_remove_services.msg | default('') | lower)" - "'not found' not in (_dokploy_remove_services.msg | default('') | lower)" + - "'not a swarm manager' not in (_dokploy_remove_services.msg | default('') | lower)" tags: dokploy, deletion - name: Leave Docker Swarm