From 111cf72ed0f8bf8646d9fdeeb9944ed9a65f64f2 Mon Sep 17 00:00:00 2001 From: Ryan Emerson Date: Tue, 7 Jan 2025 12:14:18 +0000 Subject: [PATCH] Revert "Attempt to use podman in scripts if docker not installed" This reverts commit 827de542f56a3909159ee7125b7646d0853f3656. --- scripts/ci/configure-xsite.sh | 7 ------- scripts/ci/kind.sh | 7 ------- 2 files changed, 14 deletions(-) diff --git a/scripts/ci/configure-xsite.sh b/scripts/ci/configure-xsite.sh index 161287d0c..6a9f7bf1e 100755 --- a/scripts/ci/configure-xsite.sh +++ b/scripts/ci/configure-xsite.sh @@ -17,13 +17,6 @@ kind delete clusters --all # Common part for both nodes make operator-build IMG=$IMG -if ! [ -x "$(docker -v)" ]; then - echo "docker not installed, trying podman" - function docker() { - podman "$@" - } -fi - # Create the Kind network with subnet. docker network rm kind || true docker network create kind --subnet "${KIND_SUBNET}/16" diff --git a/scripts/ci/kind.sh b/scripts/ci/kind.sh index 828ccebc6..9d1ab8465 100755 --- a/scripts/ci/kind.sh +++ b/scripts/ci/kind.sh @@ -5,13 +5,6 @@ set -o errexit SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "${SCRIPT_DIR}/operand_common.sh" -if ! [ -x "$(docker -v)" ]; then - echo "docker not installed, trying podman" - function docker() { - podman "$@" - } -fi - if [[ -z "${SERVER_IMAGES}" ]]; then SERVER_IMAGES=$(operandJson | jq -r '.[].image') fi