Merge branch 'master' into feat-fuzzyhashes

2018-10-17 18:31:42 +00:00
parent bd0a7050f2 7c82be904f
commit cec5c1b16b
53 changed files with 476 additions and 306 deletions
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.8

 RUN apk add --no-cache python py-jinja2 rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates py-pip \
 && pip install --upgrade pip \