diff --git a/Dockerfile b/Dockerfile index 6f54051e..27abd3af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG DOCKER_IMAGE_VERSION= # Define software versions. ARG OPENRESTY_VERSION=1.27.1.1 -ARG NGINX_PROXY_MANAGER_VERSION=2.12.3 +ARG NGINX_PROXY_MANAGER_VERSION=2.12.6 ARG NGINX_HTTP_GEOIP2_MODULE_VERSION=3.3 ARG LIBMAXMINDDB_VERSION=1.5.0 ARG BCRYPT_TOOL_VERSION=1.1.2 diff --git a/appdefs.yml b/appdefs.yml index 9ca62712..d17a5236 100644 --- a/appdefs.yml +++ b/appdefs.yml @@ -98,6 +98,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: 25.07.0 + date: 2025-09-09 + changes: + - 'Updated Nginx Proxy Manager to version 2.12.6.' - version: 25.06.1 date: 2025-06-25 changes: diff --git a/src/nginx-proxy-manager/pip-install.patch b/src/nginx-proxy-manager/pip-install.patch index f6c82633..1af15162 100644 --- a/src/nginx-proxy-manager/pip-install.patch +++ b/src/nginx-proxy-manager/pip-install.patch @@ -1,11 +1,11 @@ --- a/backend/lib/certbot.js +++ b/backend/lib/certbot.js -@@ -63,7 +63,7 @@ - plugin.version = plugin.version.replace(/{{certbot-version}}/g, CERTBOT_VERSION_REPLACEMENT); - plugin.dependencies = plugin.dependencies.replace(/{{certbot-version}}/g, CERTBOT_VERSION_REPLACEMENT); +@@ -70,7 +70,7 @@ + env = Object.assign(env, plugin.env); + } -- const cmd = '. /opt/certbot/bin/activate && pip install --no-cache-dir ' + plugin.dependencies + ' ' + plugin.package_name + plugin.version + ' ' + ' && deactivate'; +- const cmd = `. /opt/certbot/bin/activate && pip install --no-cache-dir ${plugin.dependencies} ${plugin.package_name}${plugin.version} && deactivate`; + const cmd = 'pip install --no-cache-dir ' + plugin.dependencies + ' ' + plugin.package_name + plugin.version; - return utils.exec(cmd) + return utils.exec(cmd, {env}) .then((result) => { logger.complete(`Installed ${pluginKey}`); diff --git a/src/nginx-proxy-manager/remove-certbot-dns-oci.patch b/src/nginx-proxy-manager/remove-certbot-dns-oci.patch index f60461f3..7614a203 100644 --- a/src/nginx-proxy-manager/remove-certbot-dns-oci.patch +++ b/src/nginx-proxy-manager/remove-certbot-dns-oci.patch @@ -2,7 +2,7 @@ Because of the Oracle Cloud Infrastructure DNS plugin dependencies, installing it causes certbot to be downgraded, which then break any execution of certbot. --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json -@@ -437,14 +437,6 @@ +@@ -439,14 +439,6 @@ "credentials": "dns_nsone_api_key = MDAwMDAwMDAwMDAwMDAw", "full_plugin_name": "dns-nsone" },