moved nginx config modification to docker via command with envsubst

Cielquan · Nov 16, 2019 · 4848143 · 4848143
1 parent 199946c
commit 4848143
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/docker-compose.nginx.yaml b/docker-compose.nginx.yaml
@@ -7,9 +7,12 @@ services:
   nginx:
     container_name: nginx
     hostname: ${HOST_NAME}
-    image: nginx:v1.17
+    image: nginx:1.17
+    environment:
+      - DOMAIN=${DOMAIN}
     volumes:
       - ./nginx-docker/configs/:/etc/nginx/
+      - ./nginx-docker/templates/:/etc/nginx/templates/
       - ./certificates/certs/:/etc/ssl/certs/
       - ./certificates/private/:/etc/ssl/private/
       - ./certificates/dhparam.pem:/etc/nginx/dhparam.pem
@@ -20,4 +23,10 @@ services:
     networks:
       dns_network0:
         ipv4_address: 172.16.1.2
-    restart: always
+    restart: always
+    command: >-
+      /bin/bash -c
+      "envsubst < /etc/nginx/templates/cert_DOMAIN.conf.template > /etc/nginx/snippets/cert_${DOMAIN}.conf &&
+      envsubst < /etc/nginx/templates/dns-over-tls.conf.template > /etc/nginx/streams/dns-over-tls.conf &&
+      envsubst < /etc/nginx/templates/DOMAIN.conf.template > /etc/nginx/sites-enabled/${DOMAIN}.conf &&
+      nginx -g 'daemon off;'"
diff --git a/docker-compose.traefik.yaml b/docker-compose.traefik.yaml
@@ -20,8 +20,11 @@ services:
     container_name: nginx
     hostname: ${HOST_NAME}
     image: nginx:1.17
+    environment:
+      - DOMAIN=${DOMAIN}
     volumes:
       - ./nginx-docker/configs/:/etc/nginx/
+      - ./nginx-docker/templates/:/etc/nginx/templates/
       - ./certificates/certs/:/etc/ssl/certs/
       - ./certificates/private/:/etc/ssl/private/
       - ./certificates/dhparam.pem:/etc/nginx/dhparam.pem
@@ -33,6 +36,12 @@ services:
       traefik_proxy:
         ipv4_address: 172.16.0.2
     restart: always
+    command: >-
+      /bin/bash -c
+      "envsubst < /etc/nginx/templates/cert_DOMAIN.conf.template > /etc/nginx/snippets/cert_${DOMAIN}.conf &&
+      envsubst < /etc/nginx/templates/dns-over-tls.conf.template > /etc/nginx/streams/dns-over-tls.conf &&
+      envsubst < /etc/nginx/templates/DOMAIN.conf.template > /etc/nginx/sites-enabled/${DOMAIN}.conf &&
+      nginx -g 'daemon off;'"
     labels:
       - traefik.enable=true
       - traefik.docker.network=traefik_proxy