Skip to content

Commit

Permalink
Fix docker/podman discovery in Makefile -- fixes lint and pr-check.
Browse files Browse the repository at this point in the history
  • Loading branch information
merlante committed Jun 13, 2024
1 parent d7b4f66 commit 3439d02
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 3439d02

Please sign in to comment.