diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-03 08:39:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 08:39:42 -0700 |
| commit | 2efcd63c642b2db0e9e5b957c08159e95c5e11a0 (patch) | |
| tree | 193de9af0a491549d09e658ca339bfc061bded94 | |
| parent | 309f4eb1efea58c763365cadc324eee258ac4cbe (diff) | |
| parent | c04e090380efd02633724a567c8ba4db87b448eb (diff) | |
| download | podman-2efcd63c642b2db0e9e5b957c08159e95c5e11a0.tar.gz podman-2efcd63c642b2db0e9e5b957c08159e95c5e11a0.tar.bz2 podman-2efcd63c642b2db0e9e5b957c08159e95c5e11a0.zip | |
Merge pull request #1753 from isimluk/fix-podman
Do never override podman with docker
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |