From 2ced608fe4583973ec6655e2aa815d1e6a480e0b Mon Sep 17 00:00:00 2001 From: John Yeary Date: Mon, 4 Feb 2019 14:35:52 -0500 Subject: [PATCH 1/3] Updated Dockerfile version to 3.4.2. Updated license. Updated README. --- Dockerfile | 5 +++-- LICENSE | 1 + README.md | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c1c0d2..1468ad9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ FROM debian:stretch -MAINTAINER Christian Luginbühl +# MAINTAINER Christian Luginbühl +MAINTAINER John Yeary -ENV SPAMASSASSIN_VERSION 3.4.1 +ENV SPAMASSASSIN_VERSION 3.4.2 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ diff --git a/LICENSE b/LICENSE index f6fcc3d..00b0b32 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) Copyright (c) 2014, Christian Luginbühl +Copyright (c) 2019, Blue Lotus Software, LLC. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 7e464ae..fddc0f9 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ constantly updates its ruleset. Usage ----- - docker run -d -p 783:783 dinkel/spamassassin + docker run -d -p 783:783 bluelotussoftware/spamassassin or linked (this is how I use it) - docker run -d --name spamassassin dinkel/spamassassin + docker run -d --name spamassassin bluelotussoftware/spamassassin docker run -d --link spamassassin:spamassassin application-with-spamc-or-something Configuration (environment variables) From 64f6c34939374d1154380ef3568757575ebf4a46 Mon Sep 17 00:00:00 2001 From: John Yeary Date: Mon, 4 Feb 2019 15:20:38 -0500 Subject: [PATCH 2/3] Updated to use debian:buster-slim and added gpg-agent. --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1468ad9..b467961 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:buster-slim # MAINTAINER Christian Luginbühl MAINTAINER John Yeary @@ -8,7 +8,8 @@ ENV SPAMASSASSIN_VERSION 3.4.2 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ gpg \ - libio-socket-ip-perl \ + gpg-agent \ + libio-socket-ip-perl \ libmail-dkim-perl \ libnet-ident-perl \ libsocket-getaddrinfo-perl \ From 50496128ee5563a062c216771f169074b3cc244d Mon Sep 17 00:00:00 2001 From: John Yeary Date: Wed, 6 Feb 2019 15:30:42 -0500 Subject: [PATCH 3/3] Update copy command to remove layers. --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b467961..535f2b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,11 +30,7 @@ RUN mkdir -p /etc/spamassassin/sa-update-keys && \ RUN sed -i 's/^logfile = .*$/logfile = \/dev\/stderr/g' /etc/razor/razor-agent.conf -COPY spamd.sh / - -COPY rule-update.sh / - -COPY run.sh / +COPY spamd.sh rule-update.sh run.sh / EXPOSE 783