Skip to content

Commit e7f6d41

Browse files
authored
Workaround NPM cloudflare bug (#664)
1 parent 16e01ae commit e7f6d41

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

proxy-manager/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ ENV NODE_OPTIONS="--openssl-legacy-provider"
88
# Set shell
99
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1010

11-
# Copy Python requirements file & patches
12-
COPY requirements.txt /tmp/
11+
# Copy patches
1312
COPY patches/*.patch /usr/src/
1413

1514
# Setup base
@@ -38,8 +37,6 @@ RUN \
3837
python3=3.12.11-r0 \
3938
yarn=1.22.22-r1 \
4039
\
41-
&& pip3 install -r /tmp/requirements.txt \
42-
\
4340
&& yarn global add modclean \
4441
\
4542
&& curl -J -L -o /tmp/nginxproxymanager.tar.gz \
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Changes cloudflare package version from 4.0.* to 2.19.* (without pinning it)
2+
to resolve dependency conflict with certbot-dns-cloudflare in NPM 2.12.4.
3+
4+
Fixes: https://github.com/hassio-addons/addon-nginx-proxy-manager/issues/658
5+
---
6+
global/certbot-dns-plugins.json | 2 +-
7+
1 file changed, 1 insertion(+), 1 deletion(-)
8+
9+
diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json
10+
index 1234567..abcdefg 100644
11+
--- a/global/certbot-dns-plugins.json
12+
+++ b/global/certbot-dns-plugins.json
13+
@@ -67,7 +67,7 @@
14+
"name": "Cloudflare",
15+
"package_name": "certbot-dns-cloudflare",
16+
"version": "=={{certbot-version}}",
17+
- "dependencies": "cloudflare==4.0.* acme=={{certbot-version}}",
18+
+ "dependencies": "cloudflare acme=={{certbot-version}}",
19+
"credentials": "# Cloudflare API credentials used by Certbot\ndns_cloudflare_email = [email protected]\ndns_cloudflare_api_key = 0123456789abcdef0123456789abcdef01234",
20+
"full_plugin_name": "dns-cloudflare"
21+
},
22+
--
23+
2.42.0

proxy-manager/requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)