From eef4361c923f9857db2f0229bbe0818808d622a9 Mon Sep 17 00:00:00 2001
From: Tommy <contact@tommytran.io>
Date: Tue, 6 Sep 2022 18:34:27 -0400
Subject: [PATCH] Use upstream NGINX image

---
 docker-compose.yml         | 13 ++++++-------
 nginx-relay/Dockerfile     | 22 ----------------------
 nginx-terminate/Dockerfile | 22 ----------------------
 3 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 nginx-relay/Dockerfile
 delete mode 100644 nginx-terminate/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index a3b3635..2d85ca2 100644
--- 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
deleted file mode 100644
index 1900884..0000000
--- a/nginx-relay/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:20.04
-
-RUN apt-get update && apt-get -y upgrade && \
-    apt-get install -y wget libpcre3-dev build-essential libssl-dev zlib1g-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /opt
-
-RUN wget https://nginx.org/download/nginx-1.18.0.tar.gz && \
-    tar -zxvf nginx-1.*.tar.gz && \
-    cd nginx-1.* && \
-    ./configure --prefix=/opt/nginx --user=nginx --group=nginx --with-http_ssl_module --with-ipv6 --with-threads --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module && \
-    make && make install && \
-    cd .. && rm -rf nginx-1.*
-
-RUN adduser --system --no-create-home --disabled-login --disabled-password --group nginx
-
-WORKDIR /
-
-EXPOSE 443
-
-CMD ["/opt/nginx/sbin/nginx", "-c", "/etc/nginx/conf.d/nginx.conf", "-g", "daemon off;"]
diff --git a/nginx-terminate/Dockerfile b/nginx-terminate/Dockerfile
deleted file mode 100644
index 1900884..0000000
--- a/nginx-terminate/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:20.04
-
-RUN apt-get update && apt-get -y upgrade && \
-    apt-get install -y wget libpcre3-dev build-essential libssl-dev zlib1g-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /opt
-
-RUN wget https://nginx.org/download/nginx-1.18.0.tar.gz && \
-    tar -zxvf nginx-1.*.tar.gz && \
-    cd nginx-1.* && \
-    ./configure --prefix=/opt/nginx --user=nginx --group=nginx --with-http_ssl_module --with-ipv6 --with-threads --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module && \
-    make && make install && \
-    cd .. && rm -rf nginx-1.*
-
-RUN adduser --system --no-create-home --disabled-login --disabled-password --group nginx
-
-WORKDIR /
-
-EXPOSE 443
-
-CMD ["/opt/nginx/sbin/nginx", "-c", "/etc/nginx/conf.d/nginx.conf", "-g", "daemon off;"]