julian
ef8bd91d77
Second CI dry-run failure exposed two more issues:
1. Schema-apply runs against a fresh Postgres → fails with "Directus
isn't installed on this database. Please run 'directus bootstrap'
first." Bootstrap is what creates Directus's system tables; schema
apply requires those tables to exist. Local dev never tripped this
because bootstrap had been done in earlier sessions.
2. `node cli.js schema apply` printed an ERROR but exited 0 in the
not-installed case. schema-apply.sh trusted the exit code,
reported "schema apply complete," and the chain continued — until
the post-schema migration tried to ALTER TABLE on user tables that
never got created.
Fixes:
- entrypoint.sh: reorder steps from
pre-schema → schema-apply → post-schema → bootstrap → start
to
pre-schema → bootstrap → schema-apply → post-schema → start
Bootstrap is idempotent ("Database already initialized, skipping
install" on warm DB) so adding it earlier costs nothing on warm
boots and unblocks fresh boots.
- .gitea/workflows/build.yml: dry-run chain updated to mirror the new
entrypoint order. Bootstrap is now part of the pre-boot validation,
not skipped for speed. CI dry-run now genuinely covers the same path
the production entrypoint takes (minus the final pm2-runtime step,
which doesn't add validation value).
- scripts/schema-apply.sh: defense in depth. After the apply call
succeeds (exit 0), grep the output for ' ERROR: ' and fail loudly if
found. Catches the silent-failure pattern Directus's CLI exhibits
when bootstrap hasn't run. Error message names the likely cause
(schema-apply before bootstrap) for fast operator triage.
This is the second Phase 1 architectural correction exposed by the CI
dry-run gate. The gate is paying for itself in the very first PR it
runs against.
51 lines
2.3 KiB
Bash
Executable File
51 lines
2.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# =============================================================================
|
|
# entrypoint.sh — TRM directus image boot flow
|
|
#
|
|
# Apply order (non-negotiable, per ROADMAP design rule #3):
|
|
# 1. db-init runner (PRE-schema) — applies db-init/*.sql migrations against
|
|
# Postgres. These are migrations for tables Directus does NOT manage
|
|
# (positions hypertable, faulty column, future PostGIS extension).
|
|
# 2. Directus bootstrap — installs Directus's system tables on the database
|
|
# (directus_users, directus_collections, etc.) and creates the first
|
|
# admin user from ADMIN_EMAIL / ADMIN_PASSWORD if no users exist yet.
|
|
# Idempotent — already-bootstrapped databases treat this as a fast no-op
|
|
# ("Database already initialized, skipping install").
|
|
# 3. Directus schema apply — applies snapshots/schema.yaml so the running
|
|
# schema matches what's in git. This creates the user collections
|
|
# (organizations, events, entries, etc.). REQUIRES bootstrap to have run
|
|
# first; otherwise fails with "Directus isn't installed on this database."
|
|
# No-op if schema.yaml doesn't exist or is empty.
|
|
# 4. db-init runner (POST-schema) — applies db-init-post/*.sql migrations.
|
|
# These are constraints/indexes on Directus-managed tables that the
|
|
# snapshot YAML format cannot capture (composite UNIQUE constraints).
|
|
# Must run AFTER schema-apply because the tables don't exist before then.
|
|
# 5. Directus start under pm2-runtime — the upstream image's actual run
|
|
# pattern. pm2 provides crash recovery and signal handling inside the
|
|
# container.
|
|
#
|
|
# Any failure halts boot (set -euo pipefail). Operators see a clear log line
|
|
# in container output telling them which step failed.
|
|
# =============================================================================
|
|
|
|
set -euo pipefail
|
|
|
|
log() {
|
|
printf '[entrypoint] %s\n' "$*"
|
|
}
|
|
|
|
log "step 1/5: db-init (pre-schema)"
|
|
/directus/scripts/apply-db-init.sh
|
|
|
|
log "step 2/5: directus bootstrap"
|
|
node /directus/cli.js bootstrap
|
|
|
|
log "step 3/5: directus schema apply"
|
|
/directus/scripts/schema-apply.sh
|
|
|
|
log "step 4/5: db-init (post-schema)"
|
|
DB_INIT_DIR=/directus/db-init-post /directus/scripts/apply-db-init.sh
|
|
|
|
log "step 5/5: directus start (pm2-runtime)"
|
|
exec pm2-runtime start /directus/ecosystem.config.cjs
|