From 8d2f49541c2b9494af6de89f1f19af8c8a6fe2f5 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Tue, 26 May 2020 14:38:41 +1000
Subject: [PATCH 1/3] Use OpenResty base image

---
 .gitignore             | 2 +-
 docker/Dockerfile      | 2 +-
 docker/dev/Dockerfile  | 2 +-
 scripts/frontend-build | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index deb3fb55..08462849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 .idea
 ._*
 .vscode
-
+certbot-help.txt
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a08549a0..fe60984f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # This file assumes that the frontend has been built using ./scripts/frontend-build
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:node
+FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:github-openresty-node
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index f0e2d262..042917e9 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,4 +1,4 @@
-FROM jc21/alpine-nginx-full:node
+FROM jc21/alpine-nginx-full:github-openresty-node
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ENV S6_LOGGING=0
diff --git a/scripts/frontend-build b/scripts/frontend-build
index 05be2eae..a94b9a9e 100755
--- a/scripts/frontend-build
+++ b/scripts/frontend-build
@@ -3,7 +3,7 @@
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 . "$DIR/.common.sh"
 
-DOCKER_IMAGE=jc21/alpine-nginx-full:node
+DOCKER_IMAGE=jc21/alpine-nginx-full:github-openresty-node
 
 # Ensure docker exists
 if hash docker 2>/dev/null; then

From c631537dbed8b5b7a419e96b869dcf80aa4ac99f Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 27 May 2020 10:38:00 +1000
Subject: [PATCH 2/3] Don't wipe out nginx dir, keeps luajit

---
 docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fe60984f..be2a67b4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,7 +16,6 @@ ENV S6_FIX_ATTRS_HIDDEN=1
 ENV NODE_ENV=production
 
 RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
-	&& rm -rf /etc/nginx \
 	&& apk update \
 	&& apk add python2 certbot jq \
 	&& rm -rf /var/cache/apk/*

From 66412a75f90e7190911ba94a533ba24a3e339bf4 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Thu, 28 May 2020 09:25:29 +1000
Subject: [PATCH 3/3] Revert to node base now that base has openresty

---
 docker/Dockerfile          | 2 +-
 docker/dev/Dockerfile      | 2 +-
 docker/rootfs/root/.bashrc | 2 +-
 scripts/frontend-build     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index be2a67b4..e3eefb34 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # This file assumes that the frontend has been built using ./scripts/frontend-build
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:github-openresty-node
+FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:node
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 042917e9..f0e2d262 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,4 +1,4 @@
-FROM jc21/alpine-nginx-full:github-openresty-node
+FROM jc21/alpine-nginx-full:node
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ENV S6_LOGGING=0
diff --git a/docker/rootfs/root/.bashrc b/docker/rootfs/root/.bashrc
index fe69b787..aec8e8f9 100644
--- a/docker/rootfs/root/.bashrc
+++ b/docker/rootfs/root/.bashrc
@@ -16,5 +16,5 @@ alias h='cd ~;clear;'
 
 echo -e -n '\E[1;34m'
 figlet -w 120 "NginxProxyManager"
-echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev}\E[1;36m (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}, Nginx \E[1;32m${NGINX_VERSION:-unknown}\E[1;36m, Alpine \E[1;32m${VERSION_ID:-unknown}\E[1;36m, Kernel \E[1;32m$(uname -r)\E[0m"
+echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev} (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}\E[1;36m, OpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, Alpine \E[1;32m${VERSION_ID:-unknown}\E[1;36m, Kernel \E[1;32m$(uname -r)\E[0m"
 echo
diff --git a/scripts/frontend-build b/scripts/frontend-build
index a94b9a9e..05be2eae 100755
--- a/scripts/frontend-build
+++ b/scripts/frontend-build
@@ -3,7 +3,7 @@
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 . "$DIR/.common.sh"
 
-DOCKER_IMAGE=jc21/alpine-nginx-full:github-openresty-node
+DOCKER_IMAGE=jc21/alpine-nginx-full:node
 
 # Ensure docker exists
 if hash docker 2>/dev/null; then