Skip to content

Commit a233bc0

Browse files
jc21jc21
authored
Merge pull request #1766 from NginxProxyManager/develop
v2.9.15
2 parents 081380c + 51ac4bc commit a233bc0

File tree

10 files changed

+49
-29
lines changed

10 files changed

+49
-29
lines changed

‎.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.14
1+
2.9.15

‎Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ pipeline {
6262
stage('Backend') {
6363
steps {
6464
echo 'Checking Syntax ...'
65-
sh 'docker pull node:latest'
65+
sh 'docker pull nginxproxymanager/nginx-full:certbot-node'
6666
// See: https://github.com/yarnpkg/yarn/issues/3254
6767
sh '''docker run --rm \\
6868
-v "$(pwd)/backend:/app" \\
6969
-v "$(pwd)/global:/app/global" \\
7070
-w /app \\
71-
node:latest \\
72-
sh -c "ln -s /usr/bin/python3 /usr/bin/python && yarn install && yarn eslint . && rm -rf node_modules"
71+
nginxproxymanager/nginx-full:certbot-node \\
72+
sh -c "yarn install && yarn eslint . && rm -rf node_modules"
7373
'''
7474

7575
echo 'Docker Build ...'

‎README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p align="center">
22
<img src="https://nginxproxymanager.com/github.png">
33
<br><br>
4-
<img src="https://img.shields.io/badge/version-2.9.14-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.9.15-green.svg?style=for-the-badge">
55
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
66
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
77
</a>
@@ -511,6 +511,12 @@ Special thanks to the following contributors:
511511
<br /><sub><b>Pius Walter</b></sub>
512512
</a>
513513
</td>
514+
<td align="center">
515+
<a href="https://github.com/troykelly">
516+
<img src="https://avatars.githubusercontent.com/u/4564803?v=4" width="80" alt=""/>
517+
<br /><sub><b>Troy Kelly</b></sub>
518+
</a>
519+
</td>
514520
</tr>
515521
</table>
516522
<!-- markdownlint-enable -->

‎docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# This file assumes that the frontend has been built using ./scripts/frontend-build
55

6-
FROM nginxproxymanager/nginx-full:node
6+
FROM nginxproxymanager/nginx-full:certbot-node
77

88
ARG TARGETPLATFORM
99
ARG BUILD_VERSION

‎docker/dev/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginxproxymanager/nginx-full:node
1+
FROM nginxproxymanager/nginx-full:certbot-node
22
LABEL maintainer="Jamie Curnow <[email protected]>"
33

44
ENV S6_LOGGING=0 \

‎docker/rootfs/etc/nginx/conf.d/include/proxy.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ add_header X-Served-By $host;
22
proxy_set_header Host $host;
33
proxy_set_header X-Forwarded-Scheme $scheme;
44
proxy_set_header X-Forwarded-Proto $scheme;
5-
proxy_set_header X-Forwarded-Host $host;
6-
proxy_set_header X-Forwarded-Port $port;
75
proxy_set_header X-Forwarded-For $remote_addr;
86
proxy_set_header X-Real-IP $remote_addr;
97
proxy_pass $forward_scheme://$server:$port$request_uri;

‎docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@
394394
"map-age-cleaner": "^0.1.3",
395395
"map-cache": "^0.2.2",
396396
"map-visit": "^1.0.0",
397-
"markdown-it": "^11.0.0",
397+
"markdown-it": "^12.3.2",
398398
"markdown-it-anchor": "^5.3.0",
399399
"markdown-it-chain": "^1.3.0",
400400
"markdown-it-container": "^3.0.0",
@@ -434,7 +434,7 @@
434434
"neo-async": "^2.6.2",
435435
"nice-try": "^2.0.1",
436436
"no-case": "^3.0.3",
437-
"node-forge": "^0.10.0",
437+
"node-forge": "^1.0.0",
438438
"node-libs-browser": "^2.2.1",
439439
"node-releases": "^1.1.60",
440440
"nopt": "^4.0.3",

‎docs/yarn.lock

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,6 +1686,11 @@ argparse@^1.0.10, argparse@^1.0.7:
16861686
dependencies:
16871687
sprintf-js "~1.0.2"
16881688

1689+
argparse@^2.0.1:
1690+
version "2.0.1"
1691+
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
1692+
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
1693+
16891694
arr-diff@^4.0.0:
16901695
version "4.0.0"
16911696
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -3744,10 +3749,10 @@ entities@^1.1.1, entities@~1.1.1:
37443749
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
37453750
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
37463751

3747-
entities@^2.0.0, entities@^2.0.3, entities@~2.0.0:
3748-
version "2.0.3"
3749-
resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
3750-
integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
3752+
entities@^2.0.0, entities@^2.0.3, entities@~2.1.0:
3753+
version "2.1.0"
3754+
resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
3755+
integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
37513756

37523757
envify@^4.0.0, envify@^4.1.0:
37533758
version "4.1.0"
@@ -4254,9 +4259,9 @@ flush-write-stream@^2.0.0:
42544259
readable-stream "^3.1.1"
42554260

42564261
follow-redirects@^1.0.0, follow-redirects@^1.12.1:
4257-
version "1.12.1"
4258-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6"
4259-
integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==
4262+
version "1.14.7"
4263+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
4264+
integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
42604265

42614266
for-in@^1.0.2:
42624267
version "1.0.2"
@@ -6135,13 +6140,13 @@ markdown-it-table-of-contents@^0.4.0, markdown-it-table-of-contents@^0.4.4:
61356140
resolved "https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz#3dc7ce8b8fc17e5981c77cc398d1782319f37fbc"
61366141
integrity sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw==
61376142

6138-
markdown-it@^11.0.0:
6139-
version "11.0.0"
6140-
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz#dbfc30363e43d756ebc52c38586b91b90046b876"
6141-
integrity sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==
6143+
markdown-it@^12.3.2:
6144+
version "12.3.2"
6145+
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
6146+
integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
61426147
dependencies:
6143-
argparse "^1.0.7"
6144-
entities "~2.0.0"
6148+
argparse "^2.0.1"
6149+
entities "~2.1.0"
61456150
linkify-it "^3.0.1"
61466151
mdurl "^1.0.1"
61476152
uc.micro "^1.0.5"
@@ -6595,10 +6600,10 @@ [email protected]:
65956600
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
65966601
integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
65976602

6598-
node-forge@^0.10.0:
6599-
version "0.10.0"
6600-
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
6601-
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
6603+
node-forge@^1.0.0:
6604+
version "1.0.0"
6605+
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.0.0.tgz#a025e3beeeb90d9cee37dae34d25b968ec3e6f15"
6606+
integrity sha512-ShkiiAlzSsgH1IwGlA0jybk9vQTIOLyJ9nBd0JTuP+nzADJFLY0NoDijM2zvD/JaezooGu3G2p2FNxOAK6459g==
66026607

66036608
node-libs-browser@^2.2.1:
66046609
version "2.2.1"

‎global/certbot-dns-plugins.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,17 @@ dns_cloudxns_secret_key = 1122334455667788`,
102102
full_plugin_name: 'dns-cloudxns',
103103
},
104104
//####################################################//
105+
constellix: {
106+
display_name: 'Constellix',
107+
package_name: 'certbot-dns-constellix',
108+
version_requirement: '~=0.2.1',
109+
dependencies: '',
110+
credentials: `dns_constellix_apikey = 5fb4e76f-ac91-43e5-f982458bc595
111+
dns_constellix_secretkey = 47d99fd0-32e7-4e07-85b46d08e70b
112+
dns_constellix_endpoint = https://api.dns.constellix.com/v1`,
113+
full_plugin_name: 'dns-constellix',
114+
},
115+
//####################################################//
105116
corenetworks: {
106117
display_name: 'Core Networks',
107118
package_name: 'certbot-dns-corenetworks',

‎scripts/frontend-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
44
. "$DIR/.common.sh"
55

6-
DOCKER_IMAGE=jc21/nginx-full:node
6+
DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node
77

88
# Ensure docker exists
99
if hash docker 2>/dev/null; then

0 commit comments

Comments
 (0)