From 21c1978694ba3b7def366ab5fb3be77eb60c9420 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sat, 22 Apr 2023 13:29:35 +0100
Subject: [PATCH 01/13] Bumping version to 6.0.0

---
 VERSION       | 2 +-
 VERSION_MAJOR | 2 +-
 VERSION_MINOR | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index bd3ec29..f4965a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.1.25
\ No newline at end of file
+6.0.0
\ No newline at end of file
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
index 7813681..62f9457 100644
--- a/VERSION_MAJOR
+++ b/VERSION_MAJOR
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index 8336407..5049538 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-5.1
\ No newline at end of file
+6.0
\ No newline at end of file

From 5ef79c403073894ebed215a7732b2ed1f8bc5b1a Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sat, 22 Apr 2023 21:55:07 +0100
Subject: [PATCH 02/13] Using Nginx 5.0.0-beta base image

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 75d71ff..5972268 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx:nginx1.22-4.0.33
+FROM bfren/nginx:nginx1.22-alpine3.17-5.0.0-beta
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-proxy"
 

From 7e228e4eb1d848cb1f45bcb3cd7b16c19f514563 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:07:29 +0100
Subject: [PATCH 03/13] Using /www/public as root for maintenance mode

---
 overlay/etc/nginx/helpers/proxy-maintenance.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/etc/nginx/helpers/proxy-maintenance.conf b/overlay/etc/nginx/helpers/proxy-maintenance.conf
index cf9521a..28c9763 100644
--- a/overlay/etc/nginx/helpers/proxy-maintenance.conf
+++ b/overlay/etc/nginx/helpers/proxy-maintenance.conf
@@ -1,3 +1,3 @@
 location = /maintenance.html {
-    root                                /www;
+    root                                /www/public;
 }
\ No newline at end of file

From 3a61558e0731775fae68d8efbfaea28409a11d5e Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:25:41 +0100
Subject: [PATCH 04/13] Generate proxy configuration and helper to allow
 refresh override

---
 Dockerfile                                         |  4 +++-
 overlay/etc/bf/init.d/23-maintenance               | 14 ++++++++++++++
 .../bf/templates/maintenance.html.esh}             |  4 ++--
 .../etc/bf/templates/proxy-maintenance.conf.esh    |  3 +++
 overlay/etc/nginx/helpers/proxy-maintenance.conf   |  3 ---
 5 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 overlay/etc/bf/init.d/23-maintenance
 rename overlay/{www/maintenance.html => etc/bf/templates/maintenance.html.esh} (88%)
 create mode 100644 overlay/etc/bf/templates/proxy-maintenance.conf.esh
 delete mode 100644 overlay/etc/nginx/helpers/proxy-maintenance.conf

diff --git a/Dockerfile b/Dockerfile
index 5972268..ccd6303 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,9 @@ ENV \
     # optional - add aliases to the auto-generated conf.json on first startup
     PROXY_AUTO_ALIASES= \
     # optional - mark the Nginx config as custom so it isn't regenerated on future startups
-    PROXY_AUTO_CUSTOM=0
+    PROXY_AUTO_CUSTOM=0 \
+    # the number of seconds before the maintenance page will auto-refresh
+    PROXY_MAINTENANCE_REFRESH_SECONDS=6
 
 COPY ./overlay /
 
diff --git a/overlay/etc/bf/init.d/23-maintenance b/overlay/etc/bf/init.d/23-maintenance
new file mode 100644
index 0000000..de2bf19
--- /dev/null
+++ b/overlay/etc/bf/init.d/23-maintenance
@@ -0,0 +1,14 @@
+#!/command/with-contenv bash
+
+set -euo pipefail
+export BF_E=`basename ${0}`
+
+
+#======================================================================================================================
+# Generate maintenance configuration helper and page.
+#======================================================================================================================
+
+bf-echo "Generating maintenance files."
+bf-esh ${BF_TEMPLATES}/proxy-maintenance.conf.esh /etc/nginx/helpers/proxy-maintenance.conf
+bf-esh ${BF_TEMPLATES}/maintenance.html.esh ${NGINX_ROOT}/maintenance.html
+bf-done
diff --git a/overlay/www/maintenance.html b/overlay/etc/bf/templates/maintenance.html.esh
similarity index 88%
rename from overlay/www/maintenance.html
rename to overlay/etc/bf/templates/maintenance.html.esh
index c63562d..63ad1ad 100644
--- a/overlay/www/maintenance.html
+++ b/overlay/etc/bf/templates/maintenance.html.esh
@@ -11,9 +11,9 @@
 <body>
 <h1>Maintenance</h1>
 <p>The site you requested is temporarily down for maintenance.  Please try again later.</p>
