From dc2456e61957f60685c86cd7e2dfa0e9690f2226 Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Fri, 26 Jan 2024 02:07:58 +0300
Subject: [PATCH] postfix: improve building scenario

---
 postfix/Dockerfile | 10 ++++++----
 postfix/Makefile   | 12 +++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/postfix/Dockerfile b/postfix/Dockerfile
index 4317a74..08983d9 100644
--- a/postfix/Dockerfile
+++ b/postfix/Dockerfile
@@ -1,5 +1,8 @@
 FROM almalinux:9
 
+ARG DOVECOT_VERSION
+ARG POSTFIX_VERSION
+
 RUN useradd -m -s /bin/false vmail
 
 RUN dnf install -y epel-release dnf-plugins-core \
@@ -8,14 +11,13 @@ RUN dnf install -y epel-release dnf-plugins-core \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.9 postfix-ldap-3.5.9 postfix-mysql-3.5.9 postfix-pgsql-3.5.9 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.2 \
+RUN dnf install -y postfix-${POSTFIX_VERSION} postfix-ldap-${POSTFIX_VERSION} \
+  postfix-mysql-${POSTFIX_VERSION} postfix-pgsql-${POSTFIX_VERSION} \
+  dovecot-${DOVECOT_VERSION} dovecot-pigeonhole-${DOVECOT_VERSION} \
   cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-#RUN postconf -e inet_interfaces=all
-
 EXPOSE 25 465 587
 
 CMD ["postfix", "start-fg"]
diff --git a/postfix/Makefile b/postfix/Makefile
index e06d3a9..7890241 100644
--- a/postfix/Makefile
+++ b/postfix/Makefile
@@ -1,13 +1,19 @@
-VERSION=3.5.9-1
+VERSION=3.5.9
+BUILD=2
 IMAGE=postfix
 REGISTRY=gitea.geekhome.org/ghp
 
+DOVECOT_VERSION=2.3.16
+POSTFIX_VERSION=$(VERSION)
+
 .PHONY: build push all
 
 build:
-	docker build -t $(REGISTRY)/$(IMAGE):$(VERSION) .
+	docker build --build-arg DOVECOT_VERSION=$(DOVECOT_VERSION) \
+    --build-arg POSTFIX_VERSION=$(POSTFIX_VERSION) \
+    -t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
 
 push:
-	docker push $(REGISTRY)/$(IMAGE):$(VERSION)
+	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
 
 all: build push