rspamd: bump to v3.12.1

autovault/Dockerfile

@@ -0,0 +1,8 @@
+FROM almalinux:9
+
+COPY *.repo /etc/yum.repos.d/
+
+RUN dnf install -y kubectl vault jq && dnf clean all
+RUN setcap -r /usr/bin/vault
+
+ENTRYPOINT ["/vault/scripts/autovault.sh"]

autovault/Makefile

@@ -0,0 +1,22 @@
+VERSION=0.1.0
+BUILD=1
+IMAGE=autovault
+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:
+	$(CMD) build $(NO_CACHE) $(FORMAT) -t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
+
+push:
+	$(CMD) push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+
+all: build push

autovault/hashicorp.repo

@@ -0,0 +1,13 @@
+[hashicorp]
+name=Hashicorp Stable - $basearch
+baseurl=https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=https://rpm.releases.hashicorp.com/gpg
+
+[hashicorp-test]
+name=Hashicorp Test - $basearch
+baseurl=https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/test
+enabled=0
+gpgcheck=1
+gpgkey=https://rpm.releases.hashicorp.com/gpg

autovault/kubernetes.repo

@@ -0,0 +1,6 @@
+[kubernetes]
+name=Kubernetes
+baseurl=https://pkgs.k8s.io/core:/stable:/v1.32/rpm/
+enabled=1
+gpgcheck=1
+gpgkey=https://pkgs.k8s.io/core:/stable:/v1.32/rpm/repodata/repomd.xml.key

dovecot/Dockerfile

@@ -1,13 +1,19 @@
-FROM almalinux:8
+FROM almalinux:9
+
+ARG DOVECOT_VERSION
+ARG POSTFIX_VERSION
 
 RUN useradd -m -s /bin/false vmail
 
-RUN dnf install -y epel-release && dnf update -y \
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  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

dovecot/Makefile

@@ -1,13 +1,19 @@
-VERSION=2.3.16-1
+VERSION=2.3.16
+BUILD=5
 IMAGE=dovecot
 REGISTRY=gitea.geekhome.org/ghp
 
+DOVECOT_VERSION=$(VERSION)
+POSTFIX_VERSION=3.5.25
+
 .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

faas-cli/Dockerfile

@@ -1,4 +1,5 @@
-FROM docker:20.10.10-dind
+FROM docker:23.0.4-dind
+ARG VERSION
 
-RUN wget https://github.com/openfaas/faas-cli/releases/download/0.13.13/faas-cli -O /usr/local/bin/faas-cli
+RUN wget https://github.com/openfaas/faas-cli/releases/download/${VERSION}/faas-cli -O /usr/local/bin/faas-cli
 RUN chmod +x /usr/local/bin/faas-cli

faas-cli/Makefile

@@ -1,11 +1,11 @@
-VERSION=0.13.13
+VERSION=0.16.7
 IMAGE=faas-cli
 REGISTRY=gitea.geekhome.org/ghp
 
 .PHONY: build push all
 
 build:
-	docker build -t $(REGISTRY)/$(IMAGE):$(VERSION) .
+	docker build --build-arg="VERSION=$(VERSION)" -t $(REGISTRY)/$(IMAGE):$(VERSION) .
 
 push:
 	docker push $(REGISTRY)/$(IMAGE):$(VERSION)

i2pd/Dockerfile

@@ -0,0 +1,12 @@
+FROM almalinux:10
+
+ARG I2PD_VERSION
+ARG I2PD_BUILD
+
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
+  && dnf clean all \
+  && rm -rf /var/cache/yum
+
+RUN dnf install -y https://github.com/PurpleI2P/i2pd/releases/download/${I2PD_VERSION}/i2pd-${I2PD_VERSION}-${I2PD_BUILD}.el10.x86_64.rpm

i2pd/Makefile

@@ -0,0 +1,17 @@
+VERSION=2.57.0
+BUILD=1
+IMAGE=i2pd
+REGISTRY=gitea.geekhome.org/ghp
+
+.PHONY: build push all
+
+build:
+	docker build $(NO_CACHE) \
+		--build-arg I2PD_VERSION=$(VERSION) \
+		--build-arg I2PD_BUILD=$(BUILD) \
+		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
+
+push:
+	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+
+all: build push

jams/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11.0.13-bullseye
+FROM openjdk:22-slim-bookworm
 
 COPY jams jams
 WORKDIR jams

jams/Makefile

@@ -1,4 +1,4 @@
-VERSION=3.3-1
+VERSION=3.8-1
 IMAGE=jams
 
 ifdef REGISTRY

jams/README.md

@@ -1 +1,6 @@
 Download tar from https://dl.jami.net/jams/jams.tar
