ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-04 16:33:32 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

dep updates/fix quic

Browse Source 
Update zoeyvid/nginx-quic Docker tag to v103
Update zoeyvid/nginx-quic Docker tag to v101
Update zoeyvid/nginx-quic Docker tag to v99
Update zoeyvid/nginx-quic Docker tag to v97
Update zoeyvid/nginx-quic Docker tag to v96
Update dependency @babel/core to v7.21.4
Update dependency nodemon to v2.0.22
Update dependency eslint to v8.37.0
Update alpine Docker tag to v3.17.3
Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
renovate[bot]
2023-03-25 05:10:24 +00:00
committed by Zoey
parent 3755b097bb
commit 80d49cd2a2
8 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM --platform="$BUILDPLATFORM" alpine:3.17.2 as frontend FROM --platform="$BUILDPLATFORM" alpine:3.17.3 as frontend
COPY global /build/global COPY global /build/global
COPY frontend /build/frontend COPY frontend /build/frontend
ARG NODE_ENV=production \ ARG NODE_ENV=production \
@@ -7,11 +7,12 @@ RUN apk add --no-cache ca-certificates nodejs yarn git python3 build-base && \
cd /build/frontend && \ cd /build/frontend && \
sed -i "s|\"0.0.0\"|\""$(cat ../global/.version)"\"|g" package.json && \ sed -i "s|\"0.0.0\"|\""$(cat ../global/.version)"\"|g" package.json && \
yarn --no-lockfile install && \ yarn --no-lockfile install && \
yarn --no-lockfile build yarn --no-lockfile build && \
yarn cache clean --all
COPY security.txt /build/frontend/dist/.well-known/security.txt COPY security.txt /build/frontend/dist/.well-known/security.txt
FROM --platform="$BUILDPLATFORM" alpine:3.17.2 as backend FROM --platform="$BUILDPLATFORM" alpine:3.17.3 as backend
COPY backend /build/backend COPY backend /build/backend
COPY global /build/backend/global COPY global /build/backend/global
ARG NODE_ENV=production \ ARG NODE_ENV=production \
@@ -25,12 +26,12 @@ RUN apk add --no-cache ca-certificates nodejs-current yarn && \
elif [ "$TARGETARCH" = "arm64" ]; then \ elif [ "$TARGETARCH" = "arm64" ]; then \
npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile; \ npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile; \
fi && \ fi && \
node-prune node-prune && \
yarn cache clean --all
FROM zoeyvid/nginx-quic:95 FROM zoeyvid/nginx-quic:103
RUN apk add --no-cache \ RUN apk add --no-cache ca-certificates tzdata \
ca-certificates tzdata \
nodejs-current \ nodejs-current \
openssl apache2-utils \ openssl apache2-utils \
coreutils grep jq curl \ coreutils grep jq curl \

4
README.md
View File

@@ -128,8 +128,8 @@ services:
network_mode: host network_mode: host
volumes: volumes:
- "/opt/npm:/data" - "/opt/npm:/data"
- "/opt/npm-letsencrypt:/etc/letsencrypt" # Only needed for first time migration from original nginx-proxy-manager to this fork # - "/opt/npm-letsencrypt:/etc/letsencrypt" # Only needed for first time migration from original nginx-proxy-manager to this fork
- "/var/www:/var/www" # optional, if you want to use it as webserver for html/php # - "/var/www:/var/www" # optional, if you want to use it as webserver for html/php
environment: environment:
- "TZ=Europe/Berlin" - "TZ=Europe/Berlin"
# - "NGINX_LOG_NOT_FOUND=true" # Allow logging of 404 errors # - "NGINX_LOG_NOT_FOUND=true" # Allow logging of 404 errors

4
backend/package.json
View File

@@ -22,7 +22,7 @@
"moment": "2.29.4", "moment": "2.29.4",
"mysql": "2.18.1", "mysql": "2.18.1",
"node-rsa": "1.1.1", "node-rsa": "1.1.1",
"nodemon": "2.0.21", "nodemon": "2.0.22",
"objection": "3.0.1", "objection": "3.0.1",
"path": "0.12.7", "path": "0.12.7",
"signale": "1.4.0", "signale": "1.4.0",
@@ -32,7 +32,7 @@
"author": "Jamie Curnow <jc@jc21.com>", "author": "Jamie Curnow <jc@jc21.com>",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"eslint": "8.36.0", "eslint": "8.37.0",
"eslint-plugin-align-assignments": "1.1.2" "eslint-plugin-align-assignments": "1.1.2"
} }
} }

4
compose.yaml
View File

