From ea006dfa258b327ca3b87362da7454d68ce7a86d Mon Sep 17 00:00:00 2001 From: Christian Burmeister Date: Fri, 23 Aug 2019 20:50:24 +0200 Subject: [PATCH 1/2] Switch form Ubuntu to Debian --- data/Dockerfiles/rspamd/Dockerfile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 143c7f82..01ef23d6 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -1,22 +1,26 @@ -FROM ubuntu:bionic +FROM debian:buster-slim LABEL maintainer "Andre Peters " ARG DEBIAN_FRONTEND=noninteractive +ARG CODENAME=buster ENV LC_ALL C RUN apt-get update && apt-get install -y \ tzdata \ - ca-certificates \ - gnupg2 \ - apt-transport-https \ - && apt-key adv --fetch-keys https://rspamd.com/apt/gpg.key \ - && echo "deb https://rspamd.com/apt-stable/ bionic main" > /etc/apt/sources.list.d/rspamd.list \ - && apt-get update && apt-get install -y rspamd dnsutils \ - && rm -rf /var/lib/apt/lists/* \ - && apt-get autoremove --purge \ - && apt-get clean \ - && mkdir -p /run/rspamd \ - && chown _rspamd:_rspamd /run/rspamd + ca-certificates \ + gnupg \ + apt-transport-https \ + dnsutils \ + && apt-key adv --fetch-keys https://rspamd.com/apt-stable/gpg.key \ + && echo "deb [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list \ + && echo "deb-src [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" >> /etc/apt/sources.list.d/rspamd.list \ + && apt-get update \ + && apt-get --no-install-recommends -y install rspamd \ + && rm -rf /var/lib/apt/lists/* \ + && apt-get autoremove --purge \ + && apt-get clean \ + && mkdir -p /run/rspamd \ + && chown _rspamd:_rspamd /run/rspamd COPY settings.conf /etc/rspamd/settings.conf COPY docker-entrypoint.sh /docker-entrypoint.sh From 1081fa2ddd0b516b3d1318b80742674768237414 Mon Sep 17 00:00:00 2001 From: Christian Burmeister Date: Fri, 23 Aug 2019 21:11:49 +0200 Subject: [PATCH 2/2] Update Dockerfile --- data/Dockerfiles/rspamd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 01ef23d6..58cd1ac5 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -8,7 +8,7 @@ ENV LC_ALL C RUN apt-get update && apt-get install -y \ tzdata \ ca-certificates \ - gnupg \ + gnupg2 \ apt-transport-https \ dnsutils \ && apt-key adv --fetch-keys https://rspamd.com/apt-stable/gpg.key \