Skip to content

Commit 569d2b0

Browse files
author
Jamie Curnow
committedFeb 21, 2020
Merge branch 'develop' of github.com:jc21/nginx-proxy-manager
·
v2.12.3v2.1.1
2 parents e869c76 + b7e1e4f commit 569d2b0

File tree

11 files changed

+222
-248
lines changed

11 files changed

+222
-248
lines changed
 

‎.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0
1+
2.1.1

‎README.md

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

33
# Nginx Proxy Manager
44

5-
![Version](https://img.shields.io/badge/version-2.1.0-green.svg?style=for-the-badge)
5+
![Version](https://img.shields.io/badge/version-2.1.1-green.svg?style=for-the-badge)
66
![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
77
![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
88

‎backend/internal/ip_ranges.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const fs = require('fs');
33
const logger = require('../logger').ip_ranges;
44
const error = require('../lib/error');
55
const internalNginx = require('./nginx');
6-
const Liquid = require('liquidjs');
6+
const { Liquid } = require('liquidjs');
77

88
const CLOUDFRONT_URL = 'https://ip-ranges.amazonaws.com/ip-ranges.json';
99
const CLOUDFARE_V4_URL = 'https://www.cloudflare.com/ips-v4';
@@ -116,7 +116,7 @@ const internalIpRanges = {
116116
* @returns {Promise}
117117
*/
118118
generateConfig: (ip_ranges) => {
119-
let renderEngine = Liquid({
119+
let renderEngine = new Liquid({
120120
root: __dirname + '/../templates/'
121121
});
122122

‎backend/internal/nginx.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const _ = require('lodash');
22
const fs = require('fs');
3-
const Liquid = require('liquidjs');
43
const logger = require('../logger').nginx;
54
const utils = require('../lib/utils');
65
const error = require('../lib/error');
6+
const { Liquid } = require('liquidjs');
77
const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;
88

99
const internalNginx = {
@@ -181,7 +181,7 @@ const internalNginx = {
181181
logger.info('Generating ' + host_type + ' Config:', host);
182182
}
183183

184-
let renderEngine = Liquid({
184+
let renderEngine = new Liquid({
185185
root: __dirname + '/../templates/'
186186
});
187187

@@ -263,7 +263,7 @@ const internalNginx = {
263263
logger.info('Generating LetsEncrypt Request Config:', certificate);
264264
}
265265

266-
let renderEngine = Liquid({
266+
let renderEngine = new Liquid({
267267
root: __dirname + '/../templates/'
268268
});
269269

‎backend/package.json

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,45 @@
11
{
2-
"name": "nginx-proxy-manager",
3-
"version": "2.1.0",
4-
"description": "A beautiful interface for creating Nginx endpoints",
5-
"main": "js/index.js",
6-
"dependencies": {
7-
"ajv": "^6.5.1",
8-
"batchflow": "^0.4.0",
9-
"bcrypt": "^3.0.0",
10-
"body-parser": "^1.18.3",
11-
"compression": "^1.7.2",
12-
"config": "^2.0.1",
13-
"diskdb": "^0.1.17",
14-
"express": "^4.16.3",
15-
"express-fileupload": "^0.4.0",
16-
"gravatar": "^1.6.0",
17-
"html-entities": "^1.2.1",
18-
"json-schema-ref-parser": "^5.0.3",
19-
"jsonwebtoken": "^8.3.0",
20-
"knex": "^0.19.5",
21-
"liquidjs": "^5.1.1",
22-
"lodash": "^4.17.10",
23-
"moment": "^2.22.2",
24-
"mysql": "^2.15.0",
25-
"node-rsa": "^1.0.0",
26-
"nodemon": "^2.0.2",
27-
"objection": "^1.1.10",
28-
"path": "^0.12.7",
29-
"restler": "^3.4.0",
30-
"signale": "^1.2.1",
31-
"temp-write": "^3.4.0",
32-
"unix-timestamp": "^0.2.0"
33-
},
34-
"scripts": {
35-
"build": "webpack --mode production"
36-
},
37-
"signale": {
38-
"displayDate": true,
39-
"displayTimestamp": true
40-
},
41-
"author": "Jamie Curnow <jc@jc21.com>",
42-
"license": "MIT",
43-
"devDependencies": {
44-
"eslint": "^6.8.0",
45-
"eslint-plugin-align-assignments": "^1.1.2",
46-
"prettier": "^1.19.1"
47-
}
2+
"name": "nginx-proxy-manager",
3+
"version": "2.1.1",
4+
"description": "A beautiful interface for creating Nginx endpoints",
5+
"main": "js/index.js",
6+
"dependencies": {
7+
"ajv": "^6.11.0",
8+
"batchflow": "^0.4.0",
9+
"bcrypt": "^3.0.8",
10+
"body-parser": "^1.19.0",
11+
"compression": "^1.7.4",
12+
"config": "^3.2.5",
13+
"diskdb": "^0.1.17",
14+
"express": "^4.17.1",
15+
"express-fileupload": "^1.1.6",
16+
"gravatar": "^1.8.0",
17+
"html-entities": "^1.2.1",
18+
"json-schema-ref-parser": "^7.1.3",
19+
"jsonwebtoken": "^8.5.1",
20+
"knex": "^0.20.10",
21+
"liquidjs": "^9.7.1",
22+
"lodash": "^4.17.15",
23+
"moment": "^2.24.0",
24+
"mysql": "^2.18.1",
25+
"node-rsa": "^1.0.7",
26+
"nodemon": "^2.0.2",
27+
"objection": "^2.1.3",
28+
"path": "^0.12.7",
29+
"restler": "^3.4.0",
30+
"signale": "^1.4.0",
31+
"temp-write": "^4.0.0",
32+
"unix-timestamp": "^0.2.0"
33+
},
34+
"signale": {
35+
"displayDate": true,
36+
"displayTimestamp": true
37+
},
38+
"author": "Jamie Curnow <jc@jc21.com>",
39+
"license": "MIT",
40+
"devDependencies": {
41+
"eslint": "^6.8.0",
42+
"eslint-plugin-align-assignments": "^1.1.2",
43+
"prettier": "^1.19.1"
44+
}
4845
}

‎backend/yarn.lock

Lines changed: 130 additions & 189 deletions
Large diffs are not rendered by default.

‎docker/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:node
77

8+
ARG TARGETPLATFORM
9+
ARG BUILDPLATFORM
810
ARG BUILD_VERSION
911
ARG BUILD_COMMIT
1012
ARG BUILD_DATE
@@ -22,8 +24,8 @@ RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
2224
ENV NPM_BUILD_VERSION="${BUILD_VERSION}" NPM_BUILD_COMMIT="${BUILD_COMMIT}" NPM_BUILD_DATE="${BUILD_DATE}"
2325

2426
# s6 overlay
25-
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz" \
26-
&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
27+
COPY scripts/install-s6 /tmp/install-s6
28+
RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -f /tmp/install-s6
2729

2830
EXPOSE 80
2931
EXPOSE 81
@@ -43,4 +45,4 @@ RUN rm -rf /etc/services.d/frontend RUN rm -f /etc/nginx/conf.d/dev.conf
4345
VOLUME [ "/data", "/etc/letsencrypt" ]
4446
CMD [ "/init" ]
4547

46-
HEALTHCHECK --interval=5s --timeout=3s CMD /bin/check-health
48+
HEALTHCHECK --interval=5s --timeout=3s CMD /bin/check-health

‎frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nginx-proxy-manager",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "A beautiful interface for creating Nginx endpoints",
55
"main": "js/index.js",
66
"devDependencies": {

‎scripts/install-s6

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash -e
2+
3+
# Note: This script is designed to be run inside a Docker Build for a container
4+
5+
CYAN='\E[1;36m'
6+
YELLOW='\E[1;33m'
7+
BLUE='\E[1;34m'
8+
GREEN='\E[1;32m'
9+
RESET='\E[0m'
10+
11+
S6_OVERLAY_VERSION=1.22.1.0
12+
TARGETPLATFORM=$1
13+
14+
# Determine the correct binary file for the architecture given
15+
case $TARGETPLATFORM in
16+
linux/arm64)
17+
S6_ARCH=aarch64
18+
;;
19+
20+
linux/arm/v7)
21+
S6_ARCH=armhf
22+
;;
23+
24+
*)
25+
S6_ARCH=amd64
26+
;;
27+
esac
28+
29+
echo -e "${BLUE}❯ ${CYAN}Installing S6-overlay v${S6_OVERLAY_VERSION} for ${YELLOW}${TARGETPLATFORM} (${S6_ARCH})${RESET}"
30+
31+
curl -L -o "/tmp/s6-overlay-${S6_ARCH}.tar.gz" "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.gz" \
32+
&& tar -xzf "/tmp/s6-overlay-${S6_ARCH}.tar.gz" -C /
33+
34+
echo -e "${BLUE}❯ ${GREEN}S6-overlay install Complete${RESET}"

‎test/cypress/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM cypress/included:3.8.3
1+
FROM cypress/included:4.0.2
22

33
COPY --chown=1000 ./test /test
44

‎test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@jc21/cypress-swagger-validation": "^0.0.5",
88
"@jc21/restler": "^3.4.0",
99
"chalk": "^3.0.0",
10-
"cypress": "^3.8.3",
10+
"cypress": "^4.0.2",
1111
"cypress-plugin-retries": "^1.5.2",
1212
"eslint": "^6.7.2",
1313
"eslint-plugin-align-assignments": "^1.1.2",

0 commit comments

Comments
 (0)
Please sign in to comment.