gatekeeper/net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: start.sh PostgreSQL user and proper env var quoting

Browse Source
This commit is contained in:
cawcenter
2025-12-14 11:37:04 -05:00
parent 52393ea2dd
commit ce3089da41
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
start.sh
View File

@@ -11,7 +11,7 @@ RETRY_COUNT=0
# === Wait for PostgreSQL === # === Wait for PostgreSQL ===
echo "📡 Waiting for PostgreSQL to be ready..." echo "📡 Waiting for PostgreSQL to be ready..."
until [ $DB_READY = true ] || [ $RETRY_COUNT -eq $MAX_RETRIES ]; do until [ $DB_READY = true ] || [ $RETRY_COUNT -eq $MAX_RETRIES ]; do
if PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_DATABASE -c '\q' 2>/dev/null; then if PGPASSWORD="$DB_PASSWORD" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_DATABASE" -c '\q' 2>/dev/null; then
DB_READY=true DB_READY=true
echo "✅ PostgreSQL is ready" echo "✅ PostgreSQL is ready"
else else
@@ -37,10 +37,10 @@ if [ "$FORCE_FRESH_INSTALL" = "true" ]; then
sleep 5 sleep 5
echo "🗑️ Dropping public schema..." echo "🗑️ Dropping public schema..."
PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_DATABASE <<-EOSQL PGPASSWORD="$DB_PASSWORD" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_DATABASE" <<-EOSQL
DROP SCHEMA IF EXISTS public CASCADE; DROP SCHEMA IF EXISTS public CASCADE;
CREATE SCHEMA public; CREATE SCHEMA public;
GRANT ALL ON SCHEMA public TO $DB_USER; GRANT ALL ON SCHEMA public TO "$DB_USER";
GRANT ALL ON SCHEMA public TO public; GRANT ALL ON SCHEMA public TO public;
COMMENT ON SCHEMA public IS 'Recreated by FORCE_FRESH_INSTALL'; COMMENT ON SCHEMA public IS 'Recreated by FORCE_FRESH_INSTALL';
EOSQL EOSQL
@@ -60,7 +60,7 @@ if [ -f "/directus/schema.yaml" ]; then
echo "✅ Schema applied from code" echo "✅ Schema applied from code"
elif [ -f "/directus/complete_schema.sql" ]; then elif [ -f "/directus/complete_schema.sql" ]; then
echo "🔄 Applying schema from complete_schema.sql..." echo "🔄 Applying schema from complete_schema.sql..."
PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_DATABASE < /directus/complete_schema.sql PGPASSWORD="$DB_PASSWORD" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_DATABASE" < /directus/complete_schema.sql
echo "✅ SQL schema applied" echo "✅ SQL schema applied"
else else
echo "⚠️ No schema.yaml or complete_schema.sql found" echo "⚠️ No schema.yaml or complete_schema.sql found"