From 6675d08ebc6f5f41f0de330e038d98d57719d78f Mon Sep 17 00:00:00 2001
From: PhracturedBlue <rc2012@pblue.org>
Date: Thu, 9 Nov 2023 00:50:21 -0800
Subject: [PATCH] Support building images via podman (#4978)
---
deployment/docker/Makefile | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 8b79334ae9..c7994bce97 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -8,9 +8,11 @@ CERTS_IMAGE := alpine:3.18.4
GO_BUILDER_IMAGE := golang:1.21.3-alpine
BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)
-DOCKER_BUILD ?= docker build
-DOCKER_COMPOSE ?= docker compose
-DOCKER_IMAGE_LS ?= docker image ls --format '{{.Repository}}:{{.Tag}}'
+DOCKER ?= docker
+DOCKER_RUN ?= $(DOCKER) run
+DOCKER_BUILD ?= $(DOCKER) build
+DOCKER_COMPOSE ?= $(DOCKER) compose
+DOCKER_IMAGE_LS ?= $(DOCKER) image ls --format '{{.Repository}}:{{.Tag}}'
package-base:
($(DOCKER_IMAGE_LS) | grep -q '$(BASE_IMAGE)$$') \
@@ -29,7 +31,7 @@ package-builder:
app-via-docker: package-builder
mkdir -p gocache-for-docker
- docker run --rm \
+ $(DOCKER_RUN) --rm \
--user $(shell id -u):$(shell id -g) \
--mount type=bind,src="$(shell pwd)",dst=/VictoriaMetrics \
-w /VictoriaMetrics \
@@ -44,7 +46,7 @@ app-via-docker: package-builder
app-via-docker-windows: package-builder
mkdir -p gocache-for-docker
- docker run --rm \
+ $(DOCKER_RUN) --rm \
--user $(shell id -u):$(shell id -g) \
--mount type=bind,src="$(shell pwd)",dst=/VictoriaMetrics \
-w /VictoriaMetrics \
@@ -72,7 +74,7 @@ publish-via-docker: \
app-via-docker-linux-arm64 \
app-via-docker-linux-ppc64le \
app-via-docker-linux-386
- docker buildx build \
+ $(DOCKER) buildx build \
--platform=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/386 \
--build-arg certs_image=$(CERTS_IMAGE) \
--build-arg root_image=$(ROOT_IMAGE) \
@@ -86,7 +88,7 @@ publish-via-docker: \
bin
run-via-docker: package-via-docker
- docker run -it --rm \
+ $(DOCKER_RUN) -it --rm \
--user $(shell id -u):$(shell id -g) \
--net host \
$(DOCKER_OPTS) \