feat(docker): add FORCE_PERMISSIONS variable to set permissions on data files

Author: 7185

backend/src/infrastructure/database/scripts/check-db.ts

@@ -0,0 +1,16 @@
+import { sql } from 'drizzle-orm'
+import { getDB } from './db'
+
+async function checkConnection() {
+  try {
+    const db = await getDB()
+    await db.execute(sql`SELECT 1`)
+    console.log('Database is ready and accepting queries!')
+    process.exit(0)
+  } catch (error: any) {
+    console.error(`Database check failed: ${error.message}`)
+    process.exit(1)
+  }
+}
+
+checkConnection()

scripts/docker-entrypoint.sh

@@ -3,6 +3,7 @@ set -eu
 
 : "${PUID:?PUID is not defined}"
 : "${PGID:?PGID is not defined}"
+: "${FORCE_PERMISSIONS:=false}"
 
 # Create syncin group if needed
 group_name=$(getent group "${PGID}" | cut -d: -f1)
@@ -24,9 +25,11 @@ chown "${PUID}:${PGID}" /app
 CURRENT_UID=$(stat -c '%u' /app/data)
 CURRENT_GID=$(stat -c '%g' /app/data)
 
-if [ "${CURRENT_UID}" != "${PUID}" ] || [ "${CURRENT_GID}" != "${PGID}" ]; then
+if [ "${CURRENT_UID}" != "${PUID}" ] || [ "${CURRENT_GID}" != "${PGID}" ] || [ "${FORCE_PERMISSIONS}" = "true" ]; then
     chown -R "${PUID}:${PGID}" /app/data
 fi
 
+umask 027
+
 # Launch server as syncin user
 exec su-exec "${PUID}:${PGID}" "$@"

scripts/docker-sync-in-server.sh

@@ -2,8 +2,27 @@
 
 if [ "${SKIP_INIT}" != "true" ]; then
   if [ ! -f .init ]; then
-      # wait for database
-      sleep 8
+      echo "Waiting for database to be ready..."
+      MAX_RETRIES=30
+      COUNT=0
+      CONNECTED=false
+
+      while [ $COUNT -lt $MAX_RETRIES ]; do
+        COUNT=$((COUNT+1))
+        echo "Database connection attempt ${COUNT}/${MAX_RETRIES}..."
+        if OUTPUT=$(node server/infrastructure/database/scripts/check-db.js 2>&1); then
+          CONNECTED=true
+          break
+        fi
+        sleep 1
+      done
+
+      if [ "$CONNECTED" = "false" ]; then
+        echo "Error: Timeout waiting for database after ${MAX_RETRIES} attempts:"
+        echo "$OUTPUT"
+        exit 1
+      fi
+
       # migrate database
       if ! npx drizzle-kit migrate --config=server/infrastructure/database/configuration.js; then
         echo "Error: unable to migrate database schema !" >&2
@@ -19,9 +38,15 @@ if [ "${SKIP_INIT}" != "true" ]; then
         fi
       fi
       touch .init
-      chmod -R 755 /app/data
+      chmod 750 /app/data
   fi
 else
   echo "SKIP_INIT invoked"
 fi
+
+if [ "${FORCE_PERMISSIONS}" = "true" ]; then
+  echo "FORCE_PERMISSIONS: Applying recursive permissions (Dirs: 750, Files: 640)..."
+  chmod -R u=rwX,g=rX,o= /app/data
+fi
+
 exec node server/main.js