-<p class="muted">This page will auto-refresh in <span id="remaining">10</span>s.</p>
+<p class="muted">This page will auto-refresh in <span id="remaining"><%= "${PROXY_MAINTENANCE_REFRESH_SECONDS}" %></span>s.</p>
 <script type="text/javascript">
-    let remaining = 7;
+    let remaining = <%= "${PROXY_MAINTENANCE_REFRESH_SECONDS}" %>;
     let countdown = function () {
         // reload the page
         if (remaining == 0) {
diff --git a/overlay/etc/bf/templates/proxy-maintenance.conf.esh b/overlay/etc/bf/templates/proxy-maintenance.conf.esh
new file mode 100644
index 0000000..14f82d5
--- /dev/null
+++ b/overlay/etc/bf/templates/proxy-maintenance.conf.esh
@@ -0,0 +1,3 @@
+location = /maintenance.html {
+    root                                <%= "${NGINX_ROOT}" %>;
+}
\ No newline at end of file
diff --git a/overlay/etc/nginx/helpers/proxy-maintenance.conf b/overlay/etc/nginx/helpers/proxy-maintenance.conf
deleted file mode 100644
index 28c9763..0000000
--- a/overlay/etc/nginx/helpers/proxy-maintenance.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location = /maintenance.html {
-    root                                /www/public;
-}
\ No newline at end of file

From f0e44534ec69e0cc6936c4994b39c2f512dccf4e Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:29:44 +0100
Subject: [PATCH 05/13] Use upstream variable in case host is not available -
 so Nginx will always start

---
 overlay/etc/bf/templates/nginx-site.conf.esh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
index 7674624..01436c6 100644
--- a/overlay/etc/bf/templates/nginx-site.conf.esh
+++ b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -85,8 +85,12 @@ server {
 <% fi -%>
 
     # main site configuration block
+    # set resolver to Docker's internal DNS resolver
+    # use an upstream variable so Nginx will always start even if upstream is not available
     location / {
-        proxy_pass                  <%= "${UPSTREAM}" %>;
+        resolver                    127.0.0.11 valid=30s;
+        set $upstream               <%= "${UPSTREAM}" %>
+        proxy_pass                  $upstream;
         include                     helpers/proxy-params.conf;
         include                     helpers/proxy-secure-headers.conf;
         error_page                  502 503 504 /maintenance.html;

From ad76a9b59d4781783beb52c49c578951b19b1b35 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:32:28 +0100
Subject: [PATCH 06/13] Fixing upstream definition

---
 overlay/etc/bf/templates/nginx-site.conf.esh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
index 01436c6..245f37c 100644
--- a/overlay/etc/bf/templates/nginx-site.conf.esh
+++ b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -89,7 +89,7 @@ server {
     # use an upstream variable so Nginx will always start even if upstream is not available
     location / {
         resolver                    127.0.0.11 valid=30s;
-        set $upstream               <%= "${UPSTREAM}" %>
+        set $upstream               <%= "${UPSTREAM}" %>;
         proxy_pass                  $upstream;
         include                     helpers/proxy-params.conf;
         include                     helpers/proxy-secure-headers.conf;

From 3af19efe40ccd4941544b6653f2f930f26ea0fe1 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:37:03 +0100
Subject: [PATCH 07/13] Adding additional comments to site conf

---
 overlay/etc/bf/templates/nginx-site.conf.esh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
index 245f37c..e75522a 100644
--- a/overlay/etc/bf/templates/nginx-site.conf.esh
+++ b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -85,15 +85,21 @@ server {
 <% fi -%>
 
     # main site configuration block
-    # set resolver to Docker's internal DNS resolver
-    # use an upstream variable so Nginx will always start even if upstream is not available
     location / {
+        # set resolver to Docker's internal DNS resolver and use an upstream variable so Nginx will always start -
+        # even if UPSTREAM is not available
         resolver                    127.0.0.11 valid=30s;
         set $upstream               <%= "${UPSTREAM}" %>;
+
+        # proxy to the upstream server
         proxy_pass                  $upstream;
         include                     helpers/proxy-params.conf;
         include                     helpers/proxy-secure-headers.conf;
+
+        # use maintenance page (defined in helpers/proxy-maintenance.conf) when there's an upstream server error
         error_page                  502 503 504 /maintenance.html;
+
+        # include custom configuration files
         include                     <%= "${CUSTOM_CONF}/*.conf" %>;
 
         # because he was a legend

From a28b8521892268699e7145ec34e82ecb464948ee Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:41:23 +0100
Subject: [PATCH 08/13] Fixing comment

---
 overlay/etc/bf/templates/nginx-site.conf.esh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
index e75522a..1bba1e9 100644
--- a/overlay/etc/bf/templates/nginx-site.conf.esh
+++ b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -22,7 +22,7 @@
 # WARNING: This file is generated. Do not make changes to this file.
 # Changes will be overwritten the next time the container is started.
 #
-# To add server names or aliases please use /ssl/conf.sh (see ssl-conf-sample.sh).
+# To add server names or aliases please use /ssl/conf.json (see ssl-conf-sample.json).
 #
 # If you need a fully custom configuration then add the following to /ssl/conf.json in the object where the primary
 # domain is "<%= "${DOMAIN_NAME}" %>":
@@ -87,7 +87,7 @@ server {
     # main site configuration block
     location / {
         # set resolver to Docker's internal DNS resolver and use an upstream variable so Nginx will always start -
-        # even if UPSTREAM is not available
+        # even if $upstream is not available - h/t https://stackoverflow.com/a/54719226/8199362
         resolver                    127.0.0.11 valid=30s;
         set $upstream               <%= "${UPSTREAM}" %>;
 

From a40e7752858c000ab4c0fcd3da6730121841bf8f Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:52:27 +0100
Subject: [PATCH 09/13] Adding cusomt upstream DNS resolver

---
 Dockerfile                                   | 2 ++
 overlay/etc/bf/templates/nginx-site.conf.esh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ccd6303..6300a14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,8 @@ ENV \
     PROXY_AUTO_ALIASES= \
     # optional - mark the Nginx config as custom so it isn't regenerated on future startups
     PROXY_AUTO_CUSTOM=0 \
+    # upstream DNS resolver, set to Docker's internal resolver by default
+    PROXY_UPSTREAM_DNS_RESOLVER=127.0.0.11 \
     # the number of seconds before the maintenance page will auto-refresh
     PROXY_MAINTENANCE_REFRESH_SECONDS=6
 
diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
index 1bba1e9..29c4ba7 100644
--- a/overlay/etc/bf/templates/nginx-site.conf.esh
+++ b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -88,7 +88,7 @@ server {
     location / {
         # set resolver to Docker's internal DNS resolver and use an upstream variable so Nginx will always start -
         # even if $upstream is not available - h/t https://stackoverflow.com/a/54719226/8199362
-        resolver                    127.0.0.11 valid=30s;
+        resolver                    <%= "${PROXY_UPSTREAM_DNS_RESOLVER}" %> valid=30s;
         set $upstream               <%= "${UPSTREAM}" %>;
 
         # proxy to the upstream server

From 4d50244fc7ebf3cf9f051e1b6c517e8411993274 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 14:58:41 +0100
Subject: [PATCH 10/13] Adding various missing environment variables to
 README.md

---
 README.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c47d46e..7ef7520 100644
--- a/README.md
+++ b/README.md
@@ -34,16 +34,22 @@ For SSL certificate requests to work correctly, ports 80 and 443 need mapping fr
 
 ## Environment Variables
 
-| Variable                             | Values                | Description                                                                                                                                  | Default               |
-| ------------------------------------ | --------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
-| `PROXY_URI`                          | URI                   | The base URI of the proxy server - will be used to handle unbound requests.                                                                  | *None* - **required** |
-| `PROXY_CLEAN_INSTALL`                | 0 or 1                | If 1, all Nginx and SSL configuration and certificates will be deleted and regenerated.                                                      | 0                     |
-| `PROXY_HARDEN`                       | 0 or 1                | If 1, only modern SSL ciphers and protocols will be enabled (some older devices may not be able to access it).                               | 0                     |
-| `PROXY_LETS_ENCRYPT_EMAIL`           | A valid email address | Used by Lets Encrypt for notification emails.                                                                                                | *None* - **required** |
-| `PROXY_LETS_ENCRYPT_LIVE`            | 0 or 1                | Only set to 1 (to request live certificates) when your config is correct - Lets Encrypt rate limit certificate requests.                     | 0                     |
-| `PROXY_SSL_DHPARAM_BITS`             | A valid integer       | The size of your DHPARAM variables - adjust down only if you have limited processing resources.                                              | 4096                  |
-| `PROXY_SSL_REDIRECT_TO_CANONICAL`    | 0 or 1                | If 1, all requests will be redirected to the primary domain (defined in `conf.json`).                                                        | 0                     |
-| `PROXY_GETSSL_SKIP_HTTP_TOKEN_CHECK` | true or false         | Set to true to enable `getssl`'s [skip HTTP token check](https://github.com/srvrco/getssl/wiki/Config-variables#skip_http_token_checkfalse). | false                 |
+| Variable                              | Values                | Description                                                                                                                                   | Default               |
+| ------------------------------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
+| `PROXY_URI`                           | URI                   | The base URI of the proxy server - will be used to handle unbound requests.                                                                   | *None* - **required** |
+| `PROXY_CLEAN_INSTALL`                 | 0 or 1                | If 1, all Nginx and SSL configuration and certificates will be deleted and regenerated.                                                       | 0                     |
+| `PROXY_HARDEN`                        | 0 or 1                | If 1, only modern SSL ciphers and protocols will be enabled (some older devices may not be able to access it).                                | 0                     |
+| `PROXY_LETS_ENCRYPT_EMAIL`            | A valid email address | Used by Lets Encrypt for notification emails.                                                                                                 | *None* - **required** |
+| `PROXY_LETS_ENCRYPT_LIVE`             | 0 or 1                | Only set to 1 (to request live certificates) when your config is correct - Lets Encrypt rate limit certificate requests.                      | 0                     |
+| `PROXY_SSL_DHPARAM_BITS`              | A valid integer       | The size of your DHPARAM variables - adjust down only if you have limited processing resources.                                               | 4096                  |
+| `PROXY_SSL_REDIRECT_TO_CANONICAL`     | 0 or 1                | If 1, all requests will be redirected to the primary domain (defined in `conf.json`).                                                         | 0                     |
+| `PROXY_GETSSL_SKIP_HTTP_TOKEN_CHECK`  | true or false         | Set to true to enable `getssl`'s [skip HTTP token check](https://github.com/srvrco/getssl/wiki/Config-variables#skip_http_token_checkfalse).  | false                 |
+| `PROXY_AUTO_PRIMARY`                  | URI                   | If set (along with PROXY_AUTO_UPSTREAM) SSL config will be generated on first startup.                                                        | *None*                |
+| `PROXY_AUTO_UPSTREAM`                 | URI                   | If set (along with PROXY_AUTO_PRIMARY) SSL config will be generated on first startup.                                                         | *None*                |
+| `PROXY_AUTO_ALIASES`                  | string of URIs        | Add aliases to the auto-generated conf.json on first startup.                                                                                 | *None*                |
+| `PROXY_AUTO_CUSTOM`                   | 0 or 1                | Mark the auto-generated SSL config to 'custom' so the Nginx configuration is not regenerated on startup.                                      | 0                     |
+| `PROXY_UPSTREAM_DNS_RESOLVER`         | IP address            | Upstream DNS resolver - set to Docker's by default.                                                                                           | 127.0.0.11            |
+| `PROXY_MAINTENANCE_REFRESH_SECONDS`   | A valid integer       | The number of seconds to count down before the maintenance page auto-refreshes.                                                               | 6                     |
 
 ## Helper Functions
 

From ad2f152964ac08835fc804c3d279eb686eecb871 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 15:01:46 +0100
Subject: [PATCH 11/13] Adding nginx-adduser to README.md

---
 README.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 7ef7520..00b5fcd 100644
--- a/README.md
+++ b/README.md
@@ -53,15 +53,16 @@ For SSL certificate requests to work correctly, ports 80 and 443 need mapping fr
 
 ## Helper Functions
 
-| Function              | Arguments | Description                                                                                                                |
-| --------------------- | --------- | -------------------------------------------------------------------------------------------------------------------------- |
-| `nginx-regenerate`    | -f: force | Removes non-custom Nginx configuration files (in `/sites`) and regenerates based on `conf.json` (with force, removes all). |
-| `ssl-cleanup`         | -m: mode  | Removes SSL and Nginx configuration files and directories not defined in `conf.json` (mode 0 = dry run, 1 = live).         |
-| `ssl-init`            | *None*    | Initialises SSL configuration based on `conf.json`.                                                                        |
-| `ssl-regenerate`      | *None*    | Removes SSL configuration files (in `/ssl/certs`) and regenerates based on `conf.json`.                                    |
-| `ssl-regenerate-full` | *None*    | Removes SSL configuration files (in `/ssl/certs`), as well as DH parameters, and regenerates based on `conf.json`.         |
-| `ssl-request`         | *None*    | Requests SSL certificates from Lets Encrypt.                                                                               |
-| `ssl-update`          | *None*    | Attempts to update SSL certificates manually.                                                                              |
+| Function              | Arguments                 | Description                                                                                                                   |
+| --------------------- | ------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `nginx-adduser`       | 0: username, 1: password  | Add a user to enable basic HTTP auth.                                                                                         |
+| `nginx-regenerate`    | -f: force                 | Removes non-custom Nginx configuration files (in `/sites`) and regenerates based on `conf.json` (with force, removes all).    |
+| `ssl-cleanup`         | -m: mode                  | Removes SSL and Nginx configuration files and directories not defined in `conf.json` (mode 0 = dry run, 1 = live).            |
+| `ssl-init`            | *None*                    | Initialises SSL configuration based on `conf.json`.                                                                           |
+| `ssl-regenerate`      | *None*                    | Removes SSL configuration files (in `/ssl/certs`) and regenerates based on `conf.json`.                                       |
+| `ssl-regenerate-full` | *None*                    | Removes SSL configuration files (in `/ssl/certs`), as well as DH parameters, and regenerates based on `conf.json`.            |
+| `ssl-request`         | *None*                    | Requests SSL certificates from Lets Encrypt.                                                                                  |
+| `ssl-update`          | *None*                    | Attempts to update SSL certificates manually.                                                                                 |
 
 ## Nginx Configuration Helpers
 

From 1a995a58727d1d591621cfd3951dd9bb54d96078 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 15:06:03 +0100
Subject: [PATCH 12/13] Updating comments

---
 overlay/etc/bf/templates/nginx-site.conf.esh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/overlay/etc/bf/templates/nginx-site.conf.esh b/overlay/etc/bf/templates/nginx-site.conf.esh
index 29c4ba7..3ac437a 100644
--- a/overlay/etc/bf/templates/nginx-site.conf.esh
+++ b/overlay/etc/bf/templates/nginx-site.conf.esh
@@ -78,7 +78,7 @@ server {
     listen                          [::]:443 ssl http2;
 
 <% if [ "${PROXY_SSL_REDIRECT_TO_CANONICAL}" = "1" ] ; then -%>
-    # redirect to primary domain name
+    # redirect to primary (canonical) domain name
     if ($host != <%= "${DOMAIN_NAME}" %>) {
         return                      301 <%= "https://${DOMAIN_NAME}" %>$request_uri;
     }
@@ -86,17 +86,17 @@ server {
 
     # main site configuration block
     location / {
-        # set resolver to Docker's internal DNS resolver and use an upstream variable so Nginx will always start -
+        # set resolver to Docker's internal DNS resolver and use an upstream variable so Nginx will always start,
         # even if $upstream is not available - h/t https://stackoverflow.com/a/54719226/8199362
         resolver                    <%= "${PROXY_UPSTREAM_DNS_RESOLVER}" %> valid=30s;
         set $upstream               <%= "${UPSTREAM}" %>;
 
-        # proxy to the upstream server
+        # proxy to the upstream server, enabling best-practice proxy and security headers
         proxy_pass                  $upstream;
         include                     helpers/proxy-params.conf;
         include                     helpers/proxy-secure-headers.conf;
 
-        # use maintenance page (defined in helpers/proxy-maintenance.conf) when there's an upstream server error
+        # use maintenance page (defined in helpers/proxy-maintenance.conf - see below) when there's an upstream error
         error_page                  502 503 504 /maintenance.html;
 
         # include custom configuration files

From 64b315cf1666acb628dafab830b2d554bc622d71 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Sun, 23 Apr 2023 16:35:36 +0100
Subject: [PATCH 13/13] Removing beta from base image

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6300a14..465b0d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx:nginx1.22-alpine3.17-5.0.0-beta
+FROM bfren/nginx:nginx1.22-alpine3.17-5.0.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-proxy"