Skip to content

Commit ac888c7

Browse files
committed
Makefile: Drop dead CONTAINER_RUNTIME
This variable is dead code as far as I can tell. I think it got cargo culted from something similar in skopeo, where it *is* used: https://github.com/containers/skopeo/blob/85598438ce295fc9acdc27a1d5f97b7501f411a5/Makefile#L75 etc. (Instead it looks like there's a `PODMANCMD` here) But I'm effectively using this PR as a way to suggest aligning with what we're doing in bootc, where we have a core principle that `Makefile` should *never* itself spawn containers (or VMs etc). All the rules in Makefile are things that should work when e.g. building RPMs or debs or the like. Those tasks are things that are done via `Justfile`: https://github.com/bootc-dev/bootc/blob/main/Justfile So for example to align, we'd add a `Justfile` here and then `make validatepr` would move to `just validatepr`. Signed-off-by: Colin Walters <[email protected]>
1 parent a7da73c commit ac888c7

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ endif
9696
SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print) Makefile
9797

9898
BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_overlay
99-
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
10099
OCI_RUNTIME ?= ""
101100

102101
# The 'sort' below is crucial: without it, 'make docs' behaves differently

0 commit comments

Comments
 (0)