Remove IPv4 forcing and simplify database connection handling in deploy scripts

Author: ralyodio

bin/deploy-with-migrations.sh

@@ -23,8 +23,8 @@ REMOTE_PORT="${DEPLOY_REMOTE_PORT:-2048}"
 REMOTE_USER="${DEPLOY_REMOTE_USER:-ubuntu}"
 REMOTE_DIR="${DEPLOY_REMOTE_DIR:-www/profullstack.com/pdf}"
 
-# Create SSH options - force IPv4 to avoid IPv6 connection issues
-SSH_OPTS="-4 -p $REMOTE_PORT"
+# Create SSH options
+SSH_OPTS="-p $REMOTE_PORT"
 
 # Deploy the code first using deploy.sh
 echo -e "${YELLOW}Running deployment script...${NC}"

bin/deploy.sh

@@ -16,10 +16,10 @@ REMOTE_DIR="${DEPLOY_REMOTE_DIR:-www/profullstack.com/pdf}"
 LOCAL_DIR="."
 INSTALL_SERVICE="${INSTALL_SERVICE:-false}"
 
-# Create SSH options - force IPv4 to avoid IPv6 connection issues
-SSH_OPTS="-4 -p $REMOTE_PORT"
-SCP_OPTS="-4 -P $REMOTE_PORT"
-RSYNC_OPTS="-e \"ssh -4 -p $REMOTE_PORT\""
+# Create SSH options
+SSH_OPTS="-p $REMOTE_PORT"
+SCP_OPTS="-P $REMOTE_PORT"
+RSYNC_OPTS="-e \"ssh -p $REMOTE_PORT\""
 
 # Set colors for output
 GREEN='\033[0;32m'
@@ -42,10 +42,10 @@ if ssh $SSH_OPTS $REMOTE_USER@$REMOTE_HOST "[ -d $REMOTE_DIR ]"; then
     # Deploy using rsync with .deployignore
     if [ -f .deployignore ]; then
         echo -e "${YELLOW}Using .deployignore file for exclusions...${NC}"
-        rsync -avz --partial --progress -e "ssh -4 -p $REMOTE_PORT" --exclude-from=.deployignore $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
+        rsync -avz --partial --progress -e "ssh -p $REMOTE_PORT" --exclude-from=.deployignore $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
     else
         echo -e "${YELLOW}No .deployignore file found. Excluding node_modules/ by default...${NC}"
-        rsync -avz --partial --progress -e "ssh -4 -p $REMOTE_PORT" --exclude="node_modules/" $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
+        rsync -avz --partial --progress -e "ssh -p $REMOTE_PORT" --exclude="node_modules/" $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
     fi
 
     # Check if rsync was successful

bin/supabase-db.sh

@@ -213,9 +213,8 @@ setup_project() {
   export PGPASSWORD="$SUPABASE_DB_PASSWORD"
 
   # Run the link command directly - no retries to avoid confusion
-  # Add GODEBUG=netdns=4 to force IPv4 DNS resolution
-  echo -e "${YELLOW}Running: GODEBUG=netdns=4 supabase link --project-ref \"$PROJECT_REF\" --password \"$SUPABASE_DB_PASSWORD\" --debug${NC}"
-  GODEBUG=netdns=4 supabase link --project-ref "$PROJECT_REF" --password "$SUPABASE_DB_PASSWORD" --debug
+  echo -e "${YELLOW}Running: supabase link --project-ref \"$PROJECT_REF\" --password \"$SUPABASE_DB_PASSWORD\" --debug${NC}"
+  supabase link --project-ref "$PROJECT_REF" --password "$SUPABASE_DB_PASSWORD" --debug
 
   if [ $? -eq 0 ]; then
     echo -e "${GREEN}Link successful!${NC}"
@@ -276,31 +275,12 @@ run_migrations() {
     echo -e "${YELLOW}Using hardcoded project reference as fallback: $PROJECT_REF${NC}"
   fi
 
-  # Set up the database URL for direct cloud connection
-  # Force IPv4 by resolving the hostname to an IPv4 address
-  echo -e "${YELLOW}Resolving db.${PROJECT_REF}.supabase.co to IPv4 address...${NC}"
-  DB_HOST=$(getent ahostsv4 db.${PROJECT_REF}.supabase.co | head -n 1 | awk '{print $1}')
+  # Use the Supabase CLI to push migrations without direct database connection
+  echo -e "${YELLOW}Running migrations using Supabase CLI...${NC}"
 
-  if [ -z "$DB_HOST" ]; then
-    echo -e "${YELLOW}Failed to resolve IPv4 address, using hostname...${NC}"
-    DB_HOST="db.${PROJECT_REF}.supabase.co"
-  else
-    echo -e "${YELLOW}Using IPv4 address: $DB_HOST${NC}"
-  fi
-  
-  DB_URL="postgresql://postgres:${SUPABASE_DB_PASSWORD}@$DB_HOST:5432/postgres"
-  echo -e "${YELLOW}Using cloud database URL for migrations...${NC}"
-  
-  # Run the migration command directly with the cloud database URL
-  echo -e "${YELLOW}Running migrations on cloud database...${NC}"
-  
-  # Set up PGPASSWORD environment variable
-  export PGPASSWORD="$SUPABASE_DB_PASSWORD"
-  
-  # Run the command with the cloud database URL - no retries to avoid confusion
-  # Add GODEBUG=netdns=4 to force IPv4 DNS resolution
-  echo -e "${YELLOW}Running: GODEBUG=netdns=4 supabase db push --db-url <DB_URL> --debug${NC}"
-  GODEBUG=netdns=4 supabase db push --db-url "$DB_URL" --debug
+  # Run the command without direct database URL to use the linked project
+  echo -e "${YELLOW}Running: supabase db push${NC}"
+  supabase db push
 
   if [ $? -eq 0 ]; then
     echo -e "${GREEN}Migration successful!${NC}"