From daef9c8f38ff45c9491b90b2c9d19714f3af402e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 5 Sep 2021 23:31:23 +0200
Subject: [PATCH] re-add memcache to make container more universal

---
 containers/apps/sogo/Dockerfile                      |  5 ++++-
 .../sogo/etc/supervisor/conf.d/supervisor-app.conf   | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/containers/apps/sogo/Dockerfile b/containers/apps/sogo/Dockerfile
index ffd4de2c6c5..6c888af6b70 100644
--- a/containers/apps/sogo/Dockerfile
+++ b/containers/apps/sogo/Dockerfile
@@ -67,6 +67,7 @@ RUN --mount=type=bind,from=builder,source=/buildtmp/vendor/output,target=/build
     patch \
     apache2 \
     gnupg2 \
+    memcached \
   && \
   case "${TARGETPLATFORM}" in \
     'linux/amd64') export ARCH='linux-x64' ;; \
@@ -86,7 +87,9 @@ RUN --mount=type=bind,from=builder,source=/buildtmp/vendor/output,target=/build
   cp /etc/apache2/conf.d/SOGo.conf /etc/apache2/conf-available/ && \
   sed -i -e 's/#RedirectMatch \^\/\$ https:\/\/mail.yourdomain.com\/SOGo/RedirectMatch \^\/\$ \/SOGo/' /etc/apache2/conf-available/SOGo.conf && \
   a2enconf SOGo && \
-  usermod --home /srv/lib/sogo sogo
+  usermod --home /srv/lib/sogo sogo && \
+  mkdir -p /var/run/memcached/ && \
+    chown memcache:memcache /var/run/memcached
 
 EXPOSE 80 443
 
diff --git a/containers/apps/sogo/etc/supervisor/conf.d/supervisor-app.conf b/containers/apps/sogo/etc/supervisor/conf.d/supervisor-app.conf
index 49df070f52a..b48404ddd54 100644
--- a/containers/apps/sogo/etc/supervisor/conf.d/supervisor-app.conf
+++ b/containers/apps/sogo/etc/supervisor/conf.d/supervisor-app.conf
@@ -18,6 +18,18 @@ stderr_logfile_maxbytes=0
 environment=APACHE_ARGUMENTS="-DNO_DETACH"
 command=/usr/sbin/apache2ctl start
 
+[program:memcached]
+startsecs=0
+autostart=true
+autorestart=true
+user=memcache
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=/usr/bin/memcached -m 128 -a 0666 -s /var/run/memcached/memcached.sock
+
+
 [program:sogo]
 startsecs=0
 autostart=true