update 2024-04-22

Changes:
- add jinja2 template engine instead of string-replacing
- fix certbot cron usage
- replace json servers configuration with yaml

nginx/Dockerfile

@@ -1,22 +1,22 @@
-FROM python:3.10-alpine as builder
+FROM python:3.11-alpine as builder
+
+RUN pip3 install --no-cache-dir pyyaml jinja2
 
 COPY add_servers.py /add_servers.py
-COPY servers.json /servers.json
+COPY servers.yaml /servers.yaml
 COPY domains.txt /domains.txt
-COPY nginx.conf /nginx.conf
+COPY nginx.conf.j2 /nginx.conf.j2
 
-RUN python /add_servers.py --nginx /nginx.conf --domains_list_txt /domains.txt --servers_config_json servers.json --certificates_path /ssl
+RUN python /add_servers.py --nginx-template /nginx.conf.j2 -o /nginx.conf --domains_list_txt /domains.txt --servers-config servers.yaml --certificates-path /ssl
 
+# service
 
 FROM nginx:alpine
 
-COPY proxy_common.conf /etc/nginx/proxy_common.conf
-COPY server_common.conf /etc/nginx/server_common.conf
-
 COPY --from=builder /nginx.conf /etc/nginx/nginx.conf
 COPY domains.txt /domains.txt
 
-RUN echo "16 2 */7 * * nginx -s reload" > /etc/crontabs/certbot && \
+RUN echo "16 2 */7 * * nginx -s reload" > /etc/crontabs/root && \
     \
     echo "cp /domains.txt /ssl/domains.txt" > /entrypoint && \
     echo "crond" >> /entrypoint && \