diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..d090e98 --- /dev/null +++ b/build.sh @@ -0,0 +1,13 @@ +#!/bin/bash -e + +TAG="1.5-$(date +%Y%m%d)" + +find . -name Dockerfile | while read i; do + dir=$(dirname $i) + pushd ${dir} + image="genunix/mailu-${dir}:${TAG}" + echo "[INFO] Building $(basename $dir)" + docker build -t ${image} . + docker push ${image} + popd +done diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile index b36be8c..b63d06c 100644 --- a/services/rspamd/Dockerfile +++ b/services/rspamd/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:edge RUN apk add --no-cache python py-jinja2 rspamd rspamd-controller rspamd-proxy ca-certificates diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc index 6a02067..dd14394 100644 --- a/services/rspamd/conf/worker-controller.inc +++ b/services/rspamd/conf/worker-controller.inc @@ -1,3 +1,4 @@ +type = "controller"; bind_socket = "*:11334"; password = "mailu"; secure_ip = "{{ FRONT_ADDRESS }}"; diff --git a/services/rspamd/conf/worker-normal.inc b/services/rspamd/conf/worker-normal.inc index a6ee831..ab996fb 100644 --- a/services/rspamd/conf/worker-normal.inc +++ b/services/rspamd/conf/worker-normal.inc @@ -1 +1,2 @@ +type = "normal"; enabled = false; diff --git a/services/rspamd/conf/worker-proxy.inc b/services/rspamd/conf/worker-proxy.inc index a7dfe10..40e44d9 100644 --- a/services/rspamd/conf/worker-proxy.inc +++ b/services/rspamd/conf/worker-proxy.inc @@ -1,3 +1,4 @@ +type = "proxy"; bind_socket = "*:11332"; upstream "local" { default = yes;