From e49111edc7f1e6eb7869ac64ae6122076f24784f Mon Sep 17 00:00:00 2001
From: Hannah DeFazio <h2defazio@gmail.com>
Date: Tue, 30 Sep 2025 20:42:20 -0400
Subject: [PATCH 1/2] Make the check-container-tool target more robust

Signed-off-by: Hannah DeFazio <h2defazio@gmail.com>
---
 Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6c742ff5..d005172e 100644
--- a/Makefile
+++ b/Makefile
@@ -293,9 +293,16 @@ check-envsubst:
 
 .PHONY: check-container-tool
 check-container-tool:
-	@command -v $(CONTAINER_TOOL) >/dev/null 2>&1 || { \
-	  echo "❌ $(CONTAINER_TOOL) is not installed."; \
-	  echo "🔧 Try: sudo apt install $(CONTAINER_TOOL) OR brew install $(CONTAINER_TOOL)"; exit 1; }
+	@if [ -z "$(CONTAINER_TOOL)" ]; then \
+		echo "❌ Error: No container tool detected. Please install docker or podman."; \
+		exit 1; \
+	elif ! command -v $(CONTAINER_TOOL) >/dev/null 2>&1; then \
+		echo "❌ Error: '$(CONTAINER_TOOL)' is not installed or not in your PATH."; \
+		echo "🔧 Try: sudo apt install $(CONTAINER_TOOL) OR brew install $(CONTAINER_TOOL)"; \
+		exit 1; \
+	else \
+		echo "✅ Container tool '$(CONTAINER_TOOL)' found."; \
+	fi
 
 .PHONY: check-kubectl
 check-kubectl:

From a7bcad2bb18af581f3188532926e91f4a3ff0022 Mon Sep 17 00:00:00 2001
From: Hannah DeFazio <h2defazio@gmail.com>
Date: Tue, 30 Sep 2025 20:52:33 -0400
Subject: [PATCH 2/2] Use the CONTAINER_TOOL env var for running the e2e test
 script

Signed-off-by: Hannah DeFazio <h2defazio@gmail.com>
---
 Makefile                |  1 +
 test/scripts/run_e2e.sh | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d005172e..41fd228f 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ TYPOS_ARCH = $(TYPOS_TARGET_ARCH)-unknown-linux-musl
 endif
 
 CONTAINER_TOOL := $(shell { command -v docker >/dev/null 2>&1 && echo docker; } || { command -v podman >/dev/null 2>&1 && echo podman; } || echo "")
+export CONTAINER_TOOL
 BUILDER := $(shell command -v buildah >/dev/null 2>&1 && echo buildah || echo $(CONTAINER_TOOL))
 PLATFORMS ?= linux/amd64 # linux/arm64 # linux/s390x,linux/ppc64le
 
diff --git a/test/scripts/run_e2e.sh b/test/scripts/run_e2e.sh
index add66dc3..fe13508a 100755
--- a/test/scripts/run_e2e.sh
+++ b/test/scripts/run_e2e.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Use the CONTAINER_TOOL from the environment, or default to docker if it's not set.
+CONTAINER_TOOL="${CONTAINER_TOOL:-docker}"
+echo "Using container tool: ${CONTAINER_TOOL}"
+
 # Set a default EPP_TAG if not provided
 export EPP_TAG="${EPP_TAG:-dev}"
 
@@ -9,27 +13,27 @@ export VLLM_SIMULATOR_TAG="${VLLM_SIMULATOR_TAG:-v0.4.0}"
 # Set the default routing side car image tag
 export ROUTING_SIDECAR_TAG="${ROUTING_SIDECAR_TAG:-v0.2.0}"
 
-SIMTAG=$(docker images | grep ghcr.io/llm-d/llm-d-inference-sim | awk '{print $2}' | grep ${VLLM_SIMULATOR_TAG})
+SIMTAG=$(${CONTAINER_TOOL} images | grep ghcr.io/llm-d/llm-d-inference-sim | awk '{print $2}' | grep ${VLLM_SIMULATOR_TAG})
 if [[ "${SIMTAG}" != "${VLLM_SIMULATOR_TAG}" ]]; then
-  docker pull ghcr.io/llm-d/llm-d-inference-sim:${VLLM_SIMULATOR_TAG}
+  ${CONTAINER_TOOL} pull ghcr.io/llm-d/llm-d-inference-sim:${VLLM_SIMULATOR_TAG}
   if [[ $? != 0 ]]; then
     echo "Failed to pull ghcr.io/llm-d/llm-d-inference-sim:${VLLM_SIMULATOR_TAG}"
     exit 1
   fi
 fi
 
-EPPTAG=$(docker images | grep ghcr.io/llm-d/llm-d-inference-scheduler | awk '{print $2}' | grep ${EPP_TAG})
+EPPTAG=$(${CONTAINER_TOOL} images | grep ghcr.io/llm-d/llm-d-inference-scheduler | awk '{print $2}' | grep ${EPP_TAG})
 if [[ "${EPPTAG}" != "${EPP_TAG}" ]]; then
-  docker pull ghcr.io/llm-d/llm-d-inference-scheduler:${EPP_TAG}
+  ${CONTAINER_TOOL} pull ghcr.io/llm-d/llm-d-inference-scheduler:${EPP_TAG}
   if [[ $? != 0 ]]; then
     echo "Failed to pull ghcr.io/llm-d/llm-d-inference-scheduler:${EPP_TAG}"
     exit 1
   fi
 fi
 
-SIDECARTAG=$(docker images | grep ghcr.io/llm-d/llm-d-routing-sidecar | awk '{print $2}' | grep ${ROUTING_SIDECAR_TAG})
+SIDECARTAG=$(${CONTAINER_TOOL} images | grep ghcr.io/llm-d/llm-d-routing-sidecar | awk '{print $2}' | grep ${ROUTING_SIDECAR_TAG})
 if [[ "${SIDECARTAG}" != "${ROUTING_SIDECAR_TAG}" ]]; then
-  docker pull ghcr.io/llm-d/llm-d-routing-sidecar:${ROUTING_SIDECAR_TAG}
+  ${CONTAINER_TOOL} pull ghcr.io/llm-d/llm-d-routing-sidecar:${ROUTING_SIDECAR_TAG}
   if [[ $? != 0 ]]; then
     echo "Failed to pull ghcr.io/llm-d/llm-d-routing-sidecar:${ROUTING_SIDECAR_TAG}"
     exit 1