kanidm: bump custom image to v1.7.4

kanidm/Makefile

@@ -1,16 +1,24 @@
-VERSION=1.6.4
+VERSION=1.7.4
 BUILD=1
 IMAGE=kanidm
 REGISTRY=gitea.geekhome.org/ghp
 
 .PHONY: build push all
 
+ifeq ($(shell command -v podman 2> /dev/null),)
+    CMD=docker
+		FORMAT=
+else
+    CMD=podman
+		FORMAT=--format=docker
+endif
+
 build:
-	docker build $(NO_CACHE) \
+	$(CMD) build $(FORMAT) $(NO_CACHE) \
 		--build-arg KANIDM_VERSION=v$(VERSION) \
 		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
 
 push:
-	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+	$(CMD) push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
 
 all: build push

rspamd/Makefile

@@ -1,4 +1,4 @@
-VERSION=3.11.1
+VERSION=3.13.2
 BUILD=1
 IMAGE=rspamd
 REGISTRY=gitea.geekhome.org/ghp
@@ -9,13 +9,21 @@ RSPAMD_VERSION=$(VERSION)
 
 .PHONY: build push all
 
+ifeq ($(shell command -v podman 2> /dev/null),)
+    CMD=docker
+		FORMAT=
+else
+    CMD=podman
+		FORMAT=--format=docker
+endif
+
 build:
-	docker build --build-arg DOVECOT_VERSION=$(DOVECOT_VERSION) \
+	$(CMD) build --build-arg DOVECOT_VERSION=$(DOVECOT_VERSION) \
 		--build-arg POSTFIX_VERSION=$(POSTFIX_VERSION) \
 		--build-arg RSPAMD_VERSION=$(RSPAMD_VERSION) \
 		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
 
 push:
-	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+	$(CMD) push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
 
 all: build push