Skip to content

Commit 3cb019b

Browse files
committed
update CONTAINER_TOOL in makefile
Signed-off-by: Maya Barnea <mayab@il.ibm.com>
1 parent 60beb7b commit 3cb019b

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
# limitations under the License.
1414

1515
# Makefile for the vllm-sim project
16-
17-
CONTAINER_RUNTIME ?= docker
18-
1916
PACKAGE_VLLM_SIM = github.com/neuralmagic/vllm-sim/cmd/vllm-sim
2017
VLLM_SIM_NAME = vllm-sim/vllm-sim
2118
VLLM_SIM_TAG ?= 0.0.2
@@ -44,8 +41,7 @@ IMG = $(IMAGE_TAG_BASE):$(DEV_VERSION)
4441
NAMESPACE ?= hc4ai-operator
4542

4643

47-
# CONTAINER_TOOL := $(shell command -v docker >/dev/null 2>&1 && echo docker || command -v podman >/dev/null 2>&1 && echo podman || echo "")
48-
CONTAINER_TOOL ?= docker
44+
CONTAINER_TOOL := $(shell { command -v docker >/dev/null 2>&1 && echo docker; } || { command -v podman >/dev/null 2>&1 && echo podman; } || echo "")
4945
BUILDER := $(shell command -v buildah >/dev/null 2>&1 && echo buildah || echo $(CONTAINER_TOOL))
5046
PLATFORMS ?= linux/amd64 # linux/arm64 # linux/s390x,linux/ppc64le
5147

0 commit comments

Comments
 (0)