Skip to content

Commit

Permalink
update to debian:12.5-slim and rspamd to 3.8.4 (#26)
Browse files Browse the repository at this point in the history
Updated:

    base image to 12.5-slim
    Rspamd to 3.8.4
    Other software utils

Fixed:

    gucci versions upgrade (since version 1.6.11 release name includes "v" in name)
  • Loading branch information
metro2030 authored May 15, 2024
1 parent b57d010 commit 94fab08
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
FROM debian:12.4-slim
FROM debian:12.5-slim

ARG DEBIAN_FRONTEND=noninteractive
ARG BUILD_CORES

ARG SKALIBS_VER=2.14.0.1
ARG EXECLINE_VER=2.9.4.0
ARG S6_VER=2.12.0.2
ARG RSPAMD_VER=3.7.5
ARG GUCCI_VER=1.6.10
ARG SKALIBS_VER=2.14.1.1
ARG EXECLINE_VER=2.9.5.1
ARG S6_VER=2.12.0.4
ARG RSPAMD_VER=3.8.4
ARG GUCCI_VER=v1.6.11

ARG SKALIBS_SHA256_HASH="b43ebdb36f8a8df40f1a08c13b08393bce49faf334e62a0db919b3ae4afd1488"
ARG EXECLINE_SHA256_HASH="9ab55d561539dfa76ff4a97906fa995fc4a288e3de5225cb1a9d8fa9e9ebc49b"
ARG S6_SHA256_HASH="aa917effe12ae97379090f75fda49f0d5f0f67cd65543684cff06dc881728f8c"
ARG RSPAMD_SHA256_HASH="3fba8b0086fe68ac16146cfc25cfcff352bff52fa5cef7d277007ed008170330"
ARG GUCCI_SHA256_HASH="d668ef080e1833591a85a051cd42b679a19ebcaf2c0449190523c7474ea1987e"
ARG SKALIBS_SHA256_HASH="b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3"
ARG EXECLINE_SHA256_HASH="df750035d0fb21c7265bffb7ed7e1b661de1e842944a2252bdcddc32d0d97217"
ARG S6_SHA256_HASH="c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b"
ARG RSPAMD_SHA256_HASH="ebea263f60a3d6036c153df0766b4aa03690e8caf59946d24ee54d8bb595c75d"
ARG GUCCI_SHA256_HASH="63a818b38b6034e486dd1d50aed05685e7fe19e97c0f7dc9b372b57b98d1f2c1"

LABEL description="s6 + rspamd image based on Debian" \
maintainer="Hardware <[email protected]>" \
Expand Down Expand Up @@ -112,7 +112,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
&& make -j${NB_CORES} \
&& make install \
&& cd /tmp \
&& GUCCI_BINARY="gucci-v${GUCCI_VER}-linux-amd64" \
&& GUCCI_BINARY="gucci-${GUCCI_VER}-linux-amd64" \
&& wget -q https://github.com/noqcks/gucci/releases/download/${GUCCI_VER}/${GUCCI_BINARY} \
&& CHECKSUM=$(sha256sum ${GUCCI_BINARY} | awk '{print $1}') \
&& if [ "${CHECKSUM}" != "${GUCCI_SHA256_HASH}" ]; then echo "${GUCCI_BINARY} : bad checksum" && exit 1; fi \
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ This overlay base image contains Debian 12 "Bookworm" slim (remove some extra fi

Software built from source :

* Skalibs 2.14.0.1 : <https://skarnet.org/software/skalibs/>
* Execline 2.9.4.0 : <https://skarnet.org/software/execline/>
* s6 2.12.0.2 : <https://skarnet.org/software/s6/>
* Rspamd 3.7.5 : <https://rspamd.com/>
* Gucci 1.6.10 : <https://github.com/noqcks/gucci/>
* Skalibs 2.14.1.1 : <https://skarnet.org/software/skalibs/>
* Execline 2.9.5.1 : <https://skarnet.org/software/execline/>
* s6 2.12.0.4 : <https://skarnet.org/software/s6/>
* Rspamd 3.8.4 : <https://rspamd.com/>
* Gucci v1.6.11 : <https://github.com/noqcks/gucci/>

Please see the [main repository](https://github.com/mailserver2/mailserver) for instructions.
2 changes: 1 addition & 1 deletion update-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ update_rspamd() {

update_gucci() {
local GUCCI_VER=$(wget -q -O - 'https://api.github.com/repos/noqcks/gucci/releases/latest' | jq -r ".tag_name")
local GUCCI_SHA256_HASH=$(wget -q -O - "https://github.com/noqcks/gucci/releases/download/$GUCCI_VER/gucci-v$GUCCI_VER-linux-amd64" | sha256sum --zero | perl -lane 'print $F[0]')
local GUCCI_SHA256_HASH=$(wget -q -O - "https://github.com/noqcks/gucci/releases/download/$GUCCI_VER/gucci-$GUCCI_VER-linux-amd64" | sha256sum --zero | perl -lane 'print $F[0]')

# Update Dockerfile
perl -pi -e "s/GUCCI_VER=\K.*/$GUCCI_VER/" Dockerfile
Expand Down

0 comments on commit 94fab08

Please sign in to comment.