From 52a28daed5d5c145a1fd812cbb5721bf46f40497 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 16:35:45 +0200 Subject: [PATCH 1/6] ddd --- .../templates/docker_housekeeping.service.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 index ae40c6d4..9d564e41 100644 --- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 +++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 @@ -1,8 +1,9 @@ {{ file_header | default () }} [Unit] -Description=Docker housekeeping tasks +Description=docker housekeeping tasks [Service] Type=simple -ExecStart=/usr/bin/docker system prune --force --filter "until=24h" +ExecStart=/usr/bin/docker system prune --force --filter "until=24h" --all +ExecStart=/usr/bin/docker buildx prune --force --filter "until=24h" # https://docs.docker.com/config/pruning -- 2.34.1 From acb6112789654ef3c735396185841bfcd986eef0 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 16:37:15 +0200 Subject: [PATCH 2/6] dd --- .../templates/docker_housekeeping.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 index 9d564e41..944f6a2a 100644 --- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 +++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 @@ -3,7 +3,7 @@ Description=docker housekeeping tasks [Service] -Type=simple +Type=oneshot ExecStart=/usr/bin/docker system prune --force --filter "until=24h" --all ExecStart=/usr/bin/docker buildx prune --force --filter "until=24h" # https://docs.docker.com/config/pruning -- 2.34.1 From abf2a3f6225c39663d0bd5ffc83d9e05e4181ad2 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 16:38:23 +0200 Subject: [PATCH 3/6] ff --- .../templates/docker_housekeeping.service.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 index 944f6a2a..10ac730c 100644 --- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 +++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 @@ -4,6 +4,5 @@ Description=docker housekeeping tasks [Service] Type=oneshot -ExecStart=/usr/bin/docker system prune --force --filter "until=24h" --all -ExecStart=/usr/bin/docker buildx prune --force --filter "until=24h" +ExecStart=/usr/bin/docker system prune --force --filter "until=24h" --all && /usr/bin/docker buildx prune --force --filter "until=24h" # https://docs.docker.com/config/pruning -- 2.34.1 From 1d90c669477c5c67a3417891931ccd639142d26c Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 16:38:44 +0200 Subject: [PATCH 4/6] dd --- .../templates/docker_housekeeping.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 index 10ac730c..c01d7dc2 100644 --- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 +++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 @@ -4,5 +4,5 @@ Description=docker housekeeping tasks [Service] Type=oneshot -ExecStart=/usr/bin/docker system prune --force --filter "until=24h" --all && /usr/bin/docker buildx prune --force --filter "until=24h" +ExecStart=/bin/bash -c '/usr/bin/docker system prune --force --filter "until=24h" --all && /usr/bin/docker buildx prune --force --filter "until=24h"' # https://docs.docker.com/config/pruning -- 2.34.1 From ce0d60716894decd2d2341e0c289204b447567b5 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 16:39:19 +0200 Subject: [PATCH 5/6] dd --- .../templates/docker_housekeeping.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 index c01d7dc2..bf2424b4 100644 --- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 +++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 @@ -3,6 +3,6 @@ Description=docker housekeeping tasks [Service] -Type=oneshot +Type=simple ExecStart=/bin/bash -c '/usr/bin/docker system prune --force --filter "until=24h" --all && /usr/bin/docker buildx prune --force --filter "until=24h"' # https://docs.docker.com/config/pruning -- 2.34.1 From 128726e257dfc3ea4c2548ec498f21b44b38d593 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 16 Sep 2024 16:41:48 +0200 Subject: [PATCH 6/6] rff --- roles/mgrote_docker_housekeeping/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/mgrote_docker_housekeeping/tasks/main.yml b/roles/mgrote_docker_housekeeping/tasks/main.yml index 7037f603..b56c2559 100644 --- a/roles/mgrote_docker_housekeeping/tasks/main.yml +++ b/roles/mgrote_docker_housekeeping/tasks/main.yml @@ -24,10 +24,11 @@ - name: Enable Units become: true - ansible.builtin.systemd: + ansible.builtin.systemd_service: name: "{{ item }}" enabled: true masked: false + daemon_reload: true with_items: - docker_housekeeping.service - docker_housekeeping.timer -- 2.34.1