Changes to enable setting of container manager via enviroment variable

Signed-off-by: Matthew Begley <60427904+mabe13@users.noreply.github.com>

Author: mabe13

Makefile

@@ -7,6 +7,9 @@ include $(abspath $(PROJECT_DIR)/build/automation/init.mk)
 setup: project-config # Set up project
 	make tester-build
 
+container-check: # Check the container management tool - can be set with: "export DOCKER_CMD=`which podman`" or "export DOCKER_CMD=`which docker`"
+	echo $(DOCKER_CMD)
+
 build: # Build lambdas
 	for IMAGE_NAME in $$(echo $(PROJECT_LAMBDAS_LIST) | tr "," "\n"); do
 		make -s build-lambda GENERIC_IMAGE_NAME=lambda NAME=$$IMAGE_NAME
@@ -556,3 +559,4 @@ python-run-ruff-fixes: # Auto fixes ruff warnings
 .SILENT: docker-run-ruff \
 	commit-date-hash-tag \
 	performance-test-results \
+	container-check \

build/automation/lib/docker.mk

@@ -44,8 +44,8 @@ DOCKER_LIBRARY_TOOLS_VERSION = $(shell cat $(DOCKER_LIB_IMAGE_DIR)/tools/VERSION
 COMPOSE_HTTP_TIMEOUT := $(or $(COMPOSE_HTTP_TIMEOUT), 6000)
 DOCKER_CLIENT_TIMEOUT := $(or $(DOCKER_CLIENT_TIMEOUT), 6000)
 
-DOCKER_CMD=$(shell command -v docker >/dev/null 2>&1 && echo docker || echo podman)
-IS_PODMAN := $(shell [ "$(DOCKER_CMD)" = "podman" ] && echo true || echo false)
+DOCKER_CMD := $(or $(DOCKER_CMD), $(shell command -v docker >/dev/null 2>&1 && echo docker || echo podman))
+IS_PODMAN := $(shell [[ "$(DOCKER_CMD)" == *podman ]] && echo true || echo false)
 OUTPUT_OPTION := $(if $(filter false,$(IS_PODMAN)),--output type=docker)
 
 # ==============================================================================