+
+[Running a DHT node](https://github.com/savoirfairelinux/opendht/wiki/Running-a-node-with-dhtnode)  
+[Setting up your own TURN server](https://docs.jami.net/en_US/developer/going-further/setting-up-your-own-turn-server.html)  
+[STUN/TURN server](https://github.com/coturn/coturn)  
+

kanidm/Dockerfile

@@ -0,0 +1,63 @@
+FROM almalinux:10 AS builder
+
+ARG KANIDM_VERSION
+ARG KANIDM_FEATURES
+ARG KANIDM_BUILD_PROFILE="container_generic"
+ARG KANIDM_BUILD_OPTIONS=""
+
+# Set the build profile
+ENV KANIDM_BUILD_PROFILE=${KANIDM_BUILD_PROFILE:-container_generic}
+ENV RUSTFLAGS="-Clinker=clang -Clink-arg=-fuse-ld=/usr/bin/ld.mold"
+
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
+  && dnf clean all \
+  && rm -rf /var/cache/yum
+
+RUN dnf install -y clang mold pam-devel openssl-devel git make automake gawk systemd-libs systemd-devel systemd-udev \
+  && dnf clean all \
+  && rm -rf /var/cache/yum
+
+# Get Rust
+ENV RUSTUP_HOME=/root/.rustup
+ENV CARGO_HOME=/root/.cargo
+ENV PATH=/root/.cargo/bin:${PATH}
+RUN curl -s --proto '=https' --tlsv1.3 -sSf 'https://sh.rustup.rs' | sh -s -- -y --no-modify-path || true
+
+RUN git clone --branch $KANIDM_VERSION --depth 1 https://github.com/kanidm/kanidm.git /usr/src/kanidm
+
+WORKDIR /usr/src/kanidm
+
+# Exports don't persist through RUN statements.
+RUN make release/kanidmd
+RUN make release/kanidm
+
+FROM almalinux:10
+
+COPY *.repo /etc/yum.repos.d/
+
+RUN dnf install -y openssl sqlite pam kubectl \
+  && dnf clean all \
+  && rm -rf /var/cache/yum
+
+COPY --from=builder /usr/src/kanidm/target/release/kanidmd /sbin/
+COPY --from=builder /usr/src/kanidm/target/release/kanidm /sbin/
+COPY --from=builder /usr/src/kanidm/server/core/static /hpkg
+RUN chmod +x /sbin/kanidmd
+
+WORKDIR /data
+
+EXPOSE 8443 3636
+
+ENV RUST_BACKTRACE=1
+
+HEALTHCHECK \
+    --interval=60s \
+    --timeout=10s \
+    --start-period=60s \
+    --start-interval=5s \
+    --retries=3 \
+    CMD [ "/sbin/kanidmd", "healthcheck", "-c", "/data/server.toml"]
+
+CMD [ "/sbin/kanidmd", "server", "-c", "/data/server.toml"]

kanidm/Makefile

@@ -0,0 +1,16 @@
+VERSION=1.6.4
+BUILD=1
+IMAGE=kanidm
+REGISTRY=gitea.geekhome.org/ghp
+
+.PHONY: build push all
+
+build:
+	docker build $(NO_CACHE) \
+		--build-arg KANIDM_VERSION=v$(VERSION) \
+		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
+
+push:
+	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
+
+all: build push

kanidm/kubernetes.repo

@@ -0,0 +1,6 @@
+[kubernetes]
+name=Kubernetes
+baseurl=https://pkgs.k8s.io/core:/stable:/v1.32/rpm/
+enabled=1
+gpgcheck=1
+gpgkey=https://pkgs.k8s.io/core:/stable:/v1.32/rpm/repodata/repomd.xml.key

opendkim/Dockerfile

@@ -1,12 +1,14 @@
-FROM almalinux:8
+FROM almalinux:9
 
 RUN useradd -m -s /bin/false vmail
 
-RUN dnf install -y epel-release && dnf update -y \
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
+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 \

opendkim/Makefile

@@ -1,4 +1,4 @@
-VERSION=2.11.0-1
+VERSION=2.11.0-2
 IMAGE=opendkim
 REGISTRY=gitea.geekhome.org/ghp
 

opendmarc/Dockerfile

@@ -1,12 +1,14 @@
-FROM almalinux:8
+FROM almalinux:9
 
 RUN useradd -m -s /bin/false vmail
 
-RUN dnf install -y epel-release && dnf update -y \
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
+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 \

opendmarc/Makefile

@@ -1,4 +1,4 @@
-VERSION=1.4.2-1
+VERSION=1.4.2-2
 IMAGE=opendmarc
 REGISTRY=gitea.geekhome.org/ghp
 

postfix/Dockerfile

@@ -1,19 +1,23 @@
-FROM almalinux:8
+FROM almalinux:9
+
+ARG DOVECOT_VERSION
+ARG POSTFIX_VERSION
 
 RUN useradd -m -s /bin/false vmail
 
-RUN dnf install -y epel-release && dnf update -y \
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  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"]

postfix/Makefile

@@ -1,13 +1,19 @@
-VERSION=3.5.8-1
+VERSION=3.5.25
+BUILD=1
 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

rspamd/Dockerfile

@@ -1,22 +1,31 @@
-FROM almalinux:8
+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 update -y \
+RUN dnf install -y epel-release dnf-plugins-core \
+  && dnf update -y \
+  && dnf config-manager --enable crb \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
-RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim opendmarc \
+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 curl https://rspamd.com/rpm-stable/centos-8/rspamd.repo > /etc/yum.repos.d/rspamd.repo \
+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-3.5 \
+  && dnf install -y rspamd-${RSPAMD_VERSION} \
   && dnf clean all \
-  && rm -rf /var/cache/yum
+  && rm -rf /var/cache/yum \
+  && update-crypto-policies --set DEFAULT
 
 EXPOSE 11332
 

rspamd/Makefile

@@ -1,13 +1,21 @@
-VERSION=3.5-1
+VERSION=3.11.1
+BUILD=1
 IMAGE=rspamd
 REGISTRY=gitea.geekhome.org/ghp
 
+DOVECOT_VERSION=2.3.16
+POSTFIX_VERSION=3.5.25
+RSPAMD_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) \
+		--build-arg RSPAMD_VERSION=$(RSPAMD_VERSION) \
+		-t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
 
 push:
-	docker push $(REGISTRY)/$(IMAGE):$(VERSION)
+	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
 
 all: build push