Use upstream NGINX image

signalapp · Sep 6, 2022 · eef4361 · eef4361
1 parent 8999930
commit eef4361
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 51 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,20 +2,19 @@ version: '3'
 
 services:
   nginx-terminate:
-    build: ./nginx-terminate/
+    image: nginx:alpine
     restart: unless-stopped
     volumes:
-      - ./data/nginx-terminate:/etc/nginx/conf.d
-      - ./data/certbot/conf:/etc/letsencrypt
-      - ./data/certbot/www:/var/www/certbot
+      - ./data/nginx-terminate/nginx.conf:/etc/nginx/nginx.conf:Z
+      - ./data/certbot/conf:/etc/letsencrypt:Z
+      - ./data/certbot/www:/var/www/certbot:Z
     ports:
       - "443:443"
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; /opt/nginx/sbin/nginx -s reload; done & /opt/nginx/sbin/nginx -c /etc/nginx/conf.d/nginx.conf -g \"daemon off;\"'"
   nginx-relay:
-    build: ./nginx-relay/
+    image: nginx:alpine
     restart: unless-stopped
     volumes:
-      - ./data/nginx-relay:/etc/nginx/conf.d
+      - ./data/nginx-relay/nginx.conf:/etc/nginx/nginx.conf:Z
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; /opt/nginx/sbin/nginx -s reload; done & /opt/nginx/sbin/nginx -c /etc/nginx/conf.d/nginx.conf -g \"daemon off;\"'"
   certbot:
     image: certbot/certbot

diff --git a/nginx-relay/Dockerfile b/nginx-relay/Dockerfile
diff --git a/nginx-terminate/Dockerfile b/nginx-terminate/Dockerfile