Merge pull request #27418 from cgwalters/drop-container-runtime

Makefile: Drop unused CONTAINER_RUNTIME
This commit is contained in:
openshift-merge-bot[bot]
2025-11-03 19:53:19 +00:00
committed by GitHub

View File

@@ -96,7 +96,6 @@ endif
SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) Makefile SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) Makefile
BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_overlay BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_overlay
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
OCI_RUNTIME ?= "" OCI_RUNTIME ?= ""
# The 'sort' below is crucial: without it, 'make docs' behaves differently # The 'sort' below is crucial: without it, 'make docs' behaves differently