Merge branch 'jlesage:master' into master

Author: LePresidente

Dockerfile

@@ -9,7 +9,7 @@ ARG DOCKER_IMAGE_VERSION=
 
 # Define software versions.
 ARG OPENRESTY_VERSION=1.19.9.1
-ARG NGINX_PROXY_MANAGER_VERSION=2.9.21
+ARG NGINX_PROXY_MANAGER_VERSION=2.9.22
 ARG NGINX_HTTP_GEOIP2_MODULE_VERSION=3.3
 ARG LIBMAXMINDDB_VERSION=1.5.0
 ARG BCRYPT_TOOL_VERSION=1.1.2

appdefs.yml

@@ -97,6 +97,10 @@ app:
             - `CONTAINER_NAME` is the name of the running container.
             - `USER_EMAIL` is the email of the address to reset the password.
   changelog:
+    - version: 23.04.1
+      date: 2023-04-07
+      changes:
+        - 'Updated Nginx Proxy Manager to version 2.9.22.'
     - version: 23.03.2
       date: 2023-03-05
       changes:

src/nginx-proxy-manager/build.sh

@@ -73,6 +73,9 @@ curl -# -L -f ${NGINX_PROXY_MANAGER_URL} | tar xz --strip 1 -C /tmp/nginx-proxy-
 sed -i "s/\"version\": \"0.0.0\",/\"version\": \"${NGINX_PROXY_MANAGER_VERSION}\",/" /tmp/nginx-proxy-manager/frontend/package.json
 sed -i "s/\"version\": \"0.0.0\",/\"version\": \"${NGINX_PROXY_MANAGER_VERSION}\",/" /tmp/nginx-proxy-manager/backend/package.json
 
+log "Patching Nginx Proxy Manager backend..."
+patch -p1 -d /tmp/nginx-proxy-manager < "$SCRIPT_DIR"/pip-install.patch
+
 cp -r /tmp/nginx-proxy-manager /app
 
 log "Building Nginx Proxy Manager frontend..."

src/nginx-proxy-manager/pip-install.patch

@@ -0,0 +1,26 @@
+diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js
+index da104a2..730d826 100644
+--- a/backend/internal/certificate.js
++++ b/backend/internal/certificate.js
+@@ -871,7 +871,7 @@ const internalCertificate = {
+ 		const escapedCredentials = certificate.meta.dns_provider_credentials.replaceAll('\'', '\\\'').replaceAll('\\', '\\\\');
+ 		const credentialsCmd     = 'mkdir -p /etc/letsencrypt/credentials 2> /dev/null; echo \'' + escapedCredentials + '\' > \'' + credentialsLocation + '\' && chmod 600 \'' + credentialsLocation + '\'';
+ 		// we call `. /opt/certbot/bin/activate` (`.` is alternative to `source` in dash) to access certbot venv
+-		let prepareCmd = '. /opt/certbot/bin/activate && pip install ' + dns_plugin.package_name + (dns_plugin.version_requirement || '') + ' ' + dns_plugin.dependencies + ' && deactivate';
++		let prepareCmd = 'pip install ' + dns_plugin.package_name + (dns_plugin.version_requirement || '') + ' ' + dns_plugin.dependencies;
+ 
+ 		// Whether the plugin has a --<name>-credentials argument
+ 		const hasConfigArg = certificate.meta.dns_provider !== 'route53';
+diff --git a/backend/setup.js b/backend/setup.js
+index a4b51c9..6d3d3e3 100644
+--- a/backend/setup.js
++++ b/backend/setup.js
+@@ -189,7 +189,7 @@ const setupCertbotPlugins = () => {
+ 				});
+ 
+ 				if (plugins.length) {
+-					const install_cmd = '. /opt/certbot/bin/activate && pip install ' + plugins.join(' ') + ' && deactivate';
++					const install_cmd = 'pip install ' + plugins.join(' ');
+ 					promises.push(utils.exec(install_cmd));
+ 				}
+