From 2f69bca31773c1b1cc1b367462f140b52b54d3f0 Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Sat, 3 Jan 2026 22:35:42 +0300
Subject: [PATCH] kanidm: bump custom image to v1.8.5

---
 kanidm/Dockerfile |  4 ++--
 kanidm/Makefile   | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/kanidm/Dockerfile b/kanidm/Dockerfile
index 5ff03e7..9d13581 100644
--- a/kanidm/Dockerfile
+++ b/kanidm/Dockerfile
@@ -1,4 +1,4 @@
-FROM almalinux:10 AS builder
+FROM almalinux:9 AS builder
 
 ARG KANIDM_VERSION
 ARG KANIDM_FEATURES
@@ -33,7 +33,7 @@ WORKDIR /usr/src/kanidm
 RUN make release/kanidmd
 RUN make release/kanidm
 
-FROM almalinux:10
+FROM almalinux:9
 
 COPY *.repo /etc/yum.repos.d/
 
diff --git a/kanidm/Makefile b/kanidm/Makefile
index 4c7b10b..d7cf2a7 100644
--- a/kanidm/Makefile
+++ b/kanidm/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.7.4
+VERSION=1.8.5
 BUILD=1
 IMAGE=kanidm
 REGISTRY=gitea.geekhome.org/ghp
@@ -13,12 +13,24 @@ else
 		FORMAT=--format=docker
 endif
 
-build:
-	$(CMD) build $(FORMAT) $(NO_CACHE) \
+build: podman-build
+push: podman-push
+
+podman-build:
+	podman build $(FORMAT) $(NO_CACHE) \
+		--platform linux/amd64/v2 \
 		--build-arg KANIDM_VERSION=v$(VERSION) \
 		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
 
-push:
-	$(CMD) push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+podman-push:
+	podman push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+
+docker-build:
+	docker build $(NO_CACHE) \
+		--build-arg KANIDM_VERSION=v$(VERSION) \
+		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
+
+docker-push:
+	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
 
 all: build push