summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŠimon Lukašík <slukasik@redhat.com>2018-11-03 00:28:31 +0100
committerŠimon Lukašík <slukasik@redhat.com>2018-11-03 08:58:22 +0100
commitc04e090380efd02633724a567c8ba4db87b448eb (patch)
tree193de9af0a491549d09e658ca339bfc061bded94
parent309f4eb1efea58c763365cadc324eee258ac4cbe (diff)
downloadpodman-c04e090380efd02633724a567c8ba4db87b448eb.tar.gz
podman-c04e090380efd02633724a567c8ba4db87b448eb.tar.bz2
podman-c04e090380efd02633724a567c8ba4db87b448eb.zip
Do never override podman with docker
Signed-off-by: Šimon Lukašík <slukasik@redhat.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d8a870fa2..ae1b263ad 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ BUILDTAGS_CROSS ?= containers_image_openpgp containers_image_ostree_stub exclude
ifneq (,$(findstring varlink,$(BUILDTAGS)))
PODMAN_VARLINK_DEPENDENCIES = cmd/podman/varlink/iopodman.go
endif
-CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null | echo docker)
+CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
HAS_PYTHON3 := $(shell command -v python3 2>/dev/null)