ghp/docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rspamd: improve building scenario

Browse Source
This commit is contained in:
ace 2024-01-26 02:07:41 +03:00
parent 93dc6fa250
commit 5e1f07ed98
Signed by: ace
GPG Key ID: 2C08973DD37A76FD
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rspamd/Dockerfile
View File

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

14
rspamd/Makefile
View File

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