more emulatorjs fixes

Author: Crow-Control

porting/emulatorjs/Dockerfile

@@ -110,6 +110,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     file \
     flac \
+    libcap2-bin \
     nginx \
     nodejs \
     p7zip-full \
@@ -118,6 +119,8 @@ RUN \
   apt-get install -y --no-install-recommends \
     mame-tools && \
   mkdir -p /data && \
+  echo "**** allow non-root nginx to bind low ports ****" && \
+  setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* && \

porting/emulatorjs/root/etc/nginx/nginx.conf

@@ -1,13 +1,19 @@
-user apps;
 worker_processes 4;
-pid /run/nginx.pid;
+pid /tmp/nginx/nginx.pid;
 include /etc/nginx/modules/*.conf;
 
 events {
 	worker_connections 768;
 }
 
 http {
+	client_body_temp_path /tmp/nginx/client_body;
+	proxy_temp_path /tmp/nginx/proxy;
+	fastcgi_temp_path /tmp/nginx/fastcgi;
+	uwsgi_temp_path /tmp/nginx/uwsgi;
+	scgi_temp_path /tmp/nginx/scgi;
+	access_log /dev/stdout;
+	error_log /dev/stderr;
 	disable_symlinks off;
 	sendfile on;
 	tcp_nopush on;

porting/emulatorjs/start.sh

@@ -1,74 +1,80 @@
 #!/usr/bin/env bash
+set -u
 
-
-# check if ipfs is disabled
+# ---- ipfs (optional) -------------------------------------------------------
 if [[ -z ${DISABLE_IPFS+x} ]] && command -v ipfs >/dev/null 2>&1; then
-
-    # ipfs migrate check on startup
     if [[ -d "/data/.ipfs" ]]; then
         echo "[ipfs-upgrade] Checking if fs-repo needs to be upgraded (this may take some time)"
-        HOME=/data  /usr/bin/fs-repo-migrations -y -to 15
+        HOME=/data /usr/bin/fs-repo-migrations -y -to 15 || true
     fi
-
-    # ipfs config
     if [[ ! -d "/data/.ipfs" ]]; then
-        HOME=/data ipfs init --profile lowpower
+        HOME=/data ipfs init --profile lowpower || true
     fi
 fi
 
-# link user data to frontend
-if [[ -w '/emulatorjs/frontend' ]] && [[ ! -L '/emulatorjs/frontend/user' ]]; then
+# ---- frontend user data link ----------------------------------------------
+if [[ -w /emulatorjs/frontend ]] && [[ ! -L /emulatorjs/frontend/user ]]; then
     ln -s /data /emulatorjs/frontend/user
 fi
 
-# Default profile directory
-if [[ ! -d '/config/profile/default' ]]; then
+# ---- /config seeding -------------------------------------------------------
+if [[ ! -d /config/profile/default ]]; then
     mkdir -p /config/profile/default
-    echo "input_menu_toggle_gamepad_combo = 3
-system_directory = /home/web_user/retroarch/system/" >/config/profile/default/retroarch.cfg
-
+    cat >/config/profile/default/retroarch.cfg <<EOF
+input_menu_toggle_gamepad_combo = 3
+system_directory = /home/web_user/retroarch/system/
+EOF
 fi
-if [[ ! -f '/config/profile/profile.json' ]]; then
+if [[ ! -f /config/profile/profile.json ]]; then
     echo '{}' >/config/profile/profile.json
-
 fi
 
-# nginx mime types
-if [[ -w /etc/nginx ]]; then
+# ---- nginx writable dirs (read-only-rootfs friendly) -----------------------
+mkdir -p /tmp/nginx/client_body /tmp/nginx/proxy /tmp/nginx/fastcgi \
+         /tmp/nginx/uwsgi /tmp/nginx/scgi
+if [[ -w /etc/nginx ]] && [[ -f /defaults/mime.types ]]; then
     cp /defaults/mime.types /etc/nginx/mime.types
 fi
 
-# allow users to mount in ro rom dirs
-DIRS='3do atari2600 atari5200 atari7800 colecovision doom gba lynx n64 nes odyssey2 psx segaCD segaMD segaSaturn snes vb ws arcade atari5200 gb gbc jaguar msx nds ngp pce sega32x segaGG segaMS segaSG vectrex'
+# ---- bind-mount roms into /data -------------------------------------------
+DIRS='3do atari2600 atari5200 atari7800 colecovision doom gba lynx n64 nes odyssey2 psx segaCD segaMD segaSaturn snes vb ws arcade gb gbc jaguar msx nds ngp pce sega32x segaGG segaMS segaSG vectrex'
 for DIR in ${DIRS}; do
     if [[ -d "/roms/${DIR}" ]] && [[ ! -L "/data/${DIR}/roms" ]]; then
         mkdir -p "/data/${DIR}"
         ln -s "/roms/${DIR}" "/data/${DIR}/roms"
-
     fi
 done
 
-cd /emulatorjs
-## Config?
-HOME=/data
-exec node index.js
-
-if [ ! -z ${DISABLE_IPFS+x} ]; then
-  sleep infinity
-fi
-
-## Why?
-exec ipfs daemon
-
-
-if pgrep -f "[n]ginx:" > /dev/null; then
-    pkill -ef [n]ginx:
+# ---- supervisor ------------------------------------------------------------
+PIDS=()
+shutdown() {
+    trap - TERM INT
+    for pid in "${PIDS[@]}"; do
+        kill -TERM "$pid" 2>/dev/null || true
+    done
+    wait
+    exit 0
+}
+trap shutdown TERM INT
+
+# nginx (foreground via daemon off in nginx.conf)
+/usr/sbin/nginx -c /etc/nginx/nginx.conf &
+PIDS+=($!)
+
+# profile service
+( cd /emulatorjs && HOME=/config exec node profile.js ) &
+PIDS+=($!)
+
+# optional ipfs daemon
+if [[ -z ${DISABLE_IPFS+x} ]] && command -v ipfs >/dev/null 2>&1; then
+    HOME=/data ipfs daemon &
+    PIDS+=($!)
 fi
 
-## TODO: Needs to be another container entirely
-exec /usr/sbin/nginx -c /etc/nginx/nginx.conf
+# main frontend service
+( cd /emulatorjs && HOME=/data exec node index.js ) &
+PIDS+=($!)
 
-cd /emulatorjs
-HOME=/config
-## TODO: What to do with this?
-exec node profile.js
+# exit when any child exits, then propagate shutdown to remaining children
+wait -n
+shutdown