merge upstream/dep updates

Update dependency jquery to v3.7.0
Update zoeyvid/nginx-quic Docker tag to v120
Update zoeyvid/nginx-quic Docker tag to v121
Update zoeyvid/nginx-quic Docker tag to v122
Signed-off-by: Zoey <zoey@z0ey.de>

Dockerfile

@@ -28,13 +28,13 @@ RUN apk add --no-cache ca-certificates nodejs-current yarn && \
     node-prune && \
     yarn cache clean --all
 
-FROM python:3.11.3-alpine3.17 as certbot
+FROM python:3.11.3-alpine3.18 as certbot
 RUN apk add --no-cache build-base libffi-dev && \
     python3 -m venv /usr/local/certbot && \
     . /usr/local/certbot/bin/activate && \
     pip install --no-cache-dir certbot
 
-FROM zoeyvid/nginx-quic:114
+FROM zoeyvid/nginx-quic:122
 RUN apk add --no-cache ca-certificates tzdata \
     nodejs-current \
     openssl apache2-utils \

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-usergroup.sh

@@ -1,40 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-set -e
-
-log_info "Configuring $NPMUSER user ..."
-
-if id -u "$NPMUSER" 2>/dev/null; then
-	# user already exists
-	usermod -u "$PUID" "$NPMUSER"
-else
-	# Add user
-	useradd -o -u "$PUID" -U -d "$NPMHOME" -s /bin/false "$NPMUSER"
-fi
-
-log_info "Configuring $NPMGROUP group ..."
-if [ "$(get_group_id "$NPMGROUP")" = '' ]; then
-	# Add group. This will not set the id properly if it's already taken
-	groupadd -f -g "$PGID" "$NPMGROUP"
-else
-	groupmod -o -g "$PGID" "$NPMGROUP"
-fi
-
-# Set the group ID and check it
-groupmod -o -g "$PGID" "$NPMGROUP"
-if [ "$(get_group_id "$NPMGROUP")" != "$PGID" ]; then
-	echo "ERROR: Unable to set group id properly"
-	exit 1
-fi
-
-# Set the group against the user and check it
-usermod -G "$PGID" "$NPMGROUP"
-if [ "$(id -g "$NPMUSER")" != "$PGID" ] ; then
-	echo "ERROR: Unable to set group against the user properly"
-	exit 1
-fi
-
-# Home for user
-mkdir -p "$NPMHOME"
-chown -R "$PUID:$PGID" "$NPMHOME"

frontend/package.json

@@ -18,7 +18,7 @@
     "file-loader": "6.2.0",
     "html-webpack-plugin": "4.5.2",
     "imports-loader": "0.8.0",
-    "jquery": "3.6.4",
+    "jquery": "3.7.0",
     "jquery-mask-plugin": "1.14.16",
     "jquery-serializejson": "3.2.1",
     "marionette.approuter": "1.0.2",

rootfs/bin/launch.sh

@@ -9,7 +9,9 @@ echo "
 |_| \_|_|   |_|  |_|
 -------------------------------------
 User:     $(whoami)
+PUID:     $PUID
 User ID:  $(id -u)
+PGID:     $PGID
 Group ID: $(id -g)
 -------------------------------------
 "

rootfs/bin/start.sh

@@ -14,6 +14,11 @@ if [ ! -d /data ]; then
     sleep inf
 fi
 
+if [ -n "$PGID" ] && [ -z "$PUID" ]; then
+    echo "You've set PGID but not PUID. Running with PGID 0."
+    export PGID="0"
+fi
+
 export PUID="${PUID:-0}"
 if ! echo "$PUID" | grep -q "^[0-9]\+$"; then
     echo "You've set PUID but not to an allowed value."
@@ -175,6 +180,7 @@ fi
 mkdir -p /tmp/acme-challenge \
          /tmp/certbot-work \
          /tmp/certbot-log
+         /tmp/npmhome
 
 mkdir -vp /data/tls/certbot/renewal \
           /data/tls/custom \
@@ -531,33 +537,42 @@ sed -i "s|ssl_certificate_key .*|ssl_certificate_key $NPM_KEY;|g" /data/nginx/de
 if [ -n "$NPM_CHAIN" ]; then sed -i "s|ssl_trusted_certificate .*|ssl_trusted_certificate $NPM_CHAIN;|g" /data/nginx/default.conf; fi
 
 
-chmod -R o-rwx /data/tls \
+chmod -R 770 /data/tls \
              /data/etc/npm \
              /data/etc/access
 
 if [ "$PUID" != "0" ]; then
-    if id -u npmuser > /dev/null 2>&1; then
-        usermod -u "$PUID" npmuser
+    if id -u npm > /dev/null 2>&1; then
+        usermod -u "$PUID" npm
     else
-        useradd -o -u "$PUID" -U -d /tmp/npmuserhome -s /bin/false npmuser
+        useradd -o -u "$PUID" -U -d /tmp/npmhome -s /bin/false npm
+    fi
+    if [ -z "$(getent group npm | cut -d: -f3)" ]; then
+        groupadd -f -g "$PGID" npm
+    else
+        groupmod -o -g "$PGID" npm
+    fi
+    groupmod -o -g "$PGID" npm
+    if [ "$(getent group npm | cut -d: -f3)" != "$PGID" ]; then
+        echo "ERROR: Unable to set group id properly"
+        sleep inf
+    fi
+    usermod -G "$PGID" npm
+    if [ "$(id -g npm)" != "$PGID" ] ; then
+        echo "ERROR: Unable to set group against the user properly"
+        sleep inf
     fi
-    usermod -G "$PGID" npmuser
-    groupmod -o -g "$PGID" npmuser
     chown -R "$PUID:$PGID" /usr/local/certbot \
                            /usr/local/nginx \
                            /data \
-                           /tmp/acme-challenge \
-                           /tmp/certbot-work \
-                           /tmp/certbot-log
+                           /tmp
     sed -i "s|user root;|#user root;|g"  /usr/local/nginx/conf/nginx.conf
-    sudo -Eu npmuser launch.sh
+    sudo -Eu npm launch.sh
 else
     chown -R 0:0 /usr/local/certbot \
                  /usr/local/nginx \
                  /data \
-                 /tmp/acme-challenge \
-                 /tmp/certbot-work \
-                 /tmp/certbot-log
+                 /tmp
     sed -i "s|#user root;|user root;|g"  /usr/local/nginx/conf/nginx.conf
     launch.sh
 fi