Reorder boot: bootstrap before schema-apply (and harden schema-apply)
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.
This commit is contained in:
@@ -68,12 +68,18 @@ jobs:
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
# Dry-run boot — the gate that protects the registry from broken images.
|
# Dry-run boot — the gate that protects the registry from broken images.
|
||||||
#
|
#
|
||||||
# Runs the pre-boot script chain (apply-db-init.sh → schema-apply.sh →
|
# Runs the entrypoint's first FOUR steps against the throwaway Postgres:
|
||||||
# apply-db-init.sh against db-init-post) against the throwaway Postgres
|
# pre-schema db-init → bootstrap → schema-apply → post-schema db-init
|
||||||
# service above. Mirrors the entrypoint's first three steps.
|
#
|
||||||
# Intentionally does NOT run `directus bootstrap` or `directus start` —
|
# Bootstrap is required: schema-apply fails on a fresh DB with
|
||||||
# that would require waiting for the HTTP server to come up, which adds
|
# "Directus isn't installed on this database" if bootstrap hasn't created
|
||||||
# minutes and tests nothing new.
|
# Directus's system tables first. The `directus schema apply` CLI prints
|
||||||
|
# an ERROR but exits 0 in that case, so an earlier "skip bootstrap for
|
||||||
|
# speed" version of this dry-run silently masked snapshot apply failures.
|
||||||
|
#
|
||||||
|
# Step 5 (`pm2-runtime start`) is intentionally skipped — that would
|
||||||
|
# require waiting for the HTTP server to come up, which adds minutes and
|
||||||
|
# tests nothing new beyond what the prior steps already validated.
|
||||||
#
|
#
|
||||||
# --network host: the service container is mapped on 127.0.0.1:5432; the
|
# --network host: the service container is mapped on 127.0.0.1:5432; the
|
||||||
# docker run container sees it as localhost:5432 only when host networking
|
# docker run container sees it as localhost:5432 only when host networking
|
||||||
@@ -110,7 +116,7 @@ jobs:
|
|||||||
-e ADMIN_PASSWORD=ci-password-not-secret \
|
-e ADMIN_PASSWORD=ci-password-not-secret \
|
||||||
-e PUBLIC_URL=http://localhost:8055 \
|
-e PUBLIC_URL=http://localhost:8055 \
|
||||||
trm-directus:ci \
|
trm-directus:ci \
|
||||||
-c '/directus/scripts/apply-db-init.sh && /directus/scripts/schema-apply.sh && DB_INIT_DIR=/directus/db-init-post /directus/scripts/apply-db-init.sh && echo "dry-run ok"'
|
-c '/directus/scripts/apply-db-init.sh && node /directus/cli.js bootstrap && /directus/scripts/schema-apply.sh && DB_INIT_DIR=/directus/db-init-post /directus/scripts/apply-db-init.sh && echo "dry-run ok"'
|
||||||
|
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
# Registry login — runs only if the dry-run succeeded (default: workflow
|
# Registry login — runs only if the dry-run succeeded (default: workflow
|
||||||
|
|||||||
+16
-12
@@ -6,16 +6,20 @@
|
|||||||
# 1. db-init runner (PRE-schema) — applies db-init/*.sql migrations against
|
# 1. db-init runner (PRE-schema) — applies db-init/*.sql migrations against
|
||||||
# Postgres. These are migrations for tables Directus does NOT manage
|
# Postgres. These are migrations for tables Directus does NOT manage
|
||||||
# (positions hypertable, faulty column, future PostGIS extension).
|
# (positions hypertable, faulty column, future PostGIS extension).
|
||||||
# 2. Directus schema apply — applies snapshots/schema.yaml so the running
|
# 2. Directus bootstrap — installs Directus's system tables on the database
|
||||||
# schema matches what's in git. This creates the Directus-managed
|
# (directus_users, directus_collections, etc.) and creates the first
|
||||||
# tables (organizations, events, entries, etc.). No-op if schema.yaml
|
# admin user from ADMIN_EMAIL / ADMIN_PASSWORD if no users exist yet.
|
||||||
# doesn't exist or is empty.
|
# Idempotent — already-bootstrapped databases treat this as a fast no-op
|
||||||
# 3. db-init runner (POST-schema) — applies db-init-post/*.sql migrations.
|
# ("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
|
# These are constraints/indexes on Directus-managed tables that the
|
||||||
# snapshot YAML format cannot capture (composite UNIQUE constraints).
|
# snapshot YAML format cannot capture (composite UNIQUE constraints).
|
||||||
# Must run AFTER schema-apply because the tables don't exist before then.
|
# Must run AFTER schema-apply because the tables don't exist before then.
|
||||||
# 4. Directus bootstrap — idempotent first-boot setup (admin user, system
|
|
||||||
# tables). Already-bootstrapped instances treat this as a fast no-op.
|
|
||||||
# 5. Directus start under pm2-runtime — the upstream image's actual run
|
# 5. Directus start under pm2-runtime — the upstream image's actual run
|
||||||
# pattern. pm2 provides crash recovery and signal handling inside the
|
# pattern. pm2 provides crash recovery and signal handling inside the
|
||||||
# container.
|
# container.
|
||||||
@@ -33,14 +37,14 @@ log() {
|
|||||||
log "step 1/5: db-init (pre-schema)"
|
log "step 1/5: db-init (pre-schema)"
|
||||||
/directus/scripts/apply-db-init.sh
|
/directus/scripts/apply-db-init.sh
|
||||||
|
|
||||||
log "step 2/5: directus schema apply"
|
log "step 2/5: directus bootstrap"
|
||||||
|
node /directus/cli.js bootstrap
|
||||||
|
|
||||||
|
log "step 3/5: directus schema apply"
|
||||||
/directus/scripts/schema-apply.sh
|
/directus/scripts/schema-apply.sh
|
||||||
|
|
||||||
log "step 3/5: db-init (post-schema)"
|
log "step 4/5: db-init (post-schema)"
|
||||||
DB_INIT_DIR=/directus/db-init-post /directus/scripts/apply-db-init.sh
|
DB_INIT_DIR=/directus/db-init-post /directus/scripts/apply-db-init.sh
|
||||||
|
|
||||||
log "step 4/5: directus bootstrap"
|
|
||||||
node /directus/cli.js bootstrap
|
|
||||||
|
|
||||||
log "step 5/5: directus start (pm2-runtime)"
|
log "step 5/5: directus start (pm2-runtime)"
|
||||||
exec pm2-runtime start /directus/ecosystem.config.cjs
|
exec pm2-runtime start /directus/ecosystem.config.cjs
|
||||||
|
|||||||
@@ -151,4 +151,16 @@ if [[ "${apply_exit}" -ne 0 ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Defense in depth: directus CLI's `schema apply` has been observed to log
|
||||||
|
# ERROR-level messages (e.g. "Directus isn't installed on this database. Please
|
||||||
|
# run \"directus bootstrap\" first.") while still exiting 0. Treat any line
|
||||||
|
# containing ' ERROR: ' (with the leading space and trailing colon — Directus's
|
||||||
|
# pino-formatted error pattern) as a fatal signal even if the CLI exited cleanly.
|
||||||
|
if grep -qE ' ERROR: ' <<< "${apply_output}"; then
|
||||||
|
log_error "directus schema apply logged ERROR-level output (CLI exited 0 but failed silently)"
|
||||||
|
log_error "Common cause: schema apply ran before directus bootstrap on a fresh DB."
|
||||||
|
log_error "Operator action: ensure entrypoint runs 'directus bootstrap' BEFORE schema-apply."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
log_info "schema apply complete"
|
log_info "schema apply complete"
|
||||||
|
|||||||
Reference in New Issue
Block a user