Browse Source

Set Jinja2 template folder to absolute path

FreddleSpl0it 3 months ago
parent
commit
c38a4c203e

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 9 - 6
data/Dockerfiles/nginx/Dockerfile

@@ -4,16 +4,18 @@ LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 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"]