Skip to content

Read local Postgres settings from the assembled env, not process.env #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
16francej wants to merge 2 commits into from
Closed

Read local Postgres settings from the assembled env, not process.env #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc69979
Read local Postgres settings from the assembled env, not process.env
16francej Aug 3, 2026
dcb2266
URL-encode the local Postgres password in the connection string
16francej Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions scripts/dev/lib/postgres.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,16 @@ export interface LocalPostgres {
url: string;
}

export async function ensureLocalPostgres(worktree: string, log: (msg: string) => void): Promise<LocalPostgres> {
const container = process.env.DEV_INSTANCE_POSTGRES_CONTAINER || "qm-dev-postgres";
const port = process.env.DEV_INSTANCE_POSTGRES_PORT || "55432";
const image = process.env.DEV_INSTANCE_POSTGRES_IMAGE || POSTGRES_IMAGE;
const password = process.env.DEV_INSTANCE_POSTGRES_PASSWORD || "qm-dev";
const volume = process.env.DEV_INSTANCE_POSTGRES_VOLUME || "qm-dev-postgres-data";
export async function ensureLocalPostgres(
worktree: string,
env: Record<string, string>,
log: (msg: string) => void,
): Promise<LocalPostgres> {
const container = env.DEV_INSTANCE_POSTGRES_CONTAINER || "qm-dev-postgres";
const port = env.DEV_INSTANCE_POSTGRES_PORT || "55432";
const image = env.DEV_INSTANCE_POSTGRES_IMAGE || POSTGRES_IMAGE;
const password = env.DEV_INSTANCE_POSTGRES_PASSWORD || "qm-dev";
const volume = env.DEV_INSTANCE_POSTGRES_VOLUME || "qm-dev-postgres-data";
const dbName = worktreeDbName(worktree);

if (!(await ensureDockerDaemon(log))) throw new Error("docker daemon unavailable");
Expand Down Expand Up @@ -130,5 +134,5 @@ export async function ensureLocalPostgres(worktree: string, log: (msg: string) =
throw new Error(`createdb ${dbName} failed`);
}
log(`durability: using local Postgres container ${container} database ${dbName}`);
return { url: `postgres://postgres:${password}@127.0.0.1:${port}/${dbName}` };
return { url: `postgres://postgres:${encodeURIComponent(password)}@127.0.0.1:${port}/${dbName}` };
}
2 changes: 1 addition & 1 deletion scripts/dev/supervisor/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ async function assembleAndPrepare(spec: BootSpec): Promise<SpecInputs> {
let durableAdminPrincipal = "";
if (!databaseUrl) {
try {
const pg = await ensureLocalPostgres(worktree, log);
const pg = await ensureLocalPostgres(worktree, assembled.env, log);
databaseUrl = pg.url;
localPg = true;
} catch (err) {
Expand Down