mirror of
https://github.com/kikootwo/ReadMeABook.git
synced 2026-06-02 20:30:10 +00:00
kikootwo
95e63dfc36
Introduce ROOTLESS_CONTAINER env to opt out of gosu (replace /proc uid_map detection) and update entrypoint messaging; adjust app-start.sh and redis-start.sh to skip gosu when ROOTLESS_CONTAINER=true and warn on UID/GID mismatch only when applicable. Backend: include audiobook audibleAsin in admin requests response (mapped to asin) and pass baseUrl through test-flaresolverr endpoint to the FlareSolverr tester. Frontend: RecentRequestsTable and RequestActionsDropdown now surface asin, accept/passthrough annasArchiveBaseUrl, and add a "View Details" flow using AudiobookDetailsModal; admin page passes ebook baseUrl from settings. InteractiveTorrentSearchModal refactor: improved UX/UI, keyboard handling, portal/modal mounting, skeleton/loading states, formatting helpers, and richer result display. Tests updated to match changes.
49 lines
1.8 KiB
Bash
49 lines
1.8 KiB
Bash
#!/bin/bash
|
|
# Redis startup wrapper for unified container
|
|
# Uses gosu to ensure correct PUID:PGID for file operations
|
|
#
|
|
# Supports:
|
|
# - Docker/LXC: Uses gosu to switch to PUID:PGID (default)
|
|
# - Rootless Podman: Set ROOTLESS_CONTAINER=true to skip gosu
|
|
|
|
set -e
|
|
|
|
# Load environment from /etc/environment (set by entrypoint)
|
|
if [ -f /etc/environment ]; then
|
|
set -a
|
|
source /etc/environment
|
|
set +a
|
|
fi
|
|
|
|
# Get PUID/PGID (default to redis user's current IDs if not set)
|
|
PUID=${PUID:-$(id -u redis)}
|
|
PGID=${PGID:-$(id -g redis)}
|
|
|
|
echo "[Redis] Starting Redis server..."
|
|
echo "[Redis] Process will run as UID:GID = $PUID:$PGID"
|
|
|
|
# =============================================================================
|
|
# START REDIS WITH APPROPRIATE UID:GID HANDLING
|
|
# =============================================================================
|
|
# Two scenarios:
|
|
# 1. Default: Running as root, use gosu to switch to PUID:PGID
|
|
# 2. ROOTLESS_CONTAINER=true: Skip gosu (rootless Podman user namespace handles UID mapping)
|
|
|
|
REDIS_CMD="/usr/bin/redis-server --appendonly yes --dir /var/lib/redis --bind 127.0.0.1 --port 6379"
|
|
|
|
if [ "$(id -u)" = "0" ]; then
|
|
if [ "${ROOTLESS_CONTAINER}" = "true" ]; then
|
|
# Rootless Podman: Skip gosu - user namespace already maps UID 0 to host user
|
|
echo "[Redis] ROOTLESS_CONTAINER=true - skipping gosu (user namespace handles UID mapping)"
|
|
exec $REDIS_CMD
|
|
else
|
|
# Default: Use gosu to switch to the specified PUID:PGID
|
|
echo "[Redis] Switching to UID:GID $PUID:$PGID via gosu..."
|
|
exec gosu "$PUID:$PGID" $REDIS_CMD
|
|
fi
|
|
else
|
|
# Not running as root - run directly (fallback for unusual configurations)
|
|
echo "[Redis] Warning: Not running as root, cannot use gosu. Running as current user ($(id -u):$(id -g))."
|
|
exec $REDIS_CMD
|
|
fi
|