Finished up switching from .sh to .py

core/admin/Dockerfile

@@ -19,4 +19,4 @@ RUN pybabel compile -d mailu/translations
 EXPOSE 80/tcp
 VOLUME ["/data"]
 
-CMD python /start.py
+CMD /start.py

core/admin/start.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/bin/python3
 
 import os
 

core/dovecot/start.py

@@ -21,15 +21,7 @@ def start_podop():
 
 convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))
 
-#@retry(stop=tenacity.stop_after_attempt(100), wait=tenacity.wait_random(min=2, max=5))
-#def resolve():
-#	os.environ["FRONT_ADDRESS"] = socket.gethostbyname(os.environ.get("FRONT_ADDRESS", "front"))
-#	os.environ["REDIS_ADDRESS"] = socket.gethostbyname(os.environ.get("REDIS_ADDRESS", "redis"))
-#	if os.environ["WEBMAIL"] != "none":
-#		os.environ["WEBMAIL_ADDRESS"] = socket.gethostbyname(os.environ.get("WEBMAIL_ADDRESS", "webmail"))
-
 # Actual startup script
-#resolve()
 resolve = retry(socket.gethostbyname, stop=tenacity.stop_after_attempt(100), wait=tenacity.wait_random(min=2, max=5))
 os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
 os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("REDIS_ADDRESS", "redis"))

core/postfix/start.py

@@ -24,12 +24,7 @@ def start_podop():
 
 convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))
 
-#@retry(stop=tenacity.stop_after_attempt(100), wait=tenacity.wait_random(min=2, max=5))
-#def resolve():
-#	os.environ["FRONT_ADDRESS"] = socket.gethostbyname(os.environ.get("FRONT_ADDRESS", "front"))
-
 # Actual startup script
-#resolve()
 resolve = retry(socket.gethostbyname, stop=tenacity.stop_after_attempt(100), wait=tenacity.wait_random(min=2, max=5))
 
 os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))

optional/clamav/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM python:3-alpine
 
 RUN apk add --no-cache clamav rsyslog wget clamav-libunrar
 

optional/clamav/start.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/bin/python3
 
 import os
 

services/rspamd/start.py

@@ -9,12 +9,7 @@ from tenacity import retry
 
 convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))
 
-#@retry(stop=tenacity.stop_after_attempt(100), wait=tenacity.wait_random(min=2, max=5))
-#def resolve():
-#	os.environ["FRONT_ADDRESS"] = socket.gethostbyname(os.environ.get("FRONT_ADDRESS", "front"))
-
 # Actual startup script
-#resolve()
 resolve = retry(socket.gethostbyname, stop=tenacity.stop_after_attempt(100), wait=tenacity.wait_random(min=2, max=5))
 
 os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))

webmails/roundcube/Dockerfile

@@ -3,7 +3,7 @@ FROM php:7.2-apache
 ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.7/roundcubemail-1.3.7-complete.tar.gz
 
 RUN apt-get update && apt-get install -y \
-      zlib1g-dev \
+      zlib1g-dev python3 \
  && docker-php-ext-install zip \
  && echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini \
  && rm -rf /var/www/html/ \
@@ -22,9 +22,9 @@ COPY php.ini /usr/local/etc/php/conf.d/roundcube.ini
 
 COPY config.inc.php /var/www/html/config/
 
-COPY start.sh /start.sh
+COPY start.py /start.py
 
 EXPOSE 80/tcp
 VOLUME ["/data"]
 
-CMD ["/start.sh"]
+CMD /start.py

webmails/roundcube/start.py

@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+
+import os
+
+# Fix some permissions
+os.system("mkdir -p /data/gpg")
+os.system("chown -R www-data:www-data /data")
+
+# Run apache
+os.execv("/usr/local/bin/apache2-foreground", ["apache2-foreground"])

webmails/roundcube/start.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Fix some permissions
-mkdir -p /data/gpg
-chown -R www-data:www-data /data
-
-# Run apache
-exec apache2-foreground