From 1187cac5e168b44bbf46580481db904e65176f3b Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Tue, 23 Oct 2018 11:58:36 +0300 Subject: [PATCH] Finished up switching from .sh to .py --- core/admin/Dockerfile | 2 +- core/admin/start.py | 2 +- core/dovecot/start.py | 8 -------- core/postfix/start.py | 5 ----- optional/clamav/Dockerfile | 2 +- optional/clamav/start.py | 2 +- services/rspamd/start.py | 5 ----- webmails/roundcube/Dockerfile | 6 +++--- webmails/roundcube/start.py | 10 ++++++++++ webmails/roundcube/start.sh | 8 -------- 10 files changed, 17 insertions(+), 33 deletions(-) create mode 100755 webmails/roundcube/start.py delete mode 100755 webmails/roundcube/start.sh diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index dca42218..31af5c98 100644 --- a/core/admin/Dockerfile +++ b/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 diff --git a/core/admin/start.py b/core/admin/start.py index 4bd05f26..e8b59ff4 100755 --- a/core/admin/start.py +++ b/core/admin/start.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/local/bin/python3 import os diff --git a/core/dovecot/start.py b/core/dovecot/start.py index 877185c4..8bf66efd 100755 --- a/core/dovecot/start.py +++ b/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")) diff --git a/core/postfix/start.py b/core/postfix/start.py index ea8ddfb2..b3bb328d 100755 --- a/core/postfix/start.py +++ b/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")) diff --git a/optional/clamav/Dockerfile b/optional/clamav/Dockerfile index d00c00a3..445b68af 100644 --- a/optional/clamav/Dockerfile +++ b/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 diff --git a/optional/clamav/start.py b/optional/clamav/start.py index 1d828ed0..e9df3f6e 100755 --- a/optional/clamav/start.py +++ b/optional/clamav/start.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/local/bin/python3 import os diff --git a/services/rspamd/start.py b/services/rspamd/start.py index 3fe6bb85..015f3063 100755 --- a/services/rspamd/start.py +++ b/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")) diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index 50a58a4f..3d3ffb70 100644 --- a/webmails/roundcube/Dockerfile +++ b/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 diff --git a/webmails/roundcube/start.py b/webmails/roundcube/start.py new file mode 100755 index 00000000..07b3a567 --- /dev/null +++ b/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"]) \ No newline at end of file diff --git a/webmails/roundcube/start.sh b/webmails/roundcube/start.sh deleted file mode 100755 index 3fbc1fd4..00000000 --- a/webmails/roundcube/start.sh +++ /dev/null @@ -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