Upload 32 files

Dockerfile

@@ -69,8 +69,13 @@ RUN set -eu && \
     mkdir -p /etc/nginx/sites-enabled && \
     chmod 0777 /etc/nginx/sites-enabled || true && \
     # Ensure nginx runtime dirs are writable for unprivileged users
-    mkdir -p /var/lib/nginx/body /var/log/nginx /var/cache/nginx /var/run && \
-    chmod -R 0777 /var/lib/nginx /var/log/nginx /var/cache/nginx /var/run || true
+        mkdir -p /var/lib/nginx/body /var/log/nginx /var/cache/nginx /var/run && \
+        # Prefer setting ownership to the unprivileged UID 1000 used by Spaces;
+        # if that fails (image built elsewhere), fall back to world-writable modes.
+        chown -R 1000:1000 /var/lib/nginx /var/log/nginx /var/cache/nginx /var/run 2>/dev/null || \
+            chmod -R 0777 /var/lib/nginx /var/log/nginx /var/cache/nginx /var/run || true && \
+        mkdir -p /run/shm && touch /run/shm/websocketd.log && chown 1000:1000 /run/shm/websocketd.log 2>/dev/null || \
+            chmod 0666 /run/shm/websocketd.log || true
 
 COPY --chmod=755 ./src /run/
 COPY --chmod=755 ./web /var/www/
@@ -82,15 +87,6 @@ ADD --chmod=755 "https://github.com/qemus/fiano/releases/download/v${VERSION_UTK
 
 VOLUME /storage
 EXPOSE 22 5900 8006
-WORKDIR /app
-
-# Copy app code
-COPY . .
-
-# ybyjngamhtcuaupc gsmt
-
-# Make the entire /app directory fully writeable for all users
-RUN chmod -R 777 /app
 
 ENV BOOT="alpine"
 ENV CPU_CORES="2"

src/server.sh

@@ -48,9 +48,10 @@ if [[ "${WEB:-}" != [Nn]* ]]; then
   # Start webserver
   nginx -e stderr
 
-  # Start websocket server
-  websocketd --address 127.0.0.1 --port="$WSD_PORT" /run/socket.sh >/var/log/websocketd.log &
-  echo "$!" > /var/run/websocketd.pid
+  # Start websocket server — write logs to /run/shm (writable in non-root mode)
+  mkdir -p /run/shm
+  websocketd --address 127.0.0.1 --port="$WSD_PORT" /run/socket.sh >/run/shm/websocketd.log 2>&1 &
+  echo "$!" > /run/websocketd.pid
 
 fi
 

src/utils.sh

@@ -77,7 +77,9 @@ setOwner() {
   uid=$(stat -c '%u' "$dir")
   gid=$(stat -c '%g' "$dir")
 
-  ! chown "$uid:$gid" "$file" && return 1
+  if ! chown "$uid:$gid" "$file" 2>/dev/null; then
+    warn "Unable to chown $file to $uid:$gid (continuing without changing owner)"
+  fi
 
   return 0
 }
@@ -87,13 +89,18 @@ makeDir() {
   local dir uid gid
 
   [ -d "$path" ] && return 0
-  ! mkdir -p "$path" && return 1
+  if ! mkdir -p "$path" 2>/dev/null; then
+    warn "Cannot create directory $path"
+    return 1
+  fi
 
   dir=$(dirname -- "$path")
   uid=$(stat -c '%u' "$dir")
   gid=$(stat -c '%g' "$dir")
 
-  ! chown "$uid:$gid" "$path" && return 1
+  if ! chown "$uid:$gid" "$path" 2>/dev/null; then
+    warn "Unable to chown $path to $uid:$gid (continuing)"
+  fi
 
   return 0
 }