From 3439d024c7a755978ab3079168f4e0a5b546ab2f Mon Sep 17 00:00:00 2001 From: Mark McLaughlin Date: Thu, 13 Jun 2024 12:10:50 +0100 Subject: [PATCH] Fix docker/podman discovery in Makefile -- fixes lint and pr-check. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7dda1a3..ed90760 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ GOHOSTOS:=$(shell go env GOHOSTOS) GOPATH:=$(shell go env GOPATH) VERSION=$(shell git describe --tags --always) - -DOCKER ?= docker -DOCKER_CONFIG="${PWD}/.docker" +DOCKER := $(shell type -P podman || type -P docker) ifeq ($(GOHOSTOS), windows) #the `find.exe` is different from `find` in bash/shell.