From a1cffc6b236d8c2c27a5cb675be016057fae0f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= <bojan@cekrlic.com>
Date: Tue, 19 Feb 2019 12:08:13 +0100
Subject: [PATCH] More resillient builds

It turns out that builds cannot be predictable - different accounts
were assigned by different build systems. Consequentially we install
each tool separately.
---
 Dockerfile       | 6 +++++-
 supervisord.conf | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2dfbe13..bb30a68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,8 +26,12 @@ ENV MESSAGE_SIZE_LIMIT=
 ENV INBOUND_DEBUGGING=
 
 # Install supervisor, postfix
+# Install postfix first to get the first account (101)
+# Install opendkim second to get the second account (102)
 RUN        true && \
-           apk add --no-cache --update postfix ca-certificates tzdata supervisor rsyslog opendkim && \
+           apk add --no-cache postfix && \
+           apk add --no-cache opendkim && \
+           apk add --no-cache ca-certificates tzdata supervisor rsyslog && \
            apk add --no-cache --upgrade musl musl-utils && \
            (rm "/tmp/"* 2>/dev/null || true) && (rm -rf /var/cache/apk/* 2>/dev/null || true)
 
diff --git a/supervisord.conf b/supervisord.conf
index fb59eea..a235c7e 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -29,8 +29,8 @@ command         = /opendkim.sh
 user            = opendkim
 autostart       = true
 autorestart     = true
-startsecs       = 2
-stopwaitsecs    = 2
+startsecs       = 5
+stopwaitsecs    = 5
 stdout_logfile  = /dev/stdout
 stderr_logfile  = /dev/stderr
 stdout_logfile_maxbytes = 0