Skip to content

Commit d8ad88b

Browse files
authored
fix(kURL): add pre-check to remove docker in AL2 (#5382)
1 parent ed61d48 commit d8ad88b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

scripts/common/docker.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,21 @@ function uninstall_docker_new_installs_with_containerd() {
238238
;;
239239

240240
centos|rhel|amzn|ol)
241-
local dockerPackages=("docker.io" "docker-ce" "docker-ce-cli")
241+
local dockerPackages=("docker" "docker.io" "docker-ce" "docker-ce-cli")
242242
if rpm -qa | grep -q 'docker-ce-rootless-extras'; then
243243
dockerPackages+=("docker-ce-rootless-extras")
244244
fi
245245
if rpm -qa | grep -q 'docker-scan-plugin'; then
246246
dockerPackages+=("docker-scan-plugin")
247247
fi
248-
rpm --erase ${dockerPackages[@]}
248+
local installedDockerPackages=()
249+
# Check if each Docker-related package is installed and add to the list if so
250+
for package in "${dockerPackages[@]}"; do
251+
if sudo rpm -q "$package" &>/dev/null; then
252+
installedPackages+=("$package")
253+
fi
254+
done
255+
rpm --erase ${installedPackages[@]}
249256
;;
250257
esac
251258

0 commit comments

Comments
 (0)