@@ -7,8 +7,8 @@ services:
network_mode: host network_mode: host
volumes: volumes:
- "/opt/npm:/data" - "/opt/npm:/data"
- "/opt/npm-letsencrypt:/etc/letsencrypt" # Only needed for first time migration from original nginx-proxy-manager to this fork # - "/opt/npm-letsencrypt:/etc/letsencrypt" # Only needed for first time migration from original nginx-proxy-manager to this fork
- "/var/www:/var/www" # optional, if you want to use it as webserver for html/php # - "/var/www:/var/www" # optional, if you want to use it as webserver for html/php
environment: environment:
- "TZ=Europe/Berlin" - "TZ=Europe/Berlin"
# - "NGINX_LOG_NOT_FOUND=true" # Allow logging of 404 errors # - "NGINX_LOG_NOT_FOUND=true" # Allow logging of 404 errors

4
frontend/package.json
View File

@@ -4,7 +4,7 @@
"description": "A beautiful interface for creating Nginx endpoints", "description": "A beautiful interface for creating Nginx endpoints",
"main": "js/index.js", "main": "js/index.js",
"dependencies": { "dependencies": {
"@babel/core": "7.21.3", "@babel/core": "7.21.4",
"babel-core": "6.26.3", "babel-core": "6.26.3",
"babel-loader": "8.3.0", "babel-loader": "8.3.0",
"babel-preset-env": "1.7.0", "babel-preset-env": "1.7.0",
@@ -28,7 +28,7 @@
"mini-css-extract-plugin": "1.6.2", "mini-css-extract-plugin": "1.6.2",
"moment": "2.29.4", "moment": "2.29.4",
"node-sass": "7.0.3", "node-sass": "7.0.3",
"nodemon": "2.0.21", "nodemon": "2.0.22",
"numeral": "2.0.6", "numeral": "2.0.6",
"sass-loader": "10.4.1", "sass-loader": "10.4.1",
"style-loader": "3.3.2", "style-loader": "3.3.2",

26
renovate.json
View File

@@ -1,13 +1,13 @@
{ {
"extends": [ "extends": [
"config:base" "config:base"
], ],
"baseBranches": [], "baseBranches": [],
"includeForks": true, "includeForks": true,
"automerge": false, "automerge": false,
"branchPrefix": "renovate-deps-update-", "branchPrefix": "renovate-deps-update-",
"rangeStrategy": "pin", "rangeStrategy": "pin",
"digest": { "digest": {
"enabled": false "enabled": false
} }
} }

4
rootfs/bin/start.sh
View File

@@ -322,9 +322,9 @@ else
fi fi
fi fi
ns="$(< /etc/resolv.conf grep -P "^nameserver ((?:[0-9.]+)|(?:\[[0-9a-fA-F:]+\]))$" | sed "s|nameserver ||g" | tr "\n" " " | sed "s/\(.*\) /\1/" | head -1)" || sleep inf ns="$(tr "[:upper:]" "[:lower:]" < /etc/resolv.conf | grep -P "^nameserver ((?:[0-9.]+)|(?:[0-9a-f:]+))$" | awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' | sed "s| *$||")"
export ns export ns
sed -i "s|resolver localhost;|resolver $ns;|g" /usr/local/nginx/conf/nginx.conf || sleep inf sed -i "s|resolver.*|resolver $ns;|g" /usr/local/nginx/conf/nginx.conf || sleep inf
echo "using this nameservers: \"$ns\"" || sleep inf echo "using this nameservers: \"$ns\"" || sleep inf
sed -i "s|#ssl_certificate .*|ssl_certificate $NPM_CERT;|g" /usr/local/nginx/conf/conf.d/include/default.conf || sleep inf sed -i "s|#ssl_certificate .*|ssl_certificate $NPM_CERT;|g" /usr/local/nginx/conf/conf.d/include/default.conf || sleep inf

8
rootfs/usr/local/nginx/conf/nginx.conf
View File

@@ -27,7 +27,7 @@ http {
aio threads; aio threads;
sendfile on; sendfile on;
quic_gso on; quic_gso on;
quic_retry on; #quic_retry on;
tcp_nopush on; tcp_nopush on;
tcp_nodelay on; tcp_nodelay on;
http3_push_preload on; http3_push_preload on;
@@ -53,8 +53,8 @@ http {
proxy_headers_hash_max_size 1024; proxy_headers_hash_max_size 1024;
proxy_headers_hash_bucket_size 128; proxy_headers_hash_bucket_size 128;
limit_req_zone $binary_remote_addr zone=one:10m rate=200r/s; limit_req_zone $binary_remote_addr zone=one:10m rate=180r/s;
limit_req zone=one burst=2000; limit_req zone=one burst=1800;
# Default upstream scheme # Default upstream scheme
map $host $forward_scheme { map $host $forward_scheme {
@@ -120,7 +120,7 @@ http {
stream { stream {
quic_gso on; quic_gso on;
quic_retry on; #quic_retry on;
# Files generated by NPM # Files generated by NPM
include /data/nginx/stream/*.conf; include /data/nginx/stream/*.conf;