From f64c0d46716724dd2e500e74d287fef36c79a165 Mon Sep 17 00:00:00 2001 From: felix-caboff <125881693+felix-caboff@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:18:54 +0000 Subject: [PATCH 1/2] Update kubehound.sh Safety check to ensure the correct version of docker compose is installed --- scripts/kubehound.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/kubehound.sh b/scripts/kubehound.sh index 7805c4608..1e297ed0c 100755 --- a/scripts/kubehound.sh +++ b/scripts/kubehound.sh @@ -31,6 +31,12 @@ check_docker() { exit 1 fi + if ! [ "$(docker compose version | grep '^Docker Compose version 2')" ]; then + # docker compose v2 isn't available at all, there's no point in continuing + echo "Docker Compose v2 isn't available. You should install it." + exit 1 + fi + DOCKER_CMD="docker" if ! $DOCKER_CMD info > /dev/null 2>&1; then echo "Docker isn't accessible with the current user. Retrying with sudo." From 3b5a30f5ca033acaf18c814d9e1e0bd44d413987 Mon Sep 17 00:00:00 2001 From: felix-caboff <125881693+felix-caboff@users.noreply.github.com> Date: Tue, 2 Jan 2024 08:56:41 +0000 Subject: [PATCH 2/2] Update scripts/kubehound.sh even better safety check. Co-authored-by: Edouard Schweisguth --- scripts/kubehound.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kubehound.sh b/scripts/kubehound.sh index 1e297ed0c..7da086566 100755 --- a/scripts/kubehound.sh +++ b/scripts/kubehound.sh @@ -31,7 +31,7 @@ check_docker() { exit 1 fi - if ! [ "$(docker compose version | grep '^Docker Compose version 2')" ]; then + if ! [ "$(docker compose version | grep '^Docker Compose version v2')" ]; then # docker compose v2 isn't available at all, there's no point in continuing echo "Docker Compose v2 isn't available. You should install it." exit 1