Browse Source

[Compose] New Rspamd image (1.8.1)
[Rspamd] Upgrade base to Bionic

André 6 years ago
parent
commit
7a7fafec87
2 changed files with 3 additions and 4 deletions
  1. 2 3
      data/Dockerfiles/rspamd/Dockerfile
  2. 1 1
      docker-compose.yml

+ 2 - 3
data/Dockerfiles/rspamd/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
@@ -8,10 +8,9 @@ RUN apt-get update && apt-get install -y \
   tzdata \
   tzdata \
 	ca-certificates \
 	ca-certificates \
 	gnupg2 \
 	gnupg2 \
-  gnupg-curl \
 	apt-transport-https \
 	apt-transport-https \
 	&& apt-key adv --fetch-keys https://rspamd.com/apt/gpg.key \
 	&& apt-key adv --fetch-keys https://rspamd.com/apt/gpg.key \
-	&& echo "deb https://rspamd.com/apt-stable/ xenial main" > /etc/apt/sources.list.d/rspamd.list \
+	&& echo "deb https://rspamd.com/apt-stable/ bionic main" > /etc/apt/sources.list.d/rspamd.list \
 	&& apt-get update && apt-get install -y rspamd \
 	&& apt-get update && apt-get install -y rspamd \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local \
 	&& echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local \

+ 1 - 1
docker-compose.yml

@@ -73,7 +73,7 @@ services:
             - clamd
             - clamd
 
 
     rspamd-mailcow:
     rspamd-mailcow:
-      image: mailcow/rspamd:1.28
+      image: mailcow/rspamd:1.29
       build: ./data/Dockerfiles/rspamd
       build: ./data/Dockerfiles/rspamd
       stop_grace_period: 30s
       stop_grace_period: 30s
       depends_on:
       depends_on: