From 8919901ed59f6e66e2ebee2914f13ed2a742d015 Mon Sep 17 00:00:00 2001
From: kyrie <139965836+KubeKyrie@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:55:18 +0800
Subject: [PATCH] fix python regex matching problem when finding docker
packages (#11075)
---
roles/container-engine/docker/tasks/reset.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/container-engine/docker/tasks/reset.yml b/roles/container-engine/docker/tasks/reset.yml
index 4bca908e6..40d19a4ff 100644
--- a/roles/container-engine/docker/tasks/reset.yml
+++ b/roles/container-engine/docker/tasks/reset.yml
@@ -6,8 +6,8 @@
- name: Docker | Find docker packages
set_fact:
- docker_packages_list: "{{ ansible_facts.packages.keys() | select('search', '^docker*') }}"
- containerd_package: "{{ ansible_facts.packages.keys() | select('search', '^containerd*') }}"
+ docker_packages_list: "{{ ansible_facts.packages.keys() | select('search', '^docker+') }}"
+ containerd_package: "{{ ansible_facts.packages.keys() | select('search', '^containerd+') }}"
- name: Docker | Stop all running container
shell: "set -o pipefail && {{ docker_bin_dir }}/docker ps -q | xargs -r {{ docker_bin_dir }}/docker kill"
--
GitLab