diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py b/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py index 9ac9d5bf3..e7f3f1440 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py @@ -31,7 +31,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('./etc/clamav/config_templates'), + loader=FileSystemLoader('/etc/clamav/config_templates'), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py b/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py index 9a0e510fa..798227be0 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py @@ -30,7 +30,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('./etc/dovecot/config_templates'), + loader=FileSystemLoader('/etc/dovecot/config_templates'), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py b/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py index 9dc5687e2..6118df42a 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py @@ -30,7 +30,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('./etc/mysql/conf.d/config_templates'), + loader=FileSystemLoader('/etc/mysql/conf.d/config_templates'), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py b/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py index dd17ab893..7e3b62f73 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py @@ -22,7 +22,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('./etc/nginx/conf.d/config_templates'), + loader=FileSystemLoader('/etc/nginx/conf.d/config_templates'), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py b/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py index c7392e74a..a962496f1 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py @@ -17,7 +17,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('./opt/postfix/conf/config_templates'), + loader=FileSystemLoader('/opt/postfix/conf/config_templates'), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py b/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py index 908b10ef7..b6b233772 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py @@ -60,7 +60,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('./etc/rspamd/config_templates'), + loader=FileSystemLoader('/etc/rspamd/config_templates'), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py b/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py index 7027c4cde..f30ed251d 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py @@ -27,7 +27,7 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader("./etc/sogo/config_templates"), + loader=FileSystemLoader("/etc/sogo/config_templates"), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/nginx/Dockerfile b/data/Dockerfiles/nginx/Dockerfile index d64a96062..ea7127c5d 100644 --- a/data/Dockerfiles/nginx/Dockerfile +++ b/data/Dockerfiles/nginx/Dockerfile @@ -4,16 +4,18 @@ LABEL maintainer "The Infrastructure Company GmbH " ENV PIP_BREAK_SYSTEM_PACKAGES=1 RUN apk add --no-cache nginx \ - python3 \ - supervisor \ - py3-pip && \ - pip install --upgrade pip && \ - pip install Jinja2 \ + python3 py3-pip \ + supervisor + +RUN pip install --break-system-packages \ mysql-connector-python \ - redis + jinja2 \ + redis \ + dnspython RUN mkdir -p /etc/nginx/includes + COPY data/Dockerfiles/bootstrap /bootstrap COPY data/Dockerfiles/nginx/docker-entrypoint.sh / COPY data/Dockerfiles/nginx/supervisord.conf /etc/supervisor/supervisord.conf @@ -22,4 +24,5 @@ COPY data/Dockerfiles/nginx/stop-supervisor.sh /usr/local/sbin/stop-supervisor.s RUN chmod +x /docker-entrypoint.sh RUN chmod +x /usr/local/sbin/stop-supervisor.sh + CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]