mirror of
https://github.com/mikefarah/yq.git
synced 2024-11-12 05:38:04 +00:00
Only use podman if CLI can execute. Use docker if non-Linux podman has no connection to Linux system.
Solves ``` ❯ make test Cannot connect to Podman. Please verify your connection to the Linux system using `podman system connection list`, or try `podman machine init` and `podman machine start` to manage a new Linux VM Error: unable to connect to Podman socket: failed to read identity "/Users/tiger/.local/share/containers/podman/machine/machine": open /Users/tiger/.local/share/containers/podman/machine/machine: no such file or directory /opt/homebrew/bin/docker run --rm -e LDFLAGS=" -X main.GitCommit=bbdd974+CHANGES -X main.GitDescribe=v4 -w -s" -e GITHUB_TOKEN="" -v /Users/tiger/git/yq-k8s/vendor:/go/src -v /Users/tiger/git/yq-k8s:/yq/src/github.com/mikefarah/yq -w /yq/src/github.com/mikefarah/yq yq_dev go mod vendor Error: podman-machine-default: VM already exists ``` Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
This commit is contained in:
parent
6eb2ae757a
commit
19e2591b1e
2
Makefile
2
Makefile
@ -2,7 +2,7 @@ MAKEFLAGS += --warn-undefined-variables
|
|||||||
SHELL := /bin/bash
|
SHELL := /bin/bash
|
||||||
.SHELLFLAGS := -o pipefail -euc
|
.SHELLFLAGS := -o pipefail -euc
|
||||||
.DEFAULT_GOAL := install
|
.DEFAULT_GOAL := install
|
||||||
ENGINE := $(shell { command -v podman || command -v docker; } 2>/dev/null)
|
ENGINE := $(shell { (podman version > /dev/null 2>&1 && command -v podman) || command -v docker; } 2>/dev/null)
|
||||||
|
|
||||||
include Makefile.variables
|
include Makefile.variables
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user