Updated milter-sasl

milter-sasl/Dockerfile

@@ -1,30 +1,24 @@
-FROM debian:jessie
-
-MAINTAINER Robin Thoni <robin@rthoni.com>
+FROM debian:stretch as builder
 
 RUN apt-get update &&\
-    apt-get install -y gcc g++ cmake libssl-dev libjsoncpp-dev libmilter-dev git &&\
+    apt-get install -y gcc g++ cmake libssl-dev libjsoncpp-dev libmilter-dev wget unzip &&\
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN git clone https://git.rthoni.com/robin.thoni/milter-sasl &&\
+RUN wget https://git.rthoni.com/robin.thoni/milter-sasl/archive/v1.0.0.zip -O milter-sasl.zip &&\
+    unzip milter-sasl.zip &&\
     cd milter-sasl &&\
     mkdir build && cd build &&\
-    cmake .. && make &&\
-    cp src/milter-sasl /usr/local/bin
-
-RUN rm -rf /var/log/* &&\
-    mkfifo /var/log/syslog &&\
-    ln -s /dev/null /var/log/mail.log &&\
-    ln -s /dev/null /var/log/mail.err &&\
-    ln -s /dev/null /var/log/main.info &&\
-    ln -s /dev/null /var/log/messages
+    cmake .. && make
 
-COPY ./config /etc/milter-sasl/
+FROM debian:stretch
 
-COPY ./vars-vars /etc/vars-vars
+ADD https://raw.githubusercontent.com/docker-gcf/docker-gcf/v1.5.0/setup.sh /tmp/docker-utils-setup.sh
+RUN sh /tmp/docker-utils-setup.sh
+ENTRYPOINT ["gcf-entrypoint"]
+CMD ["milter-sasl"]
 
-COPY ./vars-files /etc/vars-files
+RUN pkgs-install libjsoncpp1 libmilter1.0.1
 
-COPY ./run.sh /run.sh
+COPY --from=builder /milter-sasl/build/src/milter-sasl /usr/local/bin/
 
-CMD ["/run.sh"]
+COPY ./config /etc/salt/base/

milter-sasl/config/milter-sasl.json

@@ -1,4 +0,0 @@
-{
-  "key": "your key here",
-  "socket": "inet:MILTER_SASL_PORT@0.0.0.0"
-}

milter-sasl/config/states/milter-sasl/init.sls

@@ -0,0 +1,9 @@
+milter-sasl-config-dir:
+  file.directory:
+    - name: /etc/milter-sasl/
+
+milter-sasl-config:
+  file.managed:
+    - name: /etc/milter-sasl/milter-sasl.json
+    - source: salt://milter-sasl/milter-sasl.json
+    - template: jinja

milter-sasl/config/states/milter-sasl/milter-sasl.json

@@ -0,0 +1,4 @@
+{
+  "key": "{{ salt['pillar.get']('model:milterSasl:key') }}",
+  "socket": "inet:{{ salt['pillar.get']('model:milterSasl:port') }}@0.0.0.0"
+}

milter-sasl/run.sh

@@ -1,29 +0,0 @@
-#! /usr/bin/env bash
-
-replace_var()
-{
-  file="${1}"
-  var="${2}"
-  sed -e "s?${var}?${!var}?g" -i "${file}"
-}
-
-replace_vars()
-{
-  file="${1}"
-  for var in $(cat /etc/vars-vars)
-  do
-    replace_var "${file}" "${var}"
-  done
-}
-
-replace_files()
-{
-  for file in $(cat /etc/vars-files)
-  do
-    replace_vars "${file}"
-  done
-}
-
-replace_files
-
-milter-sasl

milter-sasl/vars-files

@@ -1 +0,0 @@
-/etc/milter-sasl/milter-sasl.json

milter-sasl/vars-vars

@@ -1,23 +0,0 @@
-POSTGRES_HOST
-POSTGRES_USER
-POSTGRES_PASSWORD
-POSTGRES_DB
-
-MAIL_DOMAIN
-MAIL_HOSTNAME
-
-DOVECOT_HOST
-DOVECOT_SASL_PORT
-DOVECOT_LMTP_PORT
-
-POSTFIX_HOST
-
-OPENDKIM_HOST
-OPENDKIM_PORT
-
-MILTER_SASL_HOST
-MILTER_SASL_PORT
-
-EXIM_SMARTHOST_HOST
-EXIM_SMARTHOST_USER
-EXIM_SMARTHOST_PASSWORD