v6.1.0 (#149)

Major updates
* Updating to use Nginx 1.24

Minor updates
* Using new NGINX_WWW / NGINX_PUBLIC
* Moving index file to www\public

Author: bfren

Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/nginx:nginx1.22-alpine3.17-5.0.3
+FROM bfren/nginx:nginx1.24-alpine3.18-5.0.6
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-proxy"
 

VERSION

@@ -1 +1 @@
-6.0.3
+6.1.0

VERSION_MINOR

@@ -1 +1 @@
-6.0
+6.1

overlay/etc/bf/init.d/20-env

@@ -29,7 +29,7 @@ bf-env "PROXY_SITES" "/sites"
 
 PROXY_ACME_CHALLENGE=.well-known/acme-challenge
 bf-env "PROXY_ACME_CHALLENGE" "${PROXY_ACME_CHALLENGE}"
-bf-env "PROXY_WWW_ACME_CHALLENGE" "${NGINX_ROOT}/${PROXY_ACME_CHALLENGE}"
+bf-env "PROXY_WWW_ACME_CHALLENGE" "${NGINX_WWW}/${PROXY_ACME_CHALLENGE}"
 
 if [ "${PROXY_GETSSL_DEBUG-}" = "1" ] ; then
     bf-env "PROXY_GETSSL_FLAGS" "-d -U"

overlay/etc/bf/init.d/23-maintenance

@@ -10,5 +10,5 @@ export BF_E=`basename ${0}`
 
 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-esh ${BF_TEMPLATES}/maintenance.html.esh ${NGINX_PUBLIC}/maintenance.html
 bf-done

overlay/etc/bf/templates/nginx-acme-challenge.part.esh

@@ -2,5 +2,5 @@
     # but all other requests can be blocked from outside the local network, for example)
     location ^~ /<%= "${PROXY_ACME_CHALLENGE}" %> {
         allow                       all;
-        root                        <%= "${NGINX_ROOT}" %>;
+        root                        <%= "${NGINX_WWW}" %>;
     }

overlay/etc/bf/templates/nginx-proxy.conf.esh

@@ -52,8 +52,8 @@ server {
     include                         helpers/nginx-ignore-favicon.conf;
     include                         helpers/nginx-static-files.conf;
 
-    # serve pages in <%= "${NGINX_ROOT}" %> (map volume to override default pages)
-    root                            <%= "${NGINX_ROOT}" %>;
+    # serve pages in <%= "${NGINX_PUBLIC}" %> (map volume to override default pages)
+    root                            <%= "${NGINX_PUBLIC}" %>;
 
 <%+ ./nginx-ssl-certs.part.esh %>
 }

overlay/etc/bf/templates/proxy-maintenance.conf.esh

@@ -1,3 +1,3 @@
 location = /maintenance.html {
-    root                                <%= "${NGINX_ROOT}" %>;
+    root                                <%= "${NGINX_PUBLIC}" %>;
 }