Merge pull request #4605 from NginxProxyManager/develop

v2.12.4

Jenkinsfile

@@ -241,17 +241,12 @@ pipeline {
 					}
 					steps {
 						script {
-							npmGithubPrComment("""Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/nginxproxymanager/${IMAGE}-dev):
+							npmGithubPrComment("""Docker Image for build ${BUILD_NUMBER} is available on
-```
+[DockerHub](https://cloud.docker.com/repository/docker/nginxproxymanager/${IMAGE}-dev)
-nginxproxymanager/${IMAGE}-dev:${BRANCH_LOWER}
+as `nginxproxymanager/${IMAGE}-dev:${BRANCH_LOWER}`
-```
 
-> [!NOTE]
+**Note:** ensure you backup your NPM instance before testing this image! Especially if there are database changes
-> Ensure you backup your NPM instance before testing this image! Especially if there are database changes.
+**Note:** this is a different docker image namespace than the official image
-> This is a different docker image namespace than the official image.
-
-> [!WARNING]
-> Changes and additions to DNS Providers require verification by at least 2 members of the community!
 """, true)
 						}
 					}

backend/lib/certbot.js

@@ -11,7 +11,7 @@ const certbot = {
 	/**
 	 * @param {array} pluginKeys
 	 */
-	installPlugins: async (pluginKeys) => {
+	installPlugins: async function (pluginKeys) {
 		let hasErrors = false;
 
 		return new Promise((resolve, reject) => {
@@ -21,7 +21,7 @@ const certbot = {
 			}
 
 			batchflow(pluginKeys).sequential()
-				.each((_i, pluginKey, next) => {
+				.each((i, pluginKey, next) => {
 					certbot.installPlugin(pluginKey)
 						.then(() => {
 							next();
@@ -51,7 +51,7 @@ const certbot = {
 	 * @param   {string}  pluginKey
 	 * @returns {Object}
 	 */
-	installPlugin: async (pluginKey) => {
+	installPlugin: async function (pluginKey) {
 		if (typeof dnsPlugins[pluginKey] === 'undefined') {
 			// throw Error(`Certbot plugin ${pluginKey} not found`);
 			throw new error.ItemNotFoundError(pluginKey);
@@ -63,14 +63,8 @@ const certbot = {
 		plugin.version      = plugin.version.replace(/{{certbot-version}}/g, CERTBOT_VERSION_REPLACEMENT);
 		plugin.dependencies = plugin.dependencies.replace(/{{certbot-version}}/g, CERTBOT_VERSION_REPLACEMENT);
 
-		const opts = {};
+		const cmd = '. /opt/certbot/bin/activate && pip install --no-cache-dir ' + plugin.dependencies + ' ' + plugin.package_name + plugin.version + ' ' + ' && deactivate';
-		if (typeof plugin.env === 'object') {
+		return utils.exec(cmd)
-			// include process.env in opts
-			opts.env = Object.assign({}, process.env, plugin.env);
-		}
-
-		const cmd = `. /opt/certbot/bin/activate && pip install --no-cache-dir ${plugin.dependencies} ${plugin.package_name}${plugin.version}  && deactivate`;
-		return utils.exec(cmd, opts)
 			.then((result) => {
 				logger.complete(`Installed ${pluginKey}`);
 				return result;

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh

@@ -27,15 +27,15 @@ chown -R "$PUID:$PGID" /etc/nginx/conf.d
 CERT_INIT_FLAG="/opt/certbot/.ownership_initialized"
 
 if [ ! -f "$CERT_INIT_FLAG" ]; then
-	# Prevents errors when installing python certbot plugins when non-root
+    # Prevents errors when installing python certbot plugins when non-root
-	chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
+    chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin
 
-	# Handle all site-packages directories efficiently
+    # Handle all site-packages directories efficiently
-	find /opt/certbot/lib -type d -name "site-packages" | while read -r SITE_PACKAGES_DIR; do
+    find /opt/certbot/lib -type d -name "site-packages" | while read -r SITE_PACKAGES_DIR; do
-		chown -R "$PUID:$PGID" "$SITE_PACKAGES_DIR"
+        chown -R "$PUID:$PGID" "$SITE_PACKAGES_DIR"
-	done
+    done
 
-	# Create a flag file to skip this step on subsequent runs
+    # Create a flag file to skip this step on subsequent runs
-	touch "$CERT_INIT_FLAG"
+    touch "$CERT_INIT_FLAG"
-	chown "$PUID:$PGID" "$CERT_INIT_FLAG"
+    chown "$PUID:$PGID" "$CERT_INIT_FLAG"
-fi
+fi

docker/scripts/install-s6

@@ -8,7 +8,7 @@ BLUE='\E[1;34m'
 GREEN='\E[1;32m'
 RESET='\E[0m'
 
-S6_OVERLAY_VERSION=3.2.1.0
+S6_OVERLAY_VERSION=3.2.0.2
 TARGETPLATFORM=${1:-linux/amd64}
 
 # Determine the correct binary file for the architecture given

global/certbot-dns-plugins.json

@@ -56,19 +56,19 @@
 		"full_plugin_name": "dns-bunny"
 	},
 	"cdmon": {
-		"name": "cdmon",
+                "name": "cdmon",
-		"package_name": "certbot-dns-cdmon",
+                "package_name": "certbot-dns-cdmon",
-		"version": "~=0.4.1",
+                "version": "~=0.4.1",
-		"dependencies": "",
+                "dependencies": "",
-		"credentials": "dns_cdmon_api_key=your-cdmon-api-token\ndns_cdmon_domain=your_domain_is_optional",
+                "credentials": "dns_cdmon_api_key=your-cdmon-api-token\ndns_cdmon_domain=your_domain_is_optional",
-		"full_plugin_name": "dns-cdmon"
+                "full_plugin_name": "dns-cdmon"
-	},
+        },
 	"cloudflare": {
 		"name": "Cloudflare",
 		"package_name": "certbot-dns-cloudflare",
 		"version": "=={{certbot-version}}",
-		"dependencies": "acme=={{certbot-version}}",
+		"dependencies": "cloudflare==4.0.* acme=={{certbot-version}}",
-		"credentials": "# Cloudflare API token\ndns_cloudflare_api_token=0123456789abcdef0123456789abcdef01234567",
+		"credentials": "# Cloudflare API credentials used by Certbot\ndns_cloudflare_email = cloudflare@example.com\ndns_cloudflare_api_key = 0123456789abcdef0123456789abcdef01234",
 		"full_plugin_name": "dns-cloudflare"
 	},
 	"cloudns": {
@@ -477,10 +477,7 @@
 		"version": "~=0.2.1",
 		"dependencies": "PyYAML==5.3.1",
 		"credentials": "dns_powerdns_api_url = https://api.mypowerdns.example.org\ndns_powerdns_api_key = AbCbASsd!@34",
-		"full_plugin_name": "dns-powerdns",
+		"full_plugin_name": "dns-powerdns"
-		"env": {
-			"SETUPTOOLS_USE_DISTUTILS": "stdlib"
-		}
 	},
 	"regru": {
 		"name": "reg.ru",