feat: Add COOKIE_DOMAIN to .env and improve project name fallback logic in sync-directus script
Some checks failed
Build & Deploy KLZ Cables / 🔍 Prepare Environment (push) Successful in 11s
Build & Deploy KLZ Cables / 🧪 Quality Assurance (push) Successful in 1m40s
Build & Deploy KLZ Cables / 🏗️ Build App (push) Failing after 17m34s
Build & Deploy KLZ Cables / 🚀 Deploy (push) Has been cancelled
Build & Deploy KLZ Cables / ⚡ PageSpeed (push) Has been cancelled
Build & Deploy KLZ Cables / 🔔 Notifications (push) Has been cancelled
Some checks failed
Build & Deploy KLZ Cables / 🔍 Prepare Environment (push) Successful in 11s
Build & Deploy KLZ Cables / 🧪 Quality Assurance (push) Successful in 1m40s
Build & Deploy KLZ Cables / 🏗️ Build App (push) Failing after 17m34s
Build & Deploy KLZ Cables / 🚀 Deploy (push) Has been cancelled
Build & Deploy KLZ Cables / ⚡ PageSpeed (push) Has been cancelled
Build & Deploy KLZ Cables / 🔔 Notifications (push) Has been cancelled
This commit is contained in:
1
.env
1
.env
@@ -33,3 +33,4 @@ PROJECT_NAME=klz-cables
|
|||||||
TRAEFIK_HOST=klz.localhost
|
TRAEFIK_HOST=klz.localhost
|
||||||
DIRECTUS_HOST=cms.klz.localhost
|
DIRECTUS_HOST=cms.klz.localhost
|
||||||
GATEKEEPER_PASSWORD=klz2026
|
GATEKEEPER_PASSWORD=klz2026
|
||||||
|
COOKIE_DOMAIN=localhost
|
||||||
|
|||||||
4
cookies.txt
Normal file
4
cookies.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Netscape HTTP Cookie File
|
||||||
|
# https://curl.se/docs/http-cookies.html
|
||||||
|
# This file was generated by libcurl! Edit at your own risk.
|
||||||
|
|
||||||
@@ -36,6 +36,8 @@ case $ENV in
|
|||||||
;;
|
;;
|
||||||
production)
|
production)
|
||||||
PROJECT_NAME="klz-cables-prod"
|
PROJECT_NAME="klz-cables-prod"
|
||||||
|
# Fallback to older project name if prod-specific one isn't found later in the script
|
||||||
|
OLD_PROJECT_NAME="klz-cablescom"
|
||||||
ENV_FILE=".env.prod"
|
ENV_FILE=".env.prod"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@@ -58,6 +60,7 @@ if [ "$ACTION" == "push" ]; then
|
|||||||
|
|
||||||
# 1. DB Dump
|
# 1. DB Dump
|
||||||
echo "📦 Dumping local database..."
|
echo "📦 Dumping local database..."
|
||||||
|
# Note: we use --no-owner --no-privileges to ensure restore works on remote with different user setup
|
||||||
docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" --clean --if-exists --no-owner --no-privileges "$DB_NAME" > dump.sql
|
docker exec "$LOCAL_DB_CONTAINER" pg_dump -U "$DB_USER" --clean --if-exists --no-owner --no-privileges "$DB_NAME" > dump.sql
|
||||||
|
|
||||||
# 2. Upload Dump
|
# 2. Upload Dump
|
||||||
@@ -67,10 +70,21 @@ if [ "$ACTION" == "push" ]; then
|
|||||||
# 3. Restore on Remote
|
# 3. Restore on Remote
|
||||||
echo "🔄 Restoring dump on $ENV..."
|
echo "🔄 Restoring dump on $ENV..."
|
||||||
REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
|
REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
|
||||||
|
if [ -z "$REMOTE_DB_CONTAINER" ] && [ -n "$OLD_PROJECT_NAME" ]; then
|
||||||
|
echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
|
||||||
|
REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -z "$REMOTE_DB_CONTAINER" ]; then
|
if [ -z "$REMOTE_DB_CONTAINER" ]; then
|
||||||
echo "❌ Remote $ENV-db container not found!"
|
echo "❌ Remote $ENV-db container not found!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Wipe remote DB clean before restore to avoid constraint errors
|
||||||
|
echo "🧹 Wiping remote database schema..."
|
||||||
|
ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'"
|
||||||
|
|
||||||
|
echo "⚡ Restoring database..."
|
||||||
ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
|
ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
|
||||||
|
|
||||||
# 4. Sync Uploads
|
# 4. Sync Uploads
|
||||||
@@ -91,6 +105,11 @@ elif [ "$ACTION" == "pull" ]; then
|
|||||||
# 1. DB Dump on Remote
|
# 1. DB Dump on Remote
|
||||||
echo "📦 Dumping remote database ($ENV)..."
|
echo "📦 Dumping remote database ($ENV)..."
|
||||||
REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
|
REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
|
||||||
|
if [ -z "$REMOTE_DB_CONTAINER" ] && [ -n "$OLD_PROJECT_NAME" ]; then
|
||||||
|
echo "⚠️ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
|
||||||
|
REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -z "$REMOTE_DB_CONTAINER" ]; then
|
if [ -z "$REMOTE_DB_CONTAINER" ]; then
|
||||||
echo "❌ Remote $ENV-db container not found!"
|
echo "❌ Remote $ENV-db container not found!"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -101,8 +120,11 @@ elif [ "$ACTION" == "pull" ]; then
|
|||||||
echo "📥 Downloading dump..."
|
echo "📥 Downloading dump..."
|
||||||
scp "$REMOTE_HOST:$REMOTE_DIR/dump.sql" dump.sql
|
scp "$REMOTE_HOST:$REMOTE_DIR/dump.sql" dump.sql
|
||||||
|
|
||||||
# 3. Restore Locally
|
# Wipe local DB clean before restore to avoid constraint errors
|
||||||
echo "🔄 Restoring dump locally..."
|
echo "🧹 Wiping local database schema..."
|
||||||
|
docker exec "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'
|
||||||
|
|
||||||
|
echo "⚡ Restoring database locally..."
|
||||||
docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" < dump.sql
|
docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" < dump.sql
|
||||||
|
|
||||||
# 4. Sync Uploads
|
# 4. Sync Uploads
|
||||||
|
|||||||
Reference in New Issue
Block a user