From 61164eee6c381ac59c7d79a190c1cbfd841255fc Mon Sep 17 00:00:00 2001 From: Zoey Date: Tue, 12 Mar 2024 17:40:42 +0100 Subject: [PATCH] use su-exec --- Dockerfile | 2 +- rootfs/usr/local/bin/start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b1fc01a..e13da83c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,7 +71,7 @@ RUN apk upgrade --no-cache -a && \ nodejs-current \ openssl apache2-utils \ lua5.1-lzlib lua5.1-socket \ - coreutils grep findutils jq shadow sudo \ + coreutils grep findutils jq shadow su-exec \ luarocks5.1 lua5.1-dev lua5.1-sec build-base git yarn && \ curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | sh -s -- --install-online --home /usr/local/acme.sh --nocron && \ git clone https://github.com/coreruleset/coreruleset --branch "$CRS_VER" /tmp/coreruleset && \ diff --git a/rootfs/usr/local/bin/start.sh b/rootfs/usr/local/bin/start.sh index 2fa0345c..40fe625f 100755 --- a/rootfs/usr/local/bin/start.sh +++ b/rootfs/usr/local/bin/start.sh @@ -891,7 +891,7 @@ if [ "$PUID" != "0" ]; then sed -i "s|group =.*|;group = root|" /data/php/83/php-fpm.d/www.conf fi sed -i "s|user root;|#user root;|g" /usr/local/nginx/conf/nginx.conf - exec sudo -Eu npm launch.sh + exec su-exec "$PUID:$PGID" launch.sh else find /usr/local \ /data \