From 80d49cd2a2ddeaefbea2d92e53ef6888af858ae8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 05:10:24 +0000 Subject: [PATCH] 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 --- Dockerfile | 15 ++++++++------- README.md | 4 ++-- backend/package.json | 4 ++-- compose.yaml | 4 ++-- frontend/package.json | 4 ++-- renovate.json | 26 +++++++++++++------------- rootfs/bin/start.sh | 4 ++-- rootfs/usr/local/nginx/conf/nginx.conf | 8 ++++---- 8 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index ede04157..dc0755f5 100644 --- a/Dockerfile +++ b/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 \ diff --git a/README.md b/README.md index 6330979b..d80b3d44 100644 --- a/README.md +++ b/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 diff --git a/backend/package.json b/backend/package.json index 421439a0..7248173e 100644 --- a/backend/package.json +++ b/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 ", "license": "MIT", "devDependencies": { - "eslint": "8.36.0", + "eslint": "8.37.0", "eslint-plugin-align-assignments": "1.1.2" } } diff --git a/compose.yaml b/compose.yaml index 1f5c9147..6544b7cd 100644 --- a/compose.yaml +++ b/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 diff --git a/frontend/package.json b/frontend/package.json index 3937a5bc..55273369 100644 --- a/frontend/package.json +++ b/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", diff --git a/renovate.json b/renovate.json index 0897d9b3..6448fa76 100644 --- a/renovate.json +++ b/renovate.json @@ -1,13 +1,13 @@ -{ - "extends": [ - "config:base" - ], - "baseBranches": [], - "includeForks": true, - "automerge": false, - "branchPrefix": "renovate-deps-update-", - "rangeStrategy": "pin", - "digest": { - "enabled": false - } -} +{ + "extends": [ + "config:base" + ], + "baseBranches": [], + "includeForks": true, + "automerge": false, + "branchPrefix": "renovate-deps-update-", + "rangeStrategy": "pin", + "digest": { + "enabled": false + } +} diff --git a/rootfs/bin/start.sh b/rootfs/bin/start.sh index 72baa834..ca5a0e05 100755 --- a/rootfs/bin/start.sh +++ b/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 diff --git a/rootfs/usr/local/nginx/conf/nginx.conf b/rootfs/usr/local/nginx/conf/nginx.conf index 24177085..f90c4d91 100644 --- a/rootfs/usr/local/nginx/conf/nginx.conf +++ b/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;