Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(docker): add FORCE_PERMISSIONS variable to set permissions on data files
71851eb57d60d193
diff --git a/backend/src/infrastructure/database/scripts/check-db.ts b/backend/src/infrastructure/database/scripts/check-db.tsnew file mode 100644index 00000000..6e8f3553--- /dev/null+++ b/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()diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.shindex ac23d4aa..b42a4c37 100644--- a/scripts/docker-entrypoint.sh+++ b/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 neededgroup_name=$(getent group "${PGID}" | cut -d: -f1)@@ -24,9 +25,11 @@ chown "${PUID}:${PGID}" /appCURRENT_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" ]; thenchown -R "${PUID}:${PGID}" /app/datafi+umask 027+# Launch server as syncin userexec su-exec "${PUID}:${PGID}" "$@"diff --git a/scripts/docker-sync-in-server.sh b/scripts/docker-sync-in-server.shindex 16152427..93c79886 100755--- a/scripts/docker-sync-in-server.sh+++ b/scripts/docker-sync-in-server.sh@@ -2,8 +2,27 @@if [ "${SKIP_INIT}" != "true" ]; thenif [ ! -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 databaseif ! npx drizzle-kit migrate --config=server/infrastructure/database/configuration.js; thenecho "Error: unable to migrate database schema !" >&2@@ -19,9 +38,15 @@ if [ "${SKIP_INIT}" != "true" ]; thenfifitouch .init- chmod -R 755 /app/data+ chmod 750 /app/datafielseecho "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\ No newline at end of file