diff --git a/server/docker-entrypoint.sh b/server/docker-entrypoint.sh
new file mode 100644
index 00000000..89ada4f3
--- /dev/null
+++ b/server/docker-entrypoint.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+# Function to wait for PostgreSQL
+wait_for_postgres() {
+  echo "Waiting for PostgreSQL at $DB_HOST:$DB_PORT..."
+  
+  max_retries=30
+  retries=0
+  
+  while ! nc -z $DB_HOST $DB_PORT; do
+    retries=$((retries+1))
+    if [ $retries -eq $max_retries ]; then
+      echo "Error: PostgreSQL not available after $max_retries attempts. Continuing anyway..."
+      break
+    fi
+    echo "PostgreSQL not available yet (attempt $retries/$max_retries), retrying..."
+    sleep 2
+  done
+  
+  if [ $retries -lt $max_retries ]; then
+    echo "PostgreSQL is ready!"
+  fi
+}
+
+# Wait for PostgreSQL to be ready
+wait_for_postgres
+
+# Run the application with migrations before startup
+NODE_OPTIONS="--max-old-space-size=4096" node -e "require('./server/src/db/migrate')().then(success => { if (success || process.env.CONTINUE_ON_MIGRATION_FAILURE === 'true') { require('./server/src/index'); } else { console.error('Migration failed. Exiting.'); process.exit(1); } })"
\ No newline at end of file