mirror of
https://github.com/Dvorinka/Primora.git
synced 2026-10-29 00:01:20 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61a45cc48f | ||
|
|
d44bbcceda | ||
|
|
56c63d43cd | ||
|
|
6d758c0089 | ||
|
|
361538aabc | ||
|
|
5eec80bbca | ||
|
|
40c189c431 | ||
|
|
bc8b165ad9 |
No files matched your search
@@ -0,0 +1 @@
|
||||
github: Dvorinka
|
||||
@@ -4,6 +4,23 @@ All notable changes to Primora. Format follows [Keep a Changelog](https://keepac
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.8.5] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Content column centers on wide screens** — `.page` was capped at 72rem but left-aligned, so above ~1200px the dashboard hugged the left with a growing dead zone on the right. It now centers (`margin-inline: auto`) while staying full-width below the cap.
|
||||
|
||||
## [0.8.4] - 2026-09-28
|
||||
|
||||
### Added
|
||||
|
||||
- **Slugs auto-derive from names** — typing an organization, project, bucket, or collection name now fills its slug (`TDvorak` → `tdvorak`); hand-editing the slug stops the derivation, and manual edits are sanitized as you type. Edit forms stay manual.
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Installer URL prompt was invisible under `curl | bash`** — `exec 9</dev/tty 2>/dev/null` sent the whole shell's stderr to `/dev/null` permanently, so the `read` prompt rendered nowhere while the script blocked on input. The prompt now reads `/dev/tty` directly with a quiet probe; no-tty runs default silently.
|
||||
- **Installer fetches fail fast** — the compose-file and source-tarball `curl` calls now carry connect/max-time timeouts plus retries, so a stalled GitHub connection errors within seconds naming the file instead of hanging forever.
|
||||
|
||||
## [0.8.3] - 2026-09-28
|
||||
|
||||
### Added
|
||||
|
||||
+7
-3
@@ -40,7 +40,7 @@ docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d
|
||||
| `PRIMORA_ENCRYPTION_KEY` | AES-256 key (64 hex chars) for project secrets (Vault page, `secret://` job refs), integration credentials + webhook secrets at rest | production |
|
||||
| `AUTH_BASE_URL` / `BETTER_AUTH_URL` | public auth URL (`https://host/auth`) | yes |
|
||||
| `AUTH_INTERNAL_BASE_URL` | backend → auth internal URL (`http://auth:3001`) | yes |
|
||||
| `VITE_APP_URL` / `VITE_AUTH_BASE_URL` / `VITE_API_BASE_URL` | frontend public URLs — **baked into the frontend image at build time** | yes |
|
||||
| `VITE_APP_URL` / `VITE_AUTH_BASE_URL` / `VITE_API_BASE_URL` | frontend public URLs — informational only; the shipped image resolves API/auth URLs same-origin at runtime, so no rebuild is needed when the host changes | yes |
|
||||
| `BACKEND_STORAGE_ROOT` | object storage directory inside the backend container (local driver) | yes |
|
||||
| `BACKEND_STORAGE_DRIVER` | `local` (default) or `s3` — S3-compatible object storage | no |
|
||||
| `S3_ENDPOINT` / `S3_REGION` / `S3_BUCKET` | S3 API endpoint (empty endpoint → AWS `s3.<region>.amazonaws.com`), region, bucket | with `s3` |
|
||||
@@ -81,8 +81,12 @@ labels:
|
||||
```
|
||||
|
||||
Once TLS is live, update `VITE_APP_URL`, `VITE_AUTH_BASE_URL`,
|
||||
`AUTH_BASE_URL`, `BETTER_AUTH_URL`, and `COOKIE_DOMAIN` to the https origin
|
||||
and rebuild the frontend image (`docker compose build frontend`).
|
||||
`AUTH_BASE_URL`, `BETTER_AUTH_URL`, `BACKEND_PUBLIC_URL`, and
|
||||
`COOKIE_DOMAIN` to the https origin and restart the stack
|
||||
(`docker compose up -d`). The frontend resolves API/auth URLs
|
||||
same-origin, so no image rebuild is needed — HTTPS is still required for
|
||||
PWA install, service workers, and other secure-context features on
|
||||
non-localhost origins.
|
||||
|
||||
## SMTP / email
|
||||
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ project interactively.
|
||||
## Commands
|
||||
|
||||
`orgs`, `projects`, `buckets`, `objects` (list/upload/download/rm), `keys`,
|
||||
`jobs`, `events:send`, `audit list --follow`. Every command accepts `--json`.
|
||||
`jobs`, `events:send`, `audit:list --follow`. Every command accepts `--json`.
|
||||
|
||||
```sh
|
||||
primora events:send custom.deploy.done --data '{"sha":"abc123"}'
|
||||
@@ -31,7 +31,7 @@ primora events:send custom.deploy.done --data '{"sha":"abc123"}'
|
||||
webhooks, and `event_pattern` functions all fire.
|
||||
|
||||
```sh
|
||||
primora documents list --collection users \
|
||||
primora documents:list --collection users \
|
||||
--filter "status.eq.active,age.gt.18" --order "age.desc"
|
||||
```
|
||||
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ cli
|
||||
.option("--url <url>", "Primora base URL (default http://localhost)")
|
||||
.option("--email <email>", "Account email")
|
||||
.option("--password <password>", "Account password")
|
||||
.option("--api-key <key>", "Store a pk_live_/pk_test_ API key instead of a session")
|
||||
.option("--api-key <key>", "Store a prm_ API key instead of a session")
|
||||
.option("--json", "Machine-readable output")
|
||||
.action(cmdLogin);
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { ScheduledJob, ScheduledJobRun } from "@primora/api-client";
|
||||
import { AutomationService } from "@primora/api-client";
|
||||
|
||||
import { loadConfig } from "../config.js";
|
||||
import { configureClient, requireAuth, requireProject } from "../http.js";
|
||||
import { configureClient, requireAuth, requireProject, resolveJobId } from "../http.js";
|
||||
import { formatDate, isJson, printJson, printTable, success } from "../out.js";
|
||||
|
||||
interface JobOptions {
|
||||
@@ -88,12 +88,13 @@ export async function cmdJobsCreate(
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdJobsRemove(jobId: string, options: JobOptions & { yes?: boolean }): Promise<void> {
|
||||
export async function cmdJobsRemove(jobRef: string, options: JobOptions & { yes?: boolean }): Promise<void> {
|
||||
const cfg = loadConfig();
|
||||
requireAuth(cfg);
|
||||
configureClient(cfg);
|
||||
|
||||
const projectId = requireProject(cfg, options.project);
|
||||
const jobId = await resolveJobId(projectId, jobRef);
|
||||
await AutomationService.deleteScheduledJob({ projectId, jobId });
|
||||
if (isJson(options)) {
|
||||
printJson({ deleted: jobId });
|
||||
@@ -102,12 +103,13 @@ export async function cmdJobsRemove(jobId: string, options: JobOptions & { yes?:
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdJobsRun(jobId: string, options: JobOptions): Promise<void> {
|
||||
export async function cmdJobsRun(jobRef: string, options: JobOptions): Promise<void> {
|
||||
const cfg = loadConfig();
|
||||
requireAuth(cfg);
|
||||
configureClient(cfg);
|
||||
|
||||
const projectId = requireProject(cfg, options.project);
|
||||
const jobId = await resolveJobId(projectId, jobRef);
|
||||
const run = await AutomationService.runScheduledJob({ projectId, jobId });
|
||||
if (isJson(options)) {
|
||||
printJson(run);
|
||||
@@ -128,7 +130,7 @@ function runRow(run: ScheduledJobRun): string[] {
|
||||
}
|
||||
|
||||
export async function cmdJobsRuns(
|
||||
jobId: string,
|
||||
jobRef: string,
|
||||
options: JobOptions & { limit?: string },
|
||||
): Promise<void> {
|
||||
const cfg = loadConfig();
|
||||
@@ -136,6 +138,7 @@ export async function cmdJobsRuns(
|
||||
configureClient(cfg);
|
||||
|
||||
const projectId = requireProject(cfg, options.project);
|
||||
const jobId = await resolveJobId(projectId, jobRef);
|
||||
const page = await AutomationService.listScheduledJobRuns({
|
||||
projectId,
|
||||
jobId,
|
||||
|
||||
+14
-1
@@ -1,4 +1,4 @@
|
||||
import { OpenAPI, StorageService } from "@primora/api-client";
|
||||
import { AutomationService, OpenAPI, StorageService } from "@primora/api-client";
|
||||
|
||||
import type { CliConfig } from "./config.js";
|
||||
|
||||
@@ -110,3 +110,16 @@ export async function resolveBucketId(projectId: string, ref: string): Promise<s
|
||||
}
|
||||
return match.id;
|
||||
}
|
||||
|
||||
/** Resolve a scheduled job reference that may be an id or a name. */
|
||||
export async function resolveJobId(projectId: string, ref: string): Promise<string> {
|
||||
const { items } = await AutomationService.listScheduledJobs({ projectId });
|
||||
const match = items.find((j) => j.id === ref || j.name === ref);
|
||||
if (!match) {
|
||||
throw new CliError(
|
||||
`Job "${ref}" not found.`,
|
||||
`Known jobs: ${items.map((j) => j.name).join(", ") || "(none)"}`,
|
||||
);
|
||||
}
|
||||
return match.id;
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@primora/desktop",
|
||||
"version": "0.8.3",
|
||||
"version": "0.8.5",
|
||||
"private": true,
|
||||
"description": "Primora desktop shell — thin Tauri client for a self-hosted deployment",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Primora",
|
||||
"version": "0.8.3",
|
||||
"version": "0.8.5",
|
||||
"identifier": "dev.tdvorak.primora",
|
||||
"build": {
|
||||
"frontendDist": "../ui"
|
||||
|
||||
+23
-11
@@ -101,6 +101,18 @@
|
||||
tauri?.event.emit("open-vault");
|
||||
});
|
||||
|
||||
const probe = async (url) => {
|
||||
try {
|
||||
// Opaque (no-cors) — proves the host answers, not that it is a
|
||||
// Primora deployment. A wrong-but-alive URL is recoverable via the
|
||||
// tray menu's "Change server".
|
||||
await fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(8000) });
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
form.addEventListener("submit", async (event) => {
|
||||
event.preventDefault();
|
||||
err.hidden = true;
|
||||
@@ -108,7 +120,17 @@
|
||||
button.textContent = "Checking…";
|
||||
|
||||
let url = input.value.trim();
|
||||
if (!/^https?:\/\//i.test(url)) url = `https://${url}`;
|
||||
if (!/^https?:\/\//i.test(url)) {
|
||||
// Self-hosted deployments are often plain HTTP on a LAN — probe
|
||||
// https first, fall back to http, and only keep the one that answers.
|
||||
const https = `https://${url}`;
|
||||
url = (await probe(https)) ? https : `http://${url}`;
|
||||
}
|
||||
|
||||
if (!(await probe(url))) {
|
||||
fail("Server did not respond. Check the URL and that the deployment is up.");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await tauri.core.invoke("set_server_url", { url });
|
||||
@@ -117,16 +139,6 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Reachability probe — opaque (no-cors), so it proves the host answers,
|
||||
// not that it is a Primora deployment. A wrong-but-alive URL is recoverable
|
||||
// via the tray menu's "Change server".
|
||||
try {
|
||||
await fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(8000) });
|
||||
} catch {
|
||||
fail("Server did not respond. Check the URL and that the deployment is up.");
|
||||
return;
|
||||
}
|
||||
|
||||
location.replace(url);
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -28,6 +28,7 @@ import { Show, createEffect, createMemo, createResource, createSignal, onCleanup
|
||||
import { authClient, fetchApiToken } from "./lib/auth-client";
|
||||
import { configureApiToken, errorMessage } from "./lib/api";
|
||||
import { isDemoMode, disableDemoMode, enableDemoMode, demoSession, demoService } from "./lib/demo-mode";
|
||||
import { applySlugField } from "./lib/slug";
|
||||
import {
|
||||
AgentSetupModal,
|
||||
AppShell,
|
||||
@@ -1636,7 +1637,7 @@ export default function App() {
|
||||
<PwaInstallBanner />
|
||||
|
||||
<Show
|
||||
when={platform() || isDemo}
|
||||
when={platform()}
|
||||
fallback={
|
||||
<div class="page">
|
||||
<div class="skeleton" style="height:2rem;width:12rem;border-radius:8px" />
|
||||
@@ -1655,6 +1656,14 @@ export default function App() {
|
||||
when={activeProject()}
|
||||
fallback={
|
||||
<div class="page">
|
||||
<Show
|
||||
when={!organizationProjects.loading}
|
||||
fallback={
|
||||
<div class="card" style="min-height:20rem">
|
||||
<div class="skeleton" style="height:100%;min-height:20rem;border-radius:12px" />
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<Show
|
||||
when={(platform()?.organizations ?? []).length > 0}
|
||||
fallback={
|
||||
@@ -1670,14 +1679,14 @@ export default function App() {
|
||||
label="Organization name"
|
||||
placeholder="Acme Corporation"
|
||||
value={organizationInput().name}
|
||||
onInput={(e) => setOrganizationInput((c) => ({ ...c, name: e.currentTarget.value }))}
|
||||
onInput={(e) => setOrganizationInput((c) => applySlugField(c, "name", e.currentTarget.value))}
|
||||
required
|
||||
/>
|
||||
<Input
|
||||
label="Slug"
|
||||
placeholder="acme"
|
||||
value={organizationInput().slug}
|
||||
onInput={(e) => setOrganizationInput((c) => ({ ...c, slug: e.currentTarget.value }))}
|
||||
onInput={(e) => setOrganizationInput((c) => applySlugField(c, "slug", e.currentTarget.value))}
|
||||
required
|
||||
/>
|
||||
<button type="submit" class="btn btn-primary w-full" disabled={workspacePending()}>
|
||||
@@ -1701,6 +1710,7 @@ export default function App() {
|
||||
</button>
|
||||
</div>
|
||||
</Show>
|
||||
</Show>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
@@ -1723,7 +1733,7 @@ export default function App() {
|
||||
projectMessage={projectMessage()}
|
||||
projectPending={projectPending()}
|
||||
canUpdateProject={canUpdateProject()}
|
||||
onProjectInputChange={(field, value) => setProjectInput((c) => ({ ...c, [field]: value }))}
|
||||
onProjectInputChange={(field, value) => setProjectInput((c) => applySlugField(c, field, value))}
|
||||
onProjectEditInputChange={(field, value) => setProjectEditInput((c) => ({ ...c, [field]: value }))}
|
||||
onCreateProject={createProject}
|
||||
onUpdateProject={updateActiveProject}
|
||||
@@ -1822,7 +1832,7 @@ export default function App() {
|
||||
previewLoading={objectPreview.loading}
|
||||
renameObjectKey={renameObjectKeyInput()}
|
||||
moveDestinationBucketID={moveDestinationBucketID()}
|
||||
onBucketInputChange={(field, value) => setBucketInput((c) => ({ ...c, [field]: value }))}
|
||||
onBucketInputChange={(field, value) => setBucketInput((c) => applySlugField(c, field, value))}
|
||||
onBucketEditInputChange={(field, value) => setBucketEditInput((c) => ({ ...c, [field]: value }))}
|
||||
onCreateBucket={createBucket}
|
||||
onUpdateBucket={updateSelectedBucket}
|
||||
@@ -1859,7 +1869,7 @@ export default function App() {
|
||||
collectionPending={collectionPending()}
|
||||
documentPending={documentPending()}
|
||||
canUpdate={canUpdateProject()}
|
||||
onCollectionInputChange={(field, value) => setCollectionInput((c) => ({ ...c, [field]: value }))}
|
||||
onCollectionInputChange={(field, value) => setCollectionInput((c) => applySlugField(c, field, value))}
|
||||
onCreateCollection={createCollection}
|
||||
onDeleteCollection={deleteCollection}
|
||||
onSelectCollection={setSelectedCollectionID}
|
||||
|
||||
@@ -1096,6 +1096,8 @@ code {
|
||||
/* ---------- page scaffold ---------- */
|
||||
.page {
|
||||
max-width: 72rem;
|
||||
width: 100%;
|
||||
margin-inline: auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1.5rem;
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { applySlugField, slugify } from "../slug";
|
||||
|
||||
describe("slugify", () => {
|
||||
it("derives lowercase hyphenated slugs", () => {
|
||||
expect(slugify("TDvorak")).toBe("tdvorak");
|
||||
expect(slugify("Acme Corporation")).toBe("acme-corporation");
|
||||
expect(slugify(" My_App!! v2 ")).toBe("my-app-v2");
|
||||
});
|
||||
|
||||
it("strips accents and non-ascii characters", () => {
|
||||
expect(slugify("Zürich — Héllo")).toBe("zurich-hello");
|
||||
expect(slugify("日本語")).toBe("");
|
||||
});
|
||||
});
|
||||
|
||||
describe("applySlugField", () => {
|
||||
const form = { name: "", slug: "", description: "" };
|
||||
|
||||
it("fills the slug while it is untouched", () => {
|
||||
const next = applySlugField(form, "name", "My Org");
|
||||
expect(next.slug).toBe("my-org");
|
||||
// keeps following name edits
|
||||
expect(applySlugField(next, "name", "Renamed Org").slug).toBe("renamed-org");
|
||||
});
|
||||
|
||||
it("stops deriving once the slug was hand-edited", () => {
|
||||
const custom = applySlugField(applySlugField(form, "name", "My Org"), "slug", "custom-slug");
|
||||
expect(applySlugField(custom, "name", "New Name").slug).toBe("custom-slug");
|
||||
});
|
||||
|
||||
it("resumes deriving if the slug is cleared", () => {
|
||||
const cleared = applySlugField(applySlugField(form, "name", "My Org"), "slug", "");
|
||||
expect(applySlugField(cleared, "name", "Other").slug).toBe("other");
|
||||
});
|
||||
|
||||
it("sanitizes manual slug edits", () => {
|
||||
expect(applySlugField(form, "slug", "Not A Slug!").slug).toBe("not-a-slug");
|
||||
});
|
||||
|
||||
it("passes through unrelated fields", () => {
|
||||
expect(applySlugField(form, "description", "hi").description).toBe("hi");
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,28 @@
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { render } from 'solid-js/web';
|
||||
import { createSignal } from 'solid-js';
|
||||
import { applySlugField } from '../slug';
|
||||
import { Input } from '../../components/Input';
|
||||
|
||||
describe('slug auto-derive in DOM', () => {
|
||||
it('typing name fills the slug input', async () => {
|
||||
const host = document.createElement('div');
|
||||
document.body.appendChild(host);
|
||||
const [input, setInput] = createSignal({ name: '', slug: '' });
|
||||
const dispose = render(() => (
|
||||
<form>
|
||||
<Input label="Name" value={input().name}
|
||||
onInput={(e) => setInput((c) => applySlugField(c, 'name', e.currentTarget.value))} />
|
||||
<Input label="Slug" value={input().slug}
|
||||
onInput={(e) => setInput((c) => applySlugField(c, 'slug', e.currentTarget.value))} />
|
||||
</form>
|
||||
), host);
|
||||
const [name, slug] = Array.from(host.querySelectorAll('input'));
|
||||
name.value = 'Acme Corp';
|
||||
name.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
expect(slug.value).toBe('acme-corp');
|
||||
dispose();
|
||||
host.remove();
|
||||
});
|
||||
});
|
||||
@@ -216,7 +216,7 @@ let apiKeys: ApiKey[] = [
|
||||
id: "key-1",
|
||||
project_id: "proj-1",
|
||||
name: "Production key",
|
||||
prefix: "pk_live_7f2a",
|
||||
prefix: "prm_7f2a9c",
|
||||
last_used_at: ago(0.2),
|
||||
revoked_at: null,
|
||||
},
|
||||
@@ -224,7 +224,7 @@ let apiKeys: ApiKey[] = [
|
||||
id: "key-2",
|
||||
project_id: "proj-1",
|
||||
name: "CI deploy",
|
||||
prefix: "pk_test_9c41",
|
||||
prefix: "prm_9c41de",
|
||||
last_used_at: ago(2),
|
||||
revoked_at: null,
|
||||
},
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
export function slugify(value: string): string {
|
||||
return value
|
||||
.normalize("NFKD")
|
||||
.replace(/[\u0300-\u036f]/g, "")
|
||||
.toLowerCase()
|
||||
.trim()
|
||||
.replace(/[^a-z0-9]+/g, "-")
|
||||
.replace(/^-+|-+$/g, "")
|
||||
.slice(0, 63);
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies a field edit to a {name, slug, ...} form. While the slug is
|
||||
* untouched — empty or still equal to the derived value — renaming the
|
||||
* entity re-derives its slug. Explicit slug edits are sanitized in place.
|
||||
*/
|
||||
export function applySlugField<T extends { name: string; slug: string }>(
|
||||
current: T,
|
||||
field: string,
|
||||
value: string,
|
||||
): T {
|
||||
if (field === "slug") return { ...current, slug: slugify(value) };
|
||||
if (field === "name" && (current.slug === "" || current.slug === slugify(current.name))) {
|
||||
return { ...current, name: value, slug: slugify(value) };
|
||||
}
|
||||
return { ...current, [field]: value };
|
||||
}
|
||||
@@ -3,4 +3,17 @@ import { render } from "solid-js/web";
|
||||
import App from "./App";
|
||||
import "./index.css";
|
||||
|
||||
// Reload once when an updated service worker takes control. Without this the
|
||||
// precached shell keeps serving the previous release until a manual refresh.
|
||||
// Skipped when the page has no controller yet (first SW install) so first-time
|
||||
// visitors don't get an extra reload.
|
||||
if ("serviceWorker" in navigator && navigator.serviceWorker.controller) {
|
||||
let refreshing = false;
|
||||
navigator.serviceWorker.addEventListener("controllerchange", () => {
|
||||
if (refreshing) return;
|
||||
refreshing = true;
|
||||
window.location.reload();
|
||||
});
|
||||
}
|
||||
|
||||
render(() => <App />, document.getElementById("root")!);
|
||||
@@ -253,7 +253,13 @@ export function CollectionsPage(props: CollectionsPageProps) {
|
||||
title="Create collection"
|
||||
description="Collections store JSON documents scoped to a project."
|
||||
>
|
||||
<form onSubmit={props.onCreateCollection} class="space-y-4">
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
props.onCreateCollection(e);
|
||||
setCreateOpen(false);
|
||||
}}
|
||||
class="space-y-4"
|
||||
>
|
||||
<Input
|
||||
label="Collection name"
|
||||
placeholder="Posts"
|
||||
|
||||
+13
-7
@@ -38,9 +38,12 @@ mkdir -p "$DIR/infra/nginx"
|
||||
cd "$DIR"
|
||||
|
||||
# The compose stack needs exactly these three files from the repo.
|
||||
# Timeouts + retries: a stalled connection must fail loudly, not hang.
|
||||
info "Fetching compose files ($REF)"
|
||||
for f in docker-compose.yml .env.example infra/nginx/default.conf; do
|
||||
curl -fsSL "https://raw.githubusercontent.com/$REPO/$REF/$f" -o "$f"
|
||||
curl -fsSL --connect-timeout 10 --max-time 60 --retry 3 --retry-delay 1 --retry-all-errors \
|
||||
"https://raw.githubusercontent.com/$REPO/$REF/$f" -o "$f" \
|
||||
|| die "could not fetch $f — check connectivity to raw.githubusercontent.com"
|
||||
done
|
||||
|
||||
if [ -f .env ]; then
|
||||
@@ -57,11 +60,13 @@ else
|
||||
if [ -z "$PUBLIC_URL" ]; then
|
||||
DEFAULT_URL="http://localhost"
|
||||
[ "$NGINX_PORT" != "80" ] && DEFAULT_URL="http://localhost:$NGINX_PORT"
|
||||
# Under `curl | bash` stdin is the script pipe — prompt on the
|
||||
# controlling terminal instead. No tty (CI/cron) → default silently.
|
||||
if exec 9</dev/tty 2>/dev/null; then
|
||||
read -rp "URL where you'll open Primora (domain or IP, e.g. https://primora.example.com) [$DEFAULT_URL]: " PUBLIC_URL <&9 || true
|
||||
exec 9>&-
|
||||
# Under `curl | bash` stdin is the script pipe — ask on the controlling
|
||||
# terminal instead. `true </dev/tty` probes the open quietly; read's own
|
||||
# redirect fails non-fatally (default applies) where there is no tty.
|
||||
# Never `exec ... 2>/dev/null` here — exec redirections persist and would
|
||||
# silence stderr, including the read prompt below, for the whole script.
|
||||
if true 2>/dev/null </dev/tty; then
|
||||
read -rp "URL where you'll open Primora (domain or IP, e.g. https://primora.example.com) [$DEFAULT_URL]: " PUBLIC_URL </dev/tty || true
|
||||
fi
|
||||
PUBLIC_URL="${PUBLIC_URL:-$DEFAULT_URL}"
|
||||
fi
|
||||
@@ -129,7 +134,8 @@ if docker pull "ghcr.io/$GHCR_OWNER/primora-backend:latest" \
|
||||
else
|
||||
# GHCR packages are private until first published release — build from source.
|
||||
info "Prebuilt images unavailable; building from source"
|
||||
curl -fsSL "https://codeload.github.com/$REPO/tar.gz/refs/heads/$REF" | tar xz --strip-components=1
|
||||
curl -fsSL --connect-timeout 10 --max-time 120 --retry 3 --retry-delay 1 --retry-all-errors \
|
||||
"https://codeload.github.com/$REPO/tar.gz/refs/heads/$REF" | tar xz --strip-components=1
|
||||
docker compose up -d --build
|
||||
fi
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "primora",
|
||||
"version": "0.8.3",
|
||||
"version": "0.8.5",
|
||||
"private": true,
|
||||
"packageManager": "[email protected]",
|
||||
"workspaces": [
|
||||
|
||||
+24
-7
@@ -48,15 +48,32 @@ fi
|
||||
read -p "🌐 Enter your domain or IP (default: localhost): " DOMAIN
|
||||
DOMAIN=${DOMAIN:-localhost}
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
sed -i '' "s/COOKIE_DOMAIN=localhost/COOKIE_DOMAIN=$DOMAIN/g" .env
|
||||
sed -i '' "s/BETTER_AUTH_URL=http:\/\/localhost/BETTER_AUTH_URL=http:\/\/$DOMAIN/g" .env
|
||||
sed -i '' "s/VITE_APP_URL=http:\/\/localhost/VITE_APP_URL=http:\/\/$DOMAIN/g" .env
|
||||
# Plain HTTP for localhost/IPs; domains are presumed to sit behind a TLS
|
||||
# proxy (see DEPLOYMENT_GUIDE.md — Primora never terminates TLS itself).
|
||||
if [[ "$DOMAIN" == "localhost" || "$DOMAIN" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
SCHEME="http"
|
||||
else
|
||||
sed -i "s/COOKIE_DOMAIN=localhost/COOKIE_DOMAIN=$DOMAIN/g" .env
|
||||
sed -i "s/BETTER_AUTH_URL=http:\/\/localhost/BETTER_AUTH_URL=http:\/\/$DOMAIN/g" .env
|
||||
sed -i "s/VITE_APP_URL=http:\/\/localhost/VITE_APP_URL=http:\/\/$DOMAIN/g" .env
|
||||
SCHEME="https"
|
||||
fi
|
||||
BASE_URL="$SCHEME://$DOMAIN"
|
||||
|
||||
rewrite_env() {
|
||||
# $1 = var name, $2 = new value — anchor to the full line so prior values
|
||||
# (ports, stale paths) are replaced regardless of what .env.example held.
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
sed -i '' "s|^$1=.*|$1=$2|" .env
|
||||
else
|
||||
sed -i "s|^$1=.*|$1=$2|" .env
|
||||
fi
|
||||
}
|
||||
|
||||
rewrite_env AUTH_BASE_URL "$BASE_URL/auth"
|
||||
rewrite_env BETTER_AUTH_URL "$BASE_URL/auth"
|
||||
rewrite_env VITE_APP_URL "$BASE_URL"
|
||||
rewrite_env VITE_AUTH_BASE_URL "$BASE_URL/auth"
|
||||
rewrite_env VITE_API_BASE_URL "$BASE_URL/api/v1"
|
||||
rewrite_env BACKEND_PUBLIC_URL "$BASE_URL/api/v1"
|
||||
rewrite_env COOKIE_DOMAIN "$DOMAIN"
|
||||
|
||||
# Start services — the dev overlay adds mailpit for local email capture.
|
||||
# Production deploys use the base file alone: docker compose up -d
|
||||
|
||||
Reference in new issue
Block a user