dep updates/fix quic

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>

Dockerfile

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

README.md

@@ -128,8 +128,8 @@ services:
         network_mode: host
         volumes:
         - "/opt/npm:/data"
-        - "/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
+#        - "/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
         environment:
         - "TZ=Europe/Berlin"
 #        - "NGINX_LOG_NOT_FOUND=true" # Allow logging of 404 errors

backend/package.json

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

compose.yaml

@@ -7,8 +7,8 @@ services:
         network_mode: host
         volumes:
         - "/opt/npm:/data"
-        - "/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
+#        - "/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
         environment:
         - "TZ=Europe/Berlin"
 #        - "NGINX_LOG_NOT_FOUND=true" # Allow logging of 404 errors

frontend/package.json

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

rootfs/bin/start.sh

@@ -322,9 +322,9 @@ else
     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
-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
 
 sed -i "s|#ssl_certificate .*|ssl_certificate $NPM_CERT;|g" /usr/local/nginx/conf/conf.d/include/default.conf || sleep inf

rootfs/usr/local/nginx/conf/nginx.conf

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