From 3339af6564d953853c2c82bb489f7bbf2c34f4a4 Mon Sep 17 00:00:00 2001
From: Mario Alegre <mario@git.alemor.org>
Date: Wed, 25 Nov 2020 19:19:14 -0500
Subject: [PATCH] updated gitea and mailsrv to expose log files

---
 src/gitea/Containerfile   | 12 ++++++++----
 src/mailsrv/Containerfile |  9 ++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/gitea/Containerfile b/src/gitea/Containerfile
index 4096bfe..23b7b89 100644
--- a/src/gitea/Containerfile
+++ b/src/gitea/Containerfile
@@ -42,6 +42,11 @@ RUN addgroup --gid $FILESUID gitea && \
 # copy our custom scripts
 COPY assets/bin/ /usr/local/bin/
 
+# replace /var/log with symlink to /vol/log
+RUN mkdir -p /vol/log && \
+    rm -r /var/log && \
+    ln -s /vol/log /var/log
+
 ###
 ### PostgreSQL ###
 ###
@@ -60,11 +65,10 @@ RUN wget https://dl.gitea.io/gitea/${GITEAV:?}/gitea-${GITEAV:?}-linux-amd64 &&
     chmod +x /usr/local/bin/gitea
 
 # make directories gitea needs
-RUN mkdir -p /var/lib/gitea/ && \
-    cd /var/lib/gitea/ && \
-    mkdir custom data log && \
+RUN mkdir -p /var/lib/gitea/custom /var/lib/gitea/data/ && \
     chown -R gitea:gitea /var/lib/gitea/ && \
-    chmod -R 750 /var/lib/gitea/
+    chmod -R 750 /var/lib/gitea/ && \
+    ln -s /var/log/gitea /var/lib/gitea/log
 
 # copy gitea config template
 COPY assets/app.ini.esh /etc/gitea/
diff --git a/src/mailsrv/Containerfile b/src/mailsrv/Containerfile
index c25af5a..b67966f 100644
--- a/src/mailsrv/Containerfile
+++ b/src/mailsrv/Containerfile
@@ -12,7 +12,9 @@ LABEL deployopts="\
 -p 993:993 \
 -v /srv/vol/mailsrv/data:/vol/data \
 -v /srv/vol/mailsrv/mail:/vol/mail \
--v /srv/vol/mailsrv/ssl:/vol/ssl:ro"
+-v /srv/vol/mailsrv/ssl:/vol/ssl:ro \
+-v /srv/vol/mailsrv/log:/vol/log \
+"
 
 # Build Variables
 # uid that the files owner user should have
@@ -39,6 +41,11 @@ COPY assets/bin /usr/local/bin
 RUN echo '# restart postfix and dovecot every Monday at 3AM' >> /etc/crontab && \
     echo '23 3    * * 1   root    systemctl restart postfix && systemctl restart dovecot' >> /etc/crontab
 
+# replace /var/log with symlink to /vol/log
+RUN mkdir -p /vol/log && \
+    rm -r /var/log && \
+    ln -s /vol/log /var/log
+
 ###
 ### mkvirtual
 ###