Compare commits

..

No commits in common. "dc2456e61957f60685c86cd7e2dfa0e9690f2226" and "93dc6fa250bfb81b3bab038ccf085d1e88c04a32" have entirely different histories.

6 changed files with 18 additions and 49 deletions

View File

@ -1,8 +1,5 @@
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 \
@ -11,9 +8,8 @@ RUN dnf install -y epel-release dnf-plugins-core \
&& dnf clean all \
&& rm -rf /var/cache/yum
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} \
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 \
cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \
&& rm -rf /var/cache/yum

View File

@ -1,19 +1,13 @@
VERSION=2.3.16
BUILD=3
VERSION=2.3.16-2
IMAGE=dovecot
REGISTRY=gitea.geekhome.org/ghp
DOVECOT_VERSION=$(VERSION)
POSTFIX_VERSION=3.5.9
.PHONY: build push all
build:
docker build --build-arg DOVECOT_VERSION=$(DOVECOT_VERSION) \
--build-arg POSTFIX_VERSION=$(POSTFIX_VERSION) \
-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
docker build -t $(REGISTRY)/$(IMAGE):$(VERSION) .
push:
docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
docker push $(REGISTRY)/$(IMAGE):$(VERSION)
all: build push

View File

@ -1,8 +1,5 @@
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 \
@ -11,13 +8,14 @@ RUN dnf install -y epel-release dnf-plugins-core \
&& dnf clean all \
&& rm -rf /var/cache/yum
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} \
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 \
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"]

View File

@ -1,19 +1,13 @@
VERSION=3.5.9
BUILD=2
VERSION=3.5.9-1
IMAGE=postfix
REGISTRY=gitea.geekhome.org/ghp
DOVECOT_VERSION=2.3.16
POSTFIX_VERSION=$(VERSION)
.PHONY: build push all
build:
docker build --build-arg DOVECOT_VERSION=$(DOVECOT_VERSION) \
--build-arg POSTFIX_VERSION=$(POSTFIX_VERSION) \
-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
docker build -t $(REGISTRY)/$(IMAGE):$(VERSION) .
push:
docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
docker push $(REGISTRY)/$(IMAGE):$(VERSION)
all: build push

View File

@ -1,9 +1,5 @@
FROM almalinux:9
ARG DOVECOT_VERSION
ARG POSTFIX_VERSION
ARG RSPAMD_VERSION
RUN useradd -m -s /bin/false vmail
RUN dnf install -y epel-release dnf-plugins-core \
@ -12,9 +8,8 @@ RUN dnf install -y epel-release dnf-plugins-core \
&& dnf clean all \
&& rm -rf /var/cache/yum
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} \
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 \
cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
&& dnf clean all \
&& rm -rf /var/cache/yum
@ -22,7 +17,7 @@ RUN dnf install -y postfix-${POSTFIX_VERSION} postfix-ldap-${POSTFIX_VERSION} \
RUN update-crypto-policies --set DEFAULT:SHA1 \
&& curl https://rspamd.com/rpm-stable/centos-9/rspamd.repo > /etc/yum.repos.d/rspamd.repo \
&& rpm --import https://rspamd.com/rpm/gpg.key \
&& dnf install -y rspamd-${RSPAMD_VERSION} \
&& dnf install -y rspamd-3.7.5 \
&& dnf clean all \
&& rm -rf /var/cache/yum \
&& update-crypto-policies --set DEFAULT

View File

@ -1,21 +1,13 @@
VERSION=3.8.1
BUILD=1
VERSION=3.7.5-1
IMAGE=rspamd
REGISTRY=gitea.geekhome.org/ghp
DOVECOT_VERSION=2.3.16
POSTFIX_VERSION=3.5.9
RSPAMD_VERSION=$(VERSION)
.PHONY: build push all
build:
docker build --build-arg DOVECOT_VERSION=$(DOVECOT_VERSION) \
--build-arg POSTFIX_VERSION=$(POSTFIX_VERSION) \
--build-arg RSPAMD_VERSION=$(RSPAMD_VERSION) \
-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
docker build -t $(REGISTRY)/$(IMAGE):$(VERSION) .
push:
docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
docker push $(REGISTRY)/$(IMAGE):$(VERSION)
all: build push