recipe-maintainers/cc-ci
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(prevb): discourse custom mint_admin image-agnostic (official /var/www/discourse + DB-password re-export; bitnami fallback)
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
The custom tier runs on the PR head — now genuinely the official discourse/discourse image (prevb
stopped the overlay reverting it to bitnamilegacy). mint_admin hardcoded /opt/bitnami/discourse (404 on
official) → create-topic roundtrip failed. Detect /var/www/discourse, re-export DISCOURSE_DB_PASSWORD
from /run/secrets (entrypoint exports it only for boot), run bin/rails; keep bitnami fallback.
This commit is contained in:
autonomic-bot
2026-06-17 01:20:41 +00:00
parent 55d638026f
commit b66abc4978
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/discourse/custom/_discourse.py
View File

@ -1,12 +1,19 @@
"""Shared discourse test helpers — admin user + API key + JSON HTTP. """Shared discourse test helpers — admin user + API key + JSON HTTP.
The bitnamilegacy/discourse recipe (compose app env) sets ONLY the DB + SMTP vars — it does NOT seed The discourse recipe (compose app env) sets ONLY the DB + SMTP vars — it does NOT seed an admin user,
an admin user, and Discourse's Admin API requires `Api-Key` + `Api-Username` headers (there is no and Discourse's Admin API requires `Api-Key` + `Api-Username` headers (there is no auto-created API
auto-created API key). So the functional tests bootstrap their own admin by running Rails inside the key). So the functional tests bootstrap their own admin by running Rails inside the `app` container:
`app` container (Discourse ships its Rails env at /opt/bitnami/discourse): find-or-create an admin find-or-create an admin user, then create an ApiKey and print its plaintext `.key` (Discourse returns
user, then create an ApiKey and print its plaintext `.key` (Discourse returns the plaintext only at the plaintext only at create time; it's stored hashed). Both the admin user and the key are class-B
create time; it's stored hashed). Both the admin user and the key are class-B run-scoped — they live run-scoped — they live only in the per-run app and are destroyed at teardown.
only in the per-run app and are destroyed at teardown.
The custom tier runs on the PR HEAD. Phase prevb made the head genuinely the OFFICIAL
`discourse/discourse` image (no longer reverted to bitnamilegacy by a leaky overlay), so the Rails env
location is image-dependent — `mint_admin` detects it: OFFICIAL ships discourse at `/var/www/discourse`
(ruby/bundle on PATH) and reads the DB password from `$DISCOURSE_DB_PASSWORD`, which the recipe's
entrypoint exports from `/run/secrets/db_password` only for the BOOT process — a fresh `docker exec`
must re-export it. The legacy `bitnamilegacy/discourse` ships at `/opt/bitnami/discourse` (ruby at
`/opt/bitnami/ruby/bin`, DB password injected via env). The probe tries official first, bitnami second.
`mint_admin(domain)` returns (api_key, api_username). Each call creates a fresh ApiKey (cheap; `mint_admin(domain)` returns (api_key, api_username). Each call creates a fresh ApiKey (cheap;
idempotent enough — the shared deployment's functional tests each mint their own), reusing the same idempotent enough — the shared deployment's functional tests each mint their own), reusing the same
@ -45,15 +52,26 @@ _BOOTSTRAP_RB = (
def mint_admin(domain: str) -> tuple[str, str]: def mint_admin(domain: str) -> tuple[str, str]:
"""Bootstrap an admin + fresh API key via Rails in the app container. Returns (api_key, username).""" """Bootstrap an admin + fresh API key via Rails in the app container. Returns (api_key, username).
# `bin/rails` is `#!/usr/bin/env ruby`; the bitnami discourse image keeps ruby at
# /opt/bitnami/ruby/bin, which is NOT on a login shell's PATH (`bash -lc` resets PATH from Image-agnostic (phase prevb): detects the OFFICIAL `discourse/discourse` layout
# /etc/profile → `env: 'ruby': No such file or directory`, rc=127). Use a non-login shell, discover (`/var/www/discourse`, ruby on PATH) vs the legacy `bitnamilegacy/discourse`
# ruby (image-ENV PATH first, bitnami fallback), and invoke it explicitly so the shebang is moot. (`/opt/bitnami/discourse`, ruby at `/opt/bitnami/ruby/bin`). On the OFFICIAL image a fresh
`docker exec` lacks `DISCOURSE_DB_PASSWORD` (the entrypoint exports it only for the boot process),
so re-export it from `/run/secrets/db_password` before Rails connects."""
cmd = ( cmd = (
"cd /opt/bitnami/discourse && " "set -e; "
"RUBY=$(command -v ruby || echo /opt/bitnami/ruby/bin/ruby) && " "if [ -d /var/www/discourse ]; then " # official discourse/discourse
f'RAILS_ENV=production "$RUBY" bin/rails runner "{_BOOTSTRAP_RB}"' " cd /var/www/discourse; "
' export DISCOURSE_DB_PASSWORD="$(cat /run/secrets/db_password 2>/dev/null)"; '
f' RAILS_ENV=production bin/rails runner "{_BOOTSTRAP_RB}"; '
"elif [ -d /opt/bitnami/discourse ]; then " # legacy bitnamilegacy/discourse
" cd /opt/bitnami/discourse; "
" RUBY=$(command -v ruby || echo /opt/bitnami/ruby/bin/ruby); "
f' RAILS_ENV=production "$RUBY" bin/rails runner "{_BOOTSTRAP_RB}"; '
"else "
' echo "no discourse app dir (/var/www/discourse|/opt/bitnami/discourse)" >&2; exit 3; '
"fi"
) )
out = lifecycle.exec_in_app(domain, ["bash", "-c", cmd], service="app", timeout=240) out = lifecycle.exec_in_app(domain, ["bash", "-c", cmd], service="app", timeout=240)
key = user = None key = user = None