opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1753 from isimluk/fix-podman

Browse Source 
Do never override podman with docker
This commit is contained in:
OpenShift Merge Robot
2018-11-03 08:39:42 -07:00
committed by GitHub
parent 309f4eb1ef c04e090380
commit 2efcd63c64
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,7 @@ BUILDTAGS_CROSS ?= containers_image_openpgp containers_image_ostree_stub exclude
ifneq (,$(findstring varlink,$(BUILDTAGS))) ifneq (,$(findstring varlink,$(BUILDTAGS)))
PODMAN_VARLINK_DEPENDENCIES = cmd/podman/varlink/iopodman.go PODMAN_VARLINK_DEPENDENCIES = cmd/podman/varlink/iopodman.go
endif 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) HAS_PYTHON3 := $(shell command -v python3 2>/dev/null)