github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-08-23 22:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly detect empty CONTAINER_CLI (#1554)

Browse Source 
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
This commit is contained in:
Dale Haiducek
2026-06-04 02:12:20 +00:00
committed by GitHub
parent 12c257987e
commit e0c28aad0f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/kind-images.mk
+3 -3
View File
@@ -5,7 +5,7 @@
# Auto-detect container runtime (docker or podman)
# Only check when actually needed (not during container builds)
CONTAINER_CLI ?= $(shell command -v docker 2>/dev/null || command -v podman 2>/dev/null)
ifdef CONTAINER_CLI
ifneq ($(CONTAINER_CLI),)
CONTAINER_RUNTIME := $(notdir $(CONTAINER_CLI))
endif
@@ -35,7 +35,7 @@ endef
# Build all images with correct architecture for kind
images-kind:
ifndef CONTAINER_CLI
ifeq ($(CONTAINER_CLI),)
$(error Neither docker nor podman found. Please install one of them.)
endif
@echo "Building images for kind cluster..."
@@ -63,7 +63,7 @@ images-and-load-kind: images-kind load-images-kind
# Display detected settings
show-kind-config:
ifndef CONTAINER_CLI
ifeq ($(CONTAINER_CLI),)
$(error Neither docker nor podman found. Please install one of them.)
endif
@echo "Container runtime: $(CONTAINER_RUNTIME)"