From 953ceed5a42fca8c84d42da1038964f704929056 Mon Sep 17 00:00:00 2001 From: ale Date: Mon, 23 Mar 2020 15:10:49 +0000 Subject: [PATCH] Use the right container_runtime when pruning deleted services --- roles/docker/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 9429419..999f03d 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -17,7 +17,7 @@ when: "container_runtime == 'podman'" - name: Login to the Docker registry - command: 'echo -n "{{ docker_registry_password }}" | docker login -u "{{ docker_registry_username }}" --password-stdin "{{ docker_registry_url }}"' + command: 'echo -n "{{ docker_registry_password }}" | {{ container_runtime }} login -u "{{ docker_registry_username }}" --password-stdin "{{ docker_registry_url }}"' changed_when: False when: "docker_registry_url != ''" @@ -38,7 +38,7 @@ # the ones that are not specified in services.yml. - name: Get list of running containers - command: "docker ps --format={% raw %}'{{.Names}}'{% endraw %}" + command: "{{ container_runtime }} ps --format={% raw %}'{{.Names}}'{% endraw %}" changed_when: False check_mode: no register: docker_running_containers -- GitLab