db fix

Author: GitTimeraider

entrypoint.sh

@@ -8,28 +8,25 @@ PGID=${PGID:-1000}
 CURRENT_UID=$(id -u appuser)
 CURRENT_GID=$(id -g appuser)
 
-# Only modify user/group if they're different from current
+# Adjust IDs if needed
 if [ "$PUID" != "$CURRENT_UID" ] || [ "$PGID" != "$CURRENT_GID" ]; then
-    echo "Updating user appuser to UID:$PUID and GID:$PGID"
-    
-    # Update group ID if needed
-    if [ "$PGID" != "$CURRENT_GID" ]; then
-        groupmod -g "$PGID" appuser
-    fi
-    
-    # Update user ID if needed
-    if [ "$PUID" != "$CURRENT_UID" ]; then
-        usermod -u "$PUID" appuser
-    fi
-    
-    # Fix ownership of app directory
-    chown -R appuser:appuser /app
-    
-    # Fix ownership of mounted volumes if they exist
-    [ -d /app/data ] && chown -R appuser:appuser /app/data
-    [ -d /app/backups ] && chown -R appuser:appuser /app/backups
-    [ -d /app/logs ] && chown -R appuser:appuser /app/logs
+    echo "Updating user appuser to UID:$PUID GID:$PGID"
+    [ "$PGID" != "$CURRENT_GID" ] && groupmod -g "$PGID" appuser
+    [ "$PUID" != "$CURRENT_UID" ] && usermod -u "$PUID" appuser
 fi
 
-# Switch to appuser and execute the original command
+# Always ensure directories exist and are owned correctly (important for SQLite write access)
+for d in /app/data /app/backups /app/logs; do
+    mkdir -p "$d"
+    chown -R appuser:appuser "$d" 2>/dev/null || true
+    chmod 775 "$d" 2>/dev/null || true
+done
+
+# Ensure app code ownership (helps when mounting volumes)
+chown -R appuser:appuser /app 2>/dev/null || true
+
+echo "Directory permissions:"
+ls -ld /app/data /app/backups /app/logs 2>/dev/null || true
+
+echo "Switching to appuser..."
 exec gosu appuser "$@"

init_db.py

@@ -2,19 +2,29 @@
 from app import app
 from models import db
 
+def ensure_sqlite_path():
+    uri = app.config.get('SQLALCHEMY_DATABASE_URI')
+    if uri and uri.startswith('sqlite:///'):
+        db_file = uri.replace('sqlite:///', '')
+        db_dir = os.path.dirname(db_file)
+        if db_dir and not os.path.isdir(db_dir):
+            os.makedirs(db_dir, exist_ok=True)
+            print(f"Created database directory: {db_dir}")
+        print(f"Target SQLite file: {db_file}")
+        return db_file
+    return None
+
 if __name__ == '__main__':
-    # Ensure the data directory exists
-    data_dir = '/app/data'
-    os.makedirs(data_dir, exist_ok=True)
-    print(f"Ensured data directory exists: {data_dir}")
-    
+    db_file = ensure_sqlite_path()
     with app.app_context():
-        db.create_all()
-        print("Database initialized successfully!")
-        
-        # Verify the database file was created
-        db_path = '/app/data/github_backup.db'
-        if os.path.exists(db_path):
-            print(f"Database file created at: {db_path}")
-        else:
-            print("Warning: Database file not found after initialization")
+        try:
+            db.create_all()
+            print("Database initialized successfully!")
+            if db_file and os.path.exists(db_file):
+                st = os.stat(db_file)
+                print(f"Database file created: {db_file} (size {st.st_size} bytes, perms {oct(st.st_mode)[-3:]})")
+            elif db_file:
+                print(f"Warning: Database file not found yet at {db_file}")
+        except Exception as e:
+            print(f"Error creating database: {e}")
+            raise