Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b09125d18 |
@@ -0,0 +1,22 @@
|
|||||||
|
# anthropic-consumer's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/anthropic-consumer
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc apply/index.ts usage/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/anthropic-consumer/dist /app/modules/anthropic-consumer/dist
|
||||||
|
# No serve-time entrypoints: every container of this module names its command (`run` on a
|
||||||
|
# schedule), so nothing here serves — deliberately no MESH_TOOL_MODULES.
|
||||||
@@ -14,10 +14,19 @@
|
|||||||
"secrets": {
|
"secrets": {
|
||||||
"model-access": "${dir:state}/access-token"
|
"model-access": "${dir:state}/access-token"
|
||||||
},
|
},
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"emits": [
|
"emits": [
|
||||||
"usage.session"
|
"usage.session"
|
||||||
],
|
],
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -37,39 +46,66 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "apply",
|
"id": "apply",
|
||||||
"type": "process",
|
"type": "container",
|
||||||
"name": "anthropic-consumer-apply",
|
"name": "mesh-anthropic-consumer-apply",
|
||||||
"artifact": "code",
|
"network": "host",
|
||||||
"run": [
|
|
||||||
"node",
|
|
||||||
"apply/index.js"
|
|
||||||
],
|
|
||||||
"schedule": "*/5 * * * *",
|
"schedule": "*/5 * * * *",
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/anthropic-consumer/dist/apply/index.js"
|
||||||
|
],
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}:/run/state"
|
||||||
|
],
|
||||||
"env": {
|
"env": {
|
||||||
"MESH_MODEL_ACCESS_SECRET_FILE": "${dir:state}/access-token",
|
"MESH_MODEL_ACCESS_SECRET_FILE": "/run/state/access-token",
|
||||||
"MESH_MODEL_ACCESS_BIND_FILE": "${dir:state}/model.json",
|
"MESH_MODEL_ACCESS_BIND_FILE": "/run/state/model.json",
|
||||||
"MESH_CLAUDE_CREDENTIALS_FILE": "${dir:state}/claude/.credentials.json",
|
"MESH_CLAUDE_CREDENTIALS_FILE": "/run/state/claude/.credentials.json",
|
||||||
"MESH_CLAUDE_IDENTITY_FILE": "${dir:state}/claude/.claude.json"
|
"MESH_CLAUDE_IDENTITY_FILE": "/run/state/claude/.claude.json"
|
||||||
}
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "usage",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-anthropic-consumer-usage",
|
||||||
|
"network": "host",
|
||||||
|
"schedule": "*/5 * * * *",
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/anthropic-consumer/dist/usage/index.js"
|
||||||
|
],
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:state}:/run/state"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_CLAUDE_PROJECTS_DIR": "/run/state/claude/projects",
|
||||||
|
"MESH_ANTHROPIC_USAGE_OUT": "/run/state/out/session-usage.json",
|
||||||
|
"MESH_TOOLS_MAIN": "/app/dist/main.js"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"apply/index.js",
|
|
||||||
"usage/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"usage/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_CLAUDE_PROJECTS_DIR": "${dir:state}/claude/projects",
|
|
||||||
"MESH_ANTHROPIC_USAGE_OUT": "${dir:state}/out/session-usage.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,12 @@
|
|||||||
// per session. The consumer IS the (node,module) session's fixed binding, so no per-message account
|
// per session. The consumer IS the (node,module) session's fixed binding, so no per-message account
|
||||||
// attribution is done — just the totals (port map "don't-map" #3).
|
// attribution is done — just the totals (port map "don't-map" #3).
|
||||||
//
|
//
|
||||||
// Runs in the node's runtime (novox/hq ADR 0198), every five minutes, so events are emitted through
|
// Runs as `mesh-tools run` (no broker), so events are emitted best-effort via the sibling mesh-tools
|
||||||
// the runtime as this module; the totals are also written to a file so the reading is observable
|
// `emit` primitive; the totals are also written to a file so the reading is observable without one.
|
||||||
// without one.
|
|
||||||
|
|
||||||
import { readdirSync, statSync, readFileSync, writeFileSync, renameSync, mkdirSync } from "node:fs";
|
import { readdirSync, statSync, readFileSync, writeFileSync, renameSync, mkdirSync } from "node:fs";
|
||||||
import { join, dirname } from "node:path";
|
import { join, dirname } from "node:path";
|
||||||
|
|
||||||
import { emit } from "@novox/mesh-sdk/events";
|
|
||||||
|
|
||||||
import { readSessionFile, type SessionUsage } from "../transcript.js";
|
import { readSessionFile, type SessionUsage } from "../transcript.js";
|
||||||
|
|
||||||
/** The vendor-neutral usage row ADR 0054 fixes — the shape the model-usage store upserts. Kept local
|
/** The vendor-neutral usage row ADR 0054 fixes — the shape the model-usage store upserts. Kept local
|
||||||
@@ -119,20 +116,22 @@ function atomicWrite(path: string, content: string): void {
|
|||||||
renameSync(tmp, path);
|
renameSync(tmp, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Emit best-effort through the runtime: a reading that could not be announced is still in the file. */
|
/** Emit best-effort via the sibling mesh-tools `emit`, which wires a broker a run step has none. */
|
||||||
async function emitUsage(body: Record<string, unknown>): Promise<void> {
|
async function emitUsage(body: Record<string, unknown>): Promise<void> {
|
||||||
try {
|
const main = process.env.MESH_TOOLS_MAIN ?? "/app/dist/main.js";
|
||||||
await emit("usage.session", body);
|
const { spawn } = await import("node:child_process");
|
||||||
} catch (err) {
|
await new Promise<void>((resolve) => {
|
||||||
console.error(`[anthropic-consumer] could not emit usage: ${err}`);
|
const child = spawn(
|
||||||
}
|
process.execPath,
|
||||||
|
[main, "emit", "usage.session", JSON.stringify(body)],
|
||||||
|
{ stdio: "inherit" },
|
||||||
|
);
|
||||||
|
child.on("exit", () => resolve());
|
||||||
|
child.on("error", (err) => {
|
||||||
|
console.error(`[anthropic-consumer] could not emit usage: ${err}`);
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// The cadence the scheduled container had: once at start, then every five minutes. Not awaited, so the
|
await main();
|
||||||
// runtime's handshake is answered while a long first reading is still under way.
|
|
||||||
const EVERY_MS = 5 * 60 * 1000;
|
|
||||||
const tick = (): void => {
|
|
||||||
void main().catch((err) => console.error(`[anthropic-consumer] usage reading failed: ${err}`));
|
|
||||||
};
|
|
||||||
tick();
|
|
||||||
setInterval(tick, EVERY_MS);
|
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# audit-logger's runtime: the shared runtime image, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The toolkit is in the base image, so
|
||||||
|
# nothing is copied out of a neighbouring checkout — which is what lets the mesh build this from a
|
||||||
|
# repository and a path (novox/hq ADR 0069) rather than only on a workstation that happens to have
|
||||||
|
# the siblings laid out beside it.
|
||||||
|
|
||||||
|
# Two bases, named rather than pinned: the image this is COMPILED in, and the image it RUNS in.
|
||||||
|
# They are different images on purpose — the first carries a compiler and the second must not, or
|
||||||
|
# every running container would carry one it never invokes. The mesh answers both with the copies it
|
||||||
|
# holds, because a fingerprint written here would name one particular copy and no other mesh has it
|
||||||
|
# (novox/hq issue 044). Declared in module.json's `build.on`; deliberately no defaults, so a build
|
||||||
|
# nobody told stops here and says which module to build first.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the toolkit it will run against.
|
||||||
|
WORKDIR /app/modules/audit-logger
|
||||||
|
COPY . .
|
||||||
|
# The compiler is invoked by its real path rather than through node_modules/.bin, whose entries are
|
||||||
|
# symlinks to a launcher that requires its library relatively — resolved away when the base image
|
||||||
|
# was assembled.
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc audit.ts index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/audit-logger/dist /app/modules/audit-logger/dist
|
||||||
|
# **Served, not run.** This subscribes on import, and the serve mode binds the broker before it
|
||||||
|
# imports anything — `run` exists for a step that works offline and exits, and would leave this
|
||||||
|
# with nothing to subscribe to.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/audit-logger/dist/index.js
|
||||||
@@ -5,21 +5,27 @@
|
|||||||
"consumes": [
|
"consumes": [
|
||||||
"**"
|
"**"
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:state}/broker"
|
||||||
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"AUDIT_LOG": "${dir:trail}/audit.log"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -34,6 +40,21 @@
|
|||||||
"id": "trail",
|
"id": "trail",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
"mode": "0700"
|
"mode": "0700"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "run",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-audit-logger",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:trail}:/trail"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"AUDIT_LOG": "/trail/audit.log"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# baserow's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/baserow
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/baserow/dist /app/modules/baserow/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/baserow/dist/tools/index.js
|
||||||
+36
-14
@@ -25,7 +25,8 @@
|
|||||||
"postgres-database": "${dir:state}/database.secret"
|
"postgres-database": "${dir:state}/database.secret"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"admin": "${dir:state}/admin.secret"
|
"admin": "${dir:state}/admin.secret",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
@@ -91,24 +92,45 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{\n \"password\": \"${secret:admin}\",\n \"host\": \"${bound:route:name}\"\n}\n",
|
"content": "{\n \"password\": \"${secret:admin}\",\n \"host\": \"${bound:route:name}\"\n}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-baserow",
|
||||||
|
"network": "baserow",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_BASEROW_URL": "http://baserow:80",
|
||||||
|
"MESH_BASEROW_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_BASEROW_URL": "http://127.0.0.1:${port:80}",
|
|
||||||
"MESH_BASEROW_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
# build-agent
|
|
||||||
|
|
||||||
The mesh's build machine as a role every machine can hold (novox/hq ADR 0190). It holds the node seat
|
|
||||||
`node-build-agent`: every holder pulls one build at a time from the role's one work queue when it is
|
|
||||||
idle, so a tier of many images is built by as many machines as hold the seat and are online, and a
|
|
||||||
machine that is off builds nothing and blocks nothing. The controller asks the role, never a machine;
|
|
||||||
the outcome names the machine that built it.
|
|
||||||
|
|
||||||
What a holding machine needs is what the builder always needed, said here once: a container runtime
|
|
||||||
(the socket is mounted), the artifact store and the package registry as provisions, a workspace, and
|
|
||||||
the bus credential. The code is `cmd/mesh-builder` in the mesh-controller repository, compiled from
|
|
||||||
that repository's main (`build.artifacts[].context`); this module ships the packaging.
|
|
||||||
|
|
||||||
Assign it to every machine with a container runtime. It replaces `builder`, the one-holder form of the
|
|
||||||
same thing; retire that once this is assigned where it was.
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
ARG GO_BASE
|
ARG GO_BASE
|
||||||
ARG ALPINE_BASE
|
ARG ALPINE_BASE
|
||||||
# build-agent's image: the build machine itself, compiled into a container (novox/hq ADR 0190).
|
# builder's own image: the build machine itself, compiled into a container.
|
||||||
#
|
#
|
||||||
# **The source is not vendored here.** builder's actual code — cmd/mesh-builder, internal/builder,
|
# **The source is not vendored here.** builder's actual code — cmd/mesh-builder, internal/builder,
|
||||||
# internal/catalogue — lives in the mesh-controller repository, the same control plane it is one
|
# internal/catalogue — lives in the mesh-controller repository, the same control plane it is one
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
{
|
{
|
||||||
"module": "build-agent",
|
"module": "builder",
|
||||||
"version": "1",
|
"version": "1",
|
||||||
"slug": "agent",
|
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"claims": [
|
"claims": [
|
||||||
{
|
{
|
||||||
"name": "node-build-agent",
|
"name": "mesh-build-machine",
|
||||||
"scope": "node"
|
"scope": "mesh"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -37,19 +36,19 @@
|
|||||||
"mode": "0700"
|
"mode": "0700"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "agent-env",
|
"id": "builder-env",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "${dir:mesh-state}/build-agent.env",
|
"path": "${dir:mesh-state}/builder.env",
|
||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "MESH_BROKER_FILE=/run/mesh/broker\nMESH_NODE=${machine:name}\nMESH_REGISTRY=${bound:artifact-store:at}:${bound:artifact-store:port}\nMESH_PACKAGE_BINDING=/run/mesh/package-registry.json\nMESH_NPM_TOKEN_FILE=/run/mesh/package-registry.secret\nMESH_WORKSPACE=${dir:workspace}\n"
|
"content": "MESH_BROKER_FILE=/run/mesh/broker\nMESH_NODE=${machine:name}\nMESH_REGISTRY=${bound:artifact-store:at}:${bound:artifact-store:port}\nMESH_PACKAGE_BINDING=/run/mesh/package-registry.json\nMESH_NPM_TOKEN_FILE=/run/mesh/package-registry.secret\nMESH_WORKSPACE=${dir:workspace}\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "server",
|
"id": "server",
|
||||||
"type": "container",
|
"type": "container",
|
||||||
"name": "mesh-build-agent",
|
"name": "mesh-builder",
|
||||||
"artifact": "server",
|
"artifact": "server",
|
||||||
"env-file": [
|
"env-file": [
|
||||||
"${dir:mesh-state}/build-agent.env"
|
"${dir:mesh-state}/builder.env"
|
||||||
],
|
],
|
||||||
"volumes": [
|
"volumes": [
|
||||||
"${dir:mesh-state}:/run/mesh:ro",
|
"${dir:mesh-state}:/run/mesh:ro",
|
||||||
@@ -57,7 +56,7 @@
|
|||||||
"/var/run/docker.sock:/var/run/docker.sock"
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
],
|
],
|
||||||
"restart-on": [
|
"restart-on": [
|
||||||
"agent-env"
|
"builder-env"
|
||||||
],
|
],
|
||||||
"network": "host"
|
"network": "host"
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# cloudflare-dns's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/cloudflare-dns
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts provisioner/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/cloudflare-dns/dist /app/modules/cloudflare-dns/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/cloudflare-dns/dist/tools/index.js,/app/modules/cloudflare-dns/dist/provisioner/index.js
|
||||||
@@ -18,13 +18,20 @@
|
|||||||
"public-dns": "${dir:grants}/mesh.json"
|
"public-dns": "${dir:grants}/mesh.json"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"token": "${dir:state}/token"
|
"token": "${dir:state}/token",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"emits": [
|
"emits": [
|
||||||
"record.created",
|
"record.created",
|
||||||
"record.removed"
|
"record.removed"
|
||||||
],
|
],
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -43,30 +50,48 @@
|
|||||||
"merge": "json",
|
"merge": "json",
|
||||||
"content": "{}",
|
"content": "{}",
|
||||||
"mode": "0600"
|
"mode": "0600"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-cloudflare-dns",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:grants}:/grants",
|
||||||
|
"${dir:state}/token:/run/secrets/token:ro",
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_CLOUDFLARE_TOKEN_FILE": "/run/secrets/token",
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_CLOUDFLARE_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_RECEIVES": "/var/lib/cloudflare-dns/grants/mesh.json"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_CLOUDFLARE_TOKEN_FILE": "${dir:state}/token",
|
|
||||||
"MESH_CLOUDFLARE_CONFIG_FILE": "${dir:state}/config.json",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# confluence's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/confluence
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/confluence/dist /app/modules/confluence/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/confluence/dist/tools/index.js
|
||||||
@@ -3,9 +3,16 @@
|
|||||||
"version": "1",
|
"version": "1",
|
||||||
"slug": "confl",
|
"slug": "confl",
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"token": "${dir:state}/token"
|
"token": "${dir:state}/token",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -19,27 +26,46 @@
|
|||||||
"merge": "json",
|
"merge": "json",
|
||||||
"content": "{}",
|
"content": "{}",
|
||||||
"mode": "0600"
|
"mode": "0600"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-runtime-confluence",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:state}/token:/run/secrets/token:ro",
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_CONFLUENCE_TOKEN_FILE": "/run/secrets/token",
|
||||||
|
"MESH_CONFLUENCE_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_CONFLUENCE_TOKEN_FILE": "${dir:state}/token",
|
|
||||||
"MESH_CONFLUENCE_CONFIG_FILE": "${dir:state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,23 @@
|
|||||||
|
# fail2ban's runtime: the tool runtime, carrying the intrusion prevention's verbs and the client they
|
||||||
|
# speak through.
|
||||||
|
#
|
||||||
|
# Built from this module's own directory and nothing else (novox/hq ADR 0069). Two bases, named in
|
||||||
|
# module.json's `build.on`: the image this is compiled in and the image it runs in.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/fail2ban
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
# The daemon runs on the machine, declared by this module; what runs here is only its client, which
|
||||||
|
# speaks to the daemon over the socket the machine shares into this container (novox/hq ADR 0179).
|
||||||
|
# The package brings the client and the daemon together; the daemon is never started here.
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends fail2ban \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
COPY --from=build /app/modules/fail2ban/dist /app/modules/fail2ban/dist
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/fail2ban/dist/tools/index.js
|
||||||
@@ -5,15 +5,12 @@
|
|||||||
// prevention seat's four verbs (ADR 0179). The daemon's state is fail2ban's, not the mesh's: the
|
// prevention seat's four verbs (ADR 0179). The daemon's state is fail2ban's, not the mesh's: the
|
||||||
// mesh composes the jails and never writes the ban list.
|
// mesh composes the jails and never writes the ban list.
|
||||||
//
|
//
|
||||||
// Spoken through fail2ban-client over the daemon's socket. Client and daemon come from the one
|
// Spoken through fail2ban-client over the daemon's socket, which the machine shares into this
|
||||||
// package this module declares on the machine, and the socket is root's: root is the module's
|
// runtime; so the client here is the one from the runtime's own package and the daemon is the
|
||||||
// concern (ADR 0175 §4), and the runtime loading this bundle runs as the operator's account (to-be
|
// machine's, and the two meet at /var/run/fail2ban/fail2ban.sock.
|
||||||
// 38 WP4), so the client is run through sudo without a prompt where the account is not root.
|
|
||||||
|
|
||||||
import { execFile } from "node:child_process";
|
import { execFile } from "node:child_process";
|
||||||
import { accessSync, constants } from "node:fs";
|
|
||||||
import { isIP } from "node:net";
|
import { isIP } from "node:net";
|
||||||
import { delimiter, join } from "node:path";
|
|
||||||
import { promisify } from "node:util";
|
import { promisify } from "node:util";
|
||||||
|
|
||||||
const execFileP = promisify(execFile);
|
const execFileP = promisify(execFile);
|
||||||
@@ -21,44 +18,16 @@ const execFileP = promisify(execFile);
|
|||||||
/** A command runner, so the verbs can be tested without a daemon. */
|
/** A command runner, so the verbs can be tested without a daemon. */
|
||||||
export type Runner = (cmd: string, args: string[]) => Promise<string>;
|
export type Runner = (cmd: string, args: string[]) => Promise<string>;
|
||||||
|
|
||||||
/** The command as it is run: as given when this process is root, else through sudo without a
|
|
||||||
* prompt. The daemon's socket answers only to root. */
|
|
||||||
export function escalated(cmd: string, args: string[], uid: number | undefined = process.getuid?.()): [string, string[]] {
|
|
||||||
if (uid === 0) return [cmd, args];
|
|
||||||
return ["sudo", ["-n", cmd, ...args]];
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Whether a tool is on this machine: an executable of that name on the path, or where the
|
|
||||||
* system keeps its administration. */
|
|
||||||
export function installed(tool: string, path: string = process.env.PATH ?? ""): boolean {
|
|
||||||
const dirs = [...path.split(delimiter), "/usr/sbin", "/sbin", "/usr/bin"].filter((d) => d !== "");
|
|
||||||
return dirs.some((dir) => {
|
|
||||||
try {
|
|
||||||
accessSync(join(dir, tool), constants.X_OK);
|
|
||||||
return true;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export const execRunner: Runner = async (cmd, args) => {
|
export const execRunner: Runner = async (cmd, args) => {
|
||||||
if (!installed(cmd)) throw new Error(`${cmd} is not installed on this machine`);
|
|
||||||
const [program, argv] = escalated(cmd, args);
|
|
||||||
try {
|
try {
|
||||||
const { stdout } = await execFileP(program, argv, { maxBuffer: 16 * 1024 * 1024 });
|
const { stdout } = await execFileP(cmd, args, { maxBuffer: 16 * 1024 * 1024 });
|
||||||
return stdout;
|
return stdout;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const e = err as { code?: string | number; stderr?: string; stdout?: string; message?: string };
|
const e = err as { code?: string | number; stderr?: string; stdout?: string; message?: string };
|
||||||
const said = `${e.stdout ?? ""}${e.stderr ?? ""}`.trim();
|
const said = `${e.stdout ?? ""}${e.stderr ?? ""}`.trim();
|
||||||
// What failed is named by how it failed: sudo missing is a spawn error, sudo refusing speaks
|
if (e.code === "ENOENT") throw new Error(`${cmd} is not in this runtime`);
|
||||||
// on its own stderr line, and the rest is the client's own answer.
|
if (/Failed to access socket path|Is fail2ban running/i.test(said)) {
|
||||||
if (program === "sudo") {
|
throw new Error("fail2ban is not running on this machine, or its socket is not shared with this runtime");
|
||||||
if (e.code === "ENOENT") throw new Error(`${cmd} needs root, and sudo is not installed here for the runtime's account to escalate with`);
|
|
||||||
if (/^sudo:/m.test(said)) throw new Error(`${cmd} needs root and the runtime's account may not run it without a prompt: ${said}`);
|
|
||||||
}
|
|
||||||
if (/Failed to access socket path|Is fail2ban running|Permission denied to socket/i.test(said)) {
|
|
||||||
throw new Error("fail2ban is not running on this machine, or its socket does not answer the runtime's account");
|
|
||||||
}
|
}
|
||||||
// fail2ban-client's own last line is the one a person reads ("Sorry but the jail 'x' does not exist").
|
// fail2ban-client's own last line is the one a person reads ("Sorry but the jail 'x' does not exist").
|
||||||
const lines = said.split("\n").map((l) => l.trim()).filter(Boolean);
|
const lines = said.split("\n").map((l) => l.trim()).filter(Boolean);
|
||||||
@@ -107,8 +76,7 @@ export class Fail2banClient {
|
|||||||
this.run = run;
|
this.run = run;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The daemon as this machine has it, through its own client. */
|
static fromEnv(_env: NodeJS.ProcessEnv = process.env): Fail2banClient {
|
||||||
static onThisMachine(): Fail2banClient {
|
|
||||||
return new Fail2banClient();
|
return new Fail2banClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,9 @@
|
|||||||
"tools": [
|
"tools": [
|
||||||
"fail2ban_settings"
|
"fail2ban_settings"
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"jailing": {
|
"jailing": {
|
||||||
"into": "/etc/fail2ban/jail.d/mesh.conf",
|
"into": "/etc/fail2ban/jail.d/mesh.conf",
|
||||||
"filter-into": "/etc/fail2ban/filter.d"
|
"filter-into": "/etc/fail2ban/filter.d"
|
||||||
@@ -53,6 +56,12 @@
|
|||||||
"path": "/var/run/fail2ban",
|
"path": "/var/run/fail2ban",
|
||||||
"mode": "0755"
|
"mode": "0755"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "jail-local",
|
"id": "jail-local",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
@@ -109,17 +118,40 @@
|
|||||||
"action-dualchain",
|
"action-dualchain",
|
||||||
"composed-jails"
|
"composed-jails"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-fail2ban",
|
||||||
|
"artifact": "runtime",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"/var/run/fail2ban:/var/run/fail2ban"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"typescript": "^5.6.0"
|
"typescript": "^5.6.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc client.ts tools/index.ts --module NodeNext --moduleResolution NodeNext --target ES2022 --rootDir . --outDir dist",
|
"build": "tsc client.ts tools/index.ts --module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist",
|
||||||
"test": "node --test --experimental-strip-types 'test/*.test.ts'"
|
"test": "node --test --experimental-strip-types 'test/*.test.ts'"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// on the control node on 2026-10-02 (novox/hq ADR 0179).
|
// on the control node on 2026-10-02 (novox/hq ADR 0179).
|
||||||
import { test } from "node:test";
|
import { test } from "node:test";
|
||||||
import assert from "node:assert/strict";
|
import assert from "node:assert/strict";
|
||||||
import { Fail2banClient, escalated, installed, parseBans, parseJailStatus, type Runner } from "../client.ts";
|
import { Fail2banClient, parseBans, parseJailStatus, type Runner } from "../client.ts";
|
||||||
|
|
||||||
const STATUS = "Status\n|- Number of jail:\t2\n`- Jail list:\trecidive, sshd\n";
|
const STATUS = "Status\n|- Number of jail:\t2\n`- Jail list:\trecidive, sshd\n";
|
||||||
const RECIDIVE =
|
const RECIDIVE =
|
||||||
@@ -104,11 +104,3 @@ test("a jail's settings are read from the daemon's listings", async () => {
|
|||||||
logpath: [], journalmatch: "_SYSTEMD_UNIT=sshd.service + _COMM=sshd",
|
logpath: [], journalmatch: "_SYSTEMD_UNIT=sshd.service + _COMM=sshd",
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
test("the client runs as given by root and through sudo without a prompt by anyone else", () => {
|
|
||||||
assert.deepEqual(escalated("fail2ban-client", ["status"], 0), ["fail2ban-client", ["status"]]);
|
|
||||||
assert.deepEqual(escalated("fail2ban-client", ["set", "sshd", "banip", "198.51.100.7"], 1000),
|
|
||||||
["sudo", ["-n", "fail2ban-client", "set", "sshd", "banip", "198.51.100.7"]]);
|
|
||||||
assert.equal(installed("sh"), true);
|
|
||||||
assert.equal(installed("no-such-client-of-the-mesh"), false);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ export function getFail2banTools(fail2ban: Fail2banClient): ToolDefinition[] {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
const fail2ban = Fail2banClient.onThisMachine();
|
const fail2ban = Fail2banClient.fromEnv();
|
||||||
// The seat's verbs under the seat's name: the runtime serves them on the seat's subjects where this
|
// The seat's verbs under the seat's name: the runtime serves them on the seat's subjects where this
|
||||||
// module holds it (ADR 0159, 0160). The module's own under its own.
|
// module holds it (ADR 0159, 0160). The module's own under its own.
|
||||||
registerModuleTools("node-intrusion-prevention", () => getSeatVerbs(fail2ban));
|
registerModuleTools("node-intrusion-prevention", () => getSeatVerbs(fail2ban));
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# gitea's runtime: the tool runtime, carrying this module's compiled provisioner, tools and event
|
||||||
|
# consumer.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk is in the base image, so
|
||||||
|
# nothing is copied out of a neighbouring checkout — which is what lets the mesh build this from a
|
||||||
|
# repository and a path (novox/hq ADR 0069) rather than only on a workstation that happens to have
|
||||||
|
# the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned: the image this is COMPILED in, and the image it RUNS in.
|
||||||
|
# They are different images on purpose — the first carries a compiler and the second must not, or
|
||||||
|
# every running container would carry one it never invokes. The mesh answers both with the copies it
|
||||||
|
# holds, because a fingerprint written here would name one particular copy and no other mesh has it
|
||||||
|
# (novox/hq issue 044). Declared in module.json's `build.on`; deliberately no defaults, so a build
|
||||||
|
# nobody told stops here and says which module to build first.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against.
|
||||||
|
WORKDIR /app/modules/gitea
|
||||||
|
COPY . .
|
||||||
|
# The compiler is invoked by its real path rather than through node_modules/.bin, whose entries are
|
||||||
|
# symlinks to a launcher that requires its library relatively — resolved away when the base image
|
||||||
|
# was assembled.
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts token.ts index.ts provisioner/index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
# **No apt packages.** gitea's provisioner talks to the forge over HTTP (the gitea REST API), not
|
||||||
|
# through a CLI the way postgres drives psql — so the runtime base holds everything this needs.
|
||||||
|
COPY --from=build /app/modules/gitea/dist /app/modules/gitea/dist
|
||||||
|
# What a tool host should load from this module: its event consumer and its tools, which are
|
||||||
|
# separate entrypoints because they are loaded by different things. The provisioner is the third,
|
||||||
|
# and is not listed here — the declaration names it in the container's `args`, because it is what
|
||||||
|
# this module's own container runs. One image, because they are one module and share a client.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/gitea/dist/index.js,/app/modules/gitea/dist/tools/index.js,/app/modules/gitea/dist/provisioner/index.js
|
||||||
+45
-22
@@ -85,6 +85,9 @@
|
|||||||
"scope": "mesh"
|
"scope": "mesh"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
"id": "mesh-state",
|
"id": "mesh-state",
|
||||||
@@ -177,6 +180,32 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{}\n",
|
"content": "{}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-gitea",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro",
|
||||||
|
"${dir:state}/admin.secret:/run/secrets/admin:ro",
|
||||||
|
"${dir:runtime-state}:/run/state"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_GITEA_URL": "http://127.0.0.1:${port:3000}",
|
||||||
|
"MESH_GITEA_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_GITEA_ADMIN_USER": "mesh-admin",
|
||||||
|
"MESH_GITEA_ADMIN_PASSWORD_FILE": "/run/secrets/admin",
|
||||||
|
"MESH_GITEA_STATE_DIR": "/run/state",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/npm.json"
|
||||||
|
},
|
||||||
|
"artifact": "runtime",
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"provides": [
|
"provides": [
|
||||||
@@ -190,36 +219,30 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_GITEA_URL": "http://127.0.0.1:${port:3000}",
|
|
||||||
"MESH_GITEA_CONFIG_FILE": "${dir:mesh-state}/config.json",
|
|
||||||
"MESH_GITEA_ADMIN_USER": "mesh-admin",
|
|
||||||
"MESH_GITEA_ADMIN_PASSWORD_FILE": "${dir:state}/admin.secret",
|
|
||||||
"MESH_GITEA_STATE_DIR": "${dir:runtime-state}",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/npm.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"jails": [
|
"jails": [
|
||||||
{
|
{
|
||||||
"name": "gitea",
|
"name": "gitea",
|
||||||
"failregex": "^.*Failed authentication attempt for .* from <HOST>(?::\\d+)?\\s*$\n ^.*Invalid user .* from <HOST> port \\d+\\s*$\n ^.*User \\S+ from <HOST> not allowed because .*$",
|
"failregex": "^.*Failed authentication attempt for .* from <HOST>(?::\\d+)?\\s*$",
|
||||||
"jail": "backend = systemd\njournalmatch = CONTAINER_NAME=gitea\nport = http,https,222\nmaxretry = 3\nfindtime = 1d\nbantime = 1d"
|
"jail": "backend = systemd\njournalmatch = CONTAINER_NAME=gitea\nport = http,https,222\nmaxretry = 3\nfindtime = 1d\nbantime = 1d"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# gitlab's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/gitlab
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/gitlab/dist /app/modules/gitlab/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/gitlab/dist/tools/index.js
|
||||||
+40
-14
@@ -2,9 +2,16 @@
|
|||||||
"module": "gitlab",
|
"module": "gitlab",
|
||||||
"version": "1",
|
"version": "1",
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"token": "${dir:state}/token"
|
"token": "${dir:state}/token",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -18,27 +25,46 @@
|
|||||||
"merge": "json",
|
"merge": "json",
|
||||||
"content": "{}",
|
"content": "{}",
|
||||||
"mode": "0600"
|
"mode": "0600"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-runtime-gitlab",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:state}/token:/run/secrets/token:ro",
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_GITLAB_TOKEN_FILE": "/run/secrets/token",
|
||||||
|
"MESH_GITLAB_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_GITLAB_TOKEN_FILE": "${dir:state}/token",
|
|
||||||
"MESH_GITLAB_CONFIG_FILE": "${dir:state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# grafana's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/grafana
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/grafana/dist /app/modules/grafana/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/grafana/dist/index.js,/app/modules/grafana/dist/tools/index.js
|
||||||
+36
-16
@@ -5,7 +5,8 @@
|
|||||||
"alert.firing"
|
"alert.firing"
|
||||||
],
|
],
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"admin": "${dir:mesh-state}/admin"
|
"admin": "${dir:mesh-state}/admin",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
@@ -111,6 +112,25 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{\n \"user\": \"admin\",\n \"password\": \"${secret:admin}\"\n}\n",
|
"content": "{\n \"user\": \"admin\",\n \"password\": \"${secret:admin}\"\n}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-grafana",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_GRAFANA_URL": "http://127.0.0.1:${port:3000}",
|
||||||
|
"MESH_GRAFANA_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -142,23 +162,23 @@
|
|||||||
"influxdb-api": "${dir:mesh-state}/influxdb-api"
|
"influxdb-api": "${dir:mesh-state}/influxdb-api"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_GRAFANA_URL": "http://127.0.0.1:${port:3000}",
|
|
||||||
"MESH_GRAFANA_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# home-assistant's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/home-assistant
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts tools/index.ts provisions/hass.ts provisions/probe.ts provisions/connections.ts provisions/mesh.ts provisions/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/home-assistant/dist /app/modules/home-assistant/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/home-assistant/dist/index.js,/app/modules/home-assistant/dist/tools/index.js
|
||||||
|
# NOT dist/provisions/index.js: that is a step the host runs to completion, named by the
|
||||||
|
# `provisions` container's args as `mesh-tools run …` (novox/hq ADR 0052). Listed here it would run
|
||||||
|
# inside the serving sidecar too, and exit it.
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
"state.changed"
|
"state.changed"
|
||||||
],
|
],
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker",
|
||||||
"token": "${dir:mesh-state}/token"
|
"token": "${dir:mesh-state}/token"
|
||||||
},
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
@@ -79,27 +80,55 @@
|
|||||||
"merge": "json"
|
"merge": "json"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "provisions-env",
|
"id": "runtime",
|
||||||
"type": "file",
|
"type": "container",
|
||||||
"path": "${dir:state}/provisions.env",
|
"name": "mesh-home-assistant",
|
||||||
"mode": "0600",
|
"network": "host",
|
||||||
"content": "MESH_HOMEASSISTANT_URL=http://127.0.0.1:${port:8123}\nMESH_HOMEASSISTANT_TOKEN_FILE=${dir:mesh-state}/token\nMESH_PROVISIONS_DIR=${dir:state}\nMESH_WRITTEN_DIR=${dir:written}\n"
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/token:/run/secrets/token:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_HOMEASSISTANT_URL": "http://127.0.0.1:${port:8123}",
|
||||||
|
"MESH_HOMEASSISTANT_TOKEN_FILE": "/run/secrets/token",
|
||||||
|
"MESH_HOMEASSISTANT_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "provisions",
|
"id": "provisions",
|
||||||
"type": "process",
|
"type": "container",
|
||||||
"name": "home-assistant-provisions",
|
"name": "mesh-home-assistant-provisions",
|
||||||
"artifact": "code",
|
"network": "host",
|
||||||
"run": [
|
|
||||||
"node",
|
|
||||||
"provisions/index.js"
|
|
||||||
],
|
|
||||||
"run-once": true,
|
"run-once": true,
|
||||||
"env-file": [
|
"volumes": [
|
||||||
"${dir:state}/provisions.env"
|
"${dir:mesh-state}/token:/run/secrets/token:ro",
|
||||||
|
"${dir:written}:/var/lib/home-assistant-provisions",
|
||||||
|
"${dir:state}/mqtt-topic.json:/run/provisions/mqtt-topic.json:ro",
|
||||||
|
"${dir:state}/mqtt-topic.secret:/run/provisions/mqtt-topic.secret:ro",
|
||||||
|
"${dir:state}/sonarr-api.json:/run/provisions/sonarr-api.json:ro",
|
||||||
|
"${dir:state}/sonarr-api.secret:/run/provisions/sonarr-api.secret:ro",
|
||||||
|
"${dir:state}/radarr-api.json:/run/provisions/radarr-api.json:ro",
|
||||||
|
"${dir:state}/radarr-api.secret:/run/provisions/radarr-api.secret:ro",
|
||||||
|
"${dir:state}/lidarr-api.json:/run/provisions/lidarr-api.json:ro",
|
||||||
|
"${dir:state}/lidarr-api.secret:/run/provisions/lidarr-api.secret:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_HOMEASSISTANT_URL": "http://127.0.0.1:${port:8123}",
|
||||||
|
"MESH_HOMEASSISTANT_TOKEN_FILE": "/run/secrets/token",
|
||||||
|
"MESH_PROVISIONS_DIR": "/run/provisions",
|
||||||
|
"MESH_WRITTEN_DIR": "/var/lib/home-assistant-provisions"
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/home-assistant/dist/provisions/index.js"
|
||||||
],
|
],
|
||||||
"restart-on": [
|
"restart-on": [
|
||||||
"provisions-env",
|
|
||||||
"bound-mqtt-topic",
|
"bound-mqtt-topic",
|
||||||
"secret-mqtt-topic",
|
"secret-mqtt-topic",
|
||||||
"bound-sonarr-api",
|
"bound-sonarr-api",
|
||||||
@@ -108,7 +137,8 @@
|
|||||||
"secret-radarr-api",
|
"secret-radarr-api",
|
||||||
"bound-lidarr-api",
|
"bound-lidarr-api",
|
||||||
"secret-lidarr-api"
|
"secret-lidarr-api"
|
||||||
]
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -143,25 +173,23 @@
|
|||||||
"lidarr-api": "${dir:state}/lidarr-api.secret"
|
"lidarr-api": "${dir:state}/lidarr-api.secret"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisions/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_HOMEASSISTANT_URL": "http://127.0.0.1:${port:8123}",
|
|
||||||
"MESH_HOMEASSISTANT_TOKEN_FILE": "${dir:mesh-state}/token",
|
|
||||||
"MESH_HOMEASSISTANT_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# icecast's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/icecast
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/icecast/dist /app/modules/icecast/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/icecast/dist/index.js,/app/modules/icecast/dist/tools/index.js
|
||||||
+37
-15
@@ -28,6 +28,9 @@
|
|||||||
"stream.started",
|
"stream.started",
|
||||||
"stream.stopped"
|
"stream.stopped"
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
"name": "stream",
|
"name": "stream",
|
||||||
@@ -92,26 +95,45 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{}\n",
|
"content": "{}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-icecast",
|
||||||
|
"network": "icecast",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_ICECAST_URL": "http://icecast:8000",
|
||||||
|
"MESH_ICECAST_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_ICECAST_URL": "http://127.0.0.1:${port:8000}",
|
|
||||||
"MESH_ICECAST_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# influxdb's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/influxdb
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts grants.ts provisioner/index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/influxdb/dist /app/modules/influxdb/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/influxdb/dist/tools/index.js,/app/modules/influxdb/dist/provisioner/index.js
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker",
|
||||||
"admin": "${dir:state}/admin.secret",
|
"admin": "${dir:state}/admin.secret",
|
||||||
"admin-token": "${dir:state}/admin-token.secret"
|
"admin-token": "${dir:state}/admin-token.secret"
|
||||||
},
|
},
|
||||||
@@ -99,6 +100,29 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{}\n",
|
"content": "{}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-influxdb",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:state}/admin-token.secret:/run/secrets/admin-token:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_INFLUXDB_URL": "http://127.0.0.1:${port:8086}",
|
||||||
|
"MESH_INFLUXDB_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_INFLUXDB_TOKEN_FILE": "/run/secrets/admin-token",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -111,25 +135,23 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_INFLUXDB_URL": "http://127.0.0.1:${port:8086}",
|
|
||||||
"MESH_INFLUXDB_CONFIG_FILE": "${dir:mesh-state}/config.json",
|
|
||||||
"MESH_INFLUXDB_TOKEN_FILE": "${dir:state}/admin-token.secret",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@
|
|||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "${dir:state}/api.env",
|
"path": "${dir:state}/api.env",
|
||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "NODE_ENV=production\nPORT=9000\nMONGO_URL=mongodb://${bound:mongodb-database:as}:${secret:mongodb-database}@${bound:mongodb-database:at}:${bound:mongodb-database:port}/${bound:mongodb-database:as}?authSource=${bound:mongodb-database:as}\nMONGO_DB=${bound:mongodb-database:as}\nMINIO_BUCKET=mesh-novox-invoice\nMINIO_ENDPOINT=${bound:s3-bucket:at}\nMINIO_PORT=${bound:s3-bucket:port}\nMINIO_ACCESSKEY=${bound:s3-bucket:as}\nMINIO_SECRET=${secret:s3-bucket}\n"
|
"content": "NODE_ENV=production\nPORT=9000\nMONGO_URL=mongodb://${bound:mongodb-database:as}:${secret:mongodb-database}@${bound:mongodb-database:at}:${bound:mongodb-database:port}/${bound:mongodb-database:as}?authSource=${bound:mongodb-database:as}\nMONGO_DB=${bound:mongodb-database:as}\nMINIO_BUCKET=${bound:s3-bucket:bucket}\nMINIO_ENDPOINT=${bound:s3-bucket:at}\nMINIO_PORT=${bound:s3-bucket:port}\nMINIO_ACCESSKEY=${bound:s3-bucket:as}\nMINIO_SECRET=${secret:s3-bucket}\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "net",
|
"id": "net",
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# jira's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/jira
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/jira/dist /app/modules/jira/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/jira/dist/tools/index.js
|
||||||
+40
-14
@@ -2,9 +2,16 @@
|
|||||||
"module": "jira",
|
"module": "jira",
|
||||||
"version": "1",
|
"version": "1",
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"token": "${dir:state}/token"
|
"token": "${dir:state}/token",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -18,27 +25,46 @@
|
|||||||
"merge": "json",
|
"merge": "json",
|
||||||
"content": "{}",
|
"content": "{}",
|
||||||
"mode": "0600"
|
"mode": "0600"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-runtime-jira",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:state}/token:/run/secrets/token:ro",
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_JIRA_TOKEN_FILE": "/run/secrets/token",
|
||||||
|
"MESH_JIRA_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_JIRA_TOKEN_FILE": "${dir:state}/token",
|
|
||||||
"MESH_JIRA_CONFIG_FILE": "${dir:state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# keycloak's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/keycloak
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts oidc.ts index.ts provisioner/index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/keycloak/dist /app/modules/keycloak/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled. A container that instead ran only its
|
||||||
|
# provisioner (`run`) served no tools and emitted no events; a container that named no command
|
||||||
|
# ran no provisioner at all.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/keycloak/dist/index.js,/app/modules/keycloak/dist/tools/index.js,/app/modules/keycloak/dist/provisioner/index.js
|
||||||
@@ -62,7 +62,8 @@
|
|||||||
"oidc-client": "${dir:grants}"
|
"oidc-client": "${dir:grants}"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"admin": "${dir:state}/admin.secret"
|
"admin": "${dir:state}/admin.secret",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
@@ -143,30 +144,49 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{}\n",
|
"content": "{}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-keycloak",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:state}/admin.secret:/run/secrets/admin:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_KEYCLOAK_URL": "http://127.0.0.1:${port:8080}",
|
||||||
|
"MESH_KEYCLOAK_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_KEYCLOAK_PASSWORD_FILE": "/run/secrets/admin",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_KEYCLOAK_URL": "http://127.0.0.1:${port:8080}",
|
|
||||||
"MESH_KEYCLOAK_CONFIG_FILE": "${dir:mesh-state}/config.json",
|
|
||||||
"MESH_KEYCLOAK_PASSWORD_FILE": "${dir:state}/admin.secret",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
# lab's runtime: the tool runtime, carrying this module's code, and the toolchain the lab's suite
|
||||||
|
# builds the mesh with (novox/hq ADR 0172). It reaches the machine's virtualisation and container
|
||||||
|
# runtime through their sockets, so what it raises is what a hand run on this machine raises.
|
||||||
|
#
|
||||||
|
# Every download is pinned by its checksum: an image that builds the mesh is the last place to take
|
||||||
|
# whatever an upstream serves today.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/lab
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc tools/index.ts tools/runs.ts --rootDir . \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends git make ca-certificates curl python3 file iproute2 sudo \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
RUN curl -fsSL -o /tmp/go.tgz https://go.dev/dl/go1.26.8.linux-amd64.tar.gz \
|
||||||
|
&& echo "d0f743b33e8d8945e6b1f432edd15785c70507121d6e2a723b21285eddf8b57b /tmp/go.tgz" | sha256sum -c - \
|
||||||
|
&& tar -C /usr/local -xzf /tmp/go.tgz && rm /tmp/go.tgz
|
||||||
|
RUN curl -fsSL -o /usr/local/bin/incus https://github.com/lxc/incus/releases/download/v7.5.1/bin.linux.incus.x86_64 \
|
||||||
|
&& echo "7bd6223b369f4d693fcde695bd8549a73b5b3d403735329212483702aa22c179 /usr/local/bin/incus" | sha256sum -c - \
|
||||||
|
&& chmod 0755 /usr/local/bin/incus
|
||||||
|
RUN curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz \
|
||||||
|
&& echo "ea90cfd12e1eeb12aa1c971741adb8bd4ed88e2a574eaac13f5029a1dbc6300d /tmp/docker.tgz" | sha256sum -c - \
|
||||||
|
&& tar -C /tmp -xzf /tmp/docker.tgz docker/docker && mv /tmp/docker/docker /usr/local/bin/docker && rm -rf /tmp/docker /tmp/docker.tgz
|
||||||
|
ENV PATH=/usr/local/go/bin:$PATH
|
||||||
|
COPY --from=build /app/modules/lab/dist /app/modules/lab/dist
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/lab/dist/tools/index.js
|
||||||
+45
-56
@@ -5,7 +5,16 @@
|
|||||||
"container-runtime",
|
"container-runtime",
|
||||||
"virtualisation"
|
"virtualisation"
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -26,67 +35,47 @@
|
|||||||
"content": "MESH_LAB_FORGE=${setting:forge}\n"
|
"content": "MESH_LAB_FORGE=${setting:forge}\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "git",
|
"id": "runtime",
|
||||||
"type": "package",
|
"type": "container",
|
||||||
"package": "git"
|
"name": "mesh-lab",
|
||||||
},
|
"network": "host",
|
||||||
{
|
"env-file": [
|
||||||
"id": "make",
|
"${dir:state}/lab.env"
|
||||||
"type": "package",
|
],
|
||||||
"package": "make"
|
"volumes": [
|
||||||
},
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
{
|
"${dir:work}:${dir:work}",
|
||||||
"id": "python",
|
"/var/run/docker.sock:/var/run/docker.sock",
|
||||||
"type": "package",
|
"/var/lib/incus/unix.socket:/var/lib/incus/unix.socket"
|
||||||
"package": "python"
|
],
|
||||||
},
|
"env": {
|
||||||
{
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
"id": "file",
|
"MESH_LAB_WORK": "${dir:work}"
|
||||||
"type": "package",
|
},
|
||||||
"package": "file"
|
"restart-on": [
|
||||||
},
|
"runtime-env"
|
||||||
{
|
],
|
||||||
"id": "iproute2",
|
"artifact": "runtime"
|
||||||
"type": "package",
|
|
||||||
"package": "iproute2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sudo",
|
|
||||||
"type": "package",
|
|
||||||
"package": "sudo"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "npm",
|
|
||||||
"type": "package",
|
|
||||||
"package": "npm"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "go",
|
|
||||||
"type": "package",
|
|
||||||
"package": "go"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "incus",
|
|
||||||
"type": "package",
|
|
||||||
"package": "incus"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_LAB_WORK": "${dir:work}",
|
|
||||||
"MESH_LAB_ENV_FILE": "${dir:state}/lab.env"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,23 +2,18 @@
|
|||||||
// lab is assigned to, and only there: a bed raises virtual machines on that machine's virtualisation.
|
// lab is assigned to, and only there: a bed raises virtual machines on that machine's virtualisation.
|
||||||
|
|
||||||
import { spawnSync } from "node:child_process";
|
import { spawnSync } from "node:child_process";
|
||||||
import { readFileSync } from "node:fs";
|
|
||||||
import { registerModuleTools, type ToolDefinition } from "@novox/mesh-sdk/tools";
|
import { registerModuleTools, type ToolDefinition } from "@novox/mesh-sdk/tools";
|
||||||
import { listRuns, readStatus, REPOSITORIES, running, start, stop, tail } from "./runs.js";
|
import { listRuns, readStatus, REPOSITORIES, running, start, stop, tail } from "./runs.js";
|
||||||
|
|
||||||
export function getLabTools(env: NodeJS.ProcessEnv): ToolDefinition[] {
|
export function getLabTools(env: NodeJS.ProcessEnv): ToolDefinition[] {
|
||||||
const work = env.MESH_LAB_WORK ?? "/var/lib/mesh-lab-runs";
|
const work = env.MESH_LAB_WORK ?? "/var/lib/mesh-lab-runs";
|
||||||
// The forge is an operator's setting, which reaches a file and never a bundle's words (novox/hq
|
const forge = (env.MESH_LAB_FORGE ?? "").replace(/\/+$/, "");
|
||||||
// ADR 0192): read from the env-file the mesh fills, at each call, so a changed setting is used
|
|
||||||
// without restarting the runtime. MESH_LAB_FORGE itself still wins, for a hand-run instance.
|
|
||||||
const forgeOf = (): string => (env.MESH_LAB_FORGE ?? wordIn(env.MESH_LAB_ENV_FILE, "MESH_LAB_FORGE")).replace(/\/+$/, "");
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
name: "lab_check",
|
name: "lab_check",
|
||||||
description: "Whether this machine can run the lab's beds: the lab's own check, against the forge's main branch.",
|
description: "Whether this machine can run the lab's beds: the lab's own check, against the forge's main branch.",
|
||||||
input: {},
|
input: {},
|
||||||
run: async () => {
|
run: async () => {
|
||||||
const forge = forgeOf();
|
|
||||||
if (!forge) return { ok: false, output: "the lab's forge is not set: settings for lab, {\"forge\": \"<url>\"}" };
|
if (!forge) return { ok: false, output: "the lab's forge is not set: settings for lab, {\"forge\": \"<url>\"}" };
|
||||||
const dir = `${work}/check`;
|
const dir = `${work}/check`;
|
||||||
spawnSync("rm", ["-rf", dir]);
|
spawnSync("rm", ["-rf", dir]);
|
||||||
@@ -43,7 +38,6 @@ export function getLabTools(env: NodeJS.ProcessEnv): ToolDefinition[] {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
run: async (args) => {
|
run: async (args) => {
|
||||||
const forge = forgeOf();
|
|
||||||
if (!forge) return { started: false, reason: "the lab's forge is not set: settings for lab, {\"forge\": \"<url>\"}" };
|
if (!forge) return { started: false, reason: "the lab's forge is not set: settings for lab, {\"forge\": \"<url>\"}" };
|
||||||
const tests = String(args.tests ?? "").split(",").map((s) => s.trim()).filter(Boolean);
|
const tests = String(args.tests ?? "").split(",").map((s) => s.trim()).filter(Boolean);
|
||||||
if (tests.length === 0) return { started: false, reason: "name at least one bed test file" };
|
if (tests.length === 0) return { started: false, reason: "name at least one bed test file" };
|
||||||
@@ -89,20 +83,4 @@ export function getLabTools(env: NodeJS.ProcessEnv): ToolDefinition[] {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One word from an env-file (`KEY=value` lines), or "" when the file or the word is absent. */
|
|
||||||
export function wordIn(file: string | undefined, word: string): string {
|
|
||||||
if (!file) return "";
|
|
||||||
let text: string;
|
|
||||||
try {
|
|
||||||
text = readFileSync(file, "utf8");
|
|
||||||
} catch {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
for (const line of text.split("\n")) {
|
|
||||||
const at = line.indexOf("=");
|
|
||||||
if (at > 0 && line.slice(0, at).trim() === word) return line.slice(at + 1).trim();
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
registerModuleTools("lab", (env) => getLabTools(env));
|
registerModuleTools("lab", (env) => getLabTools(env));
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# letta's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/letta
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/letta/dist /app/modules/letta/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/letta/dist/tools/index.js
|
||||||
+36
-14
@@ -26,7 +26,8 @@
|
|||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"server-password": "${dir:state}/server-password.secret",
|
"server-password": "${dir:state}/server-password.secret",
|
||||||
"openai-api-key": "${dir:state}/openai-api-key.secret"
|
"openai-api-key": "${dir:state}/openai-api-key.secret",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
@@ -83,24 +84,45 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{\n \"password\": \"${secret:server-password}\"\n}\n",
|
"content": "{\n \"password\": \"${secret:server-password}\"\n}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-letta",
|
||||||
|
"network": "letta",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_LETTA_URL": "http://letta:8283",
|
||||||
|
"MESH_LETTA_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_LETTA_URL": "http://127.0.0.1:${port:8283}",
|
|
||||||
"MESH_LETTA_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# mailu's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/mailu
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts tools/index.ts provisioner/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/mailu/dist /app/modules/mailu/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled. A container that instead ran only its
|
||||||
|
# provisioner (`run`) served no tools and emitted no events; a container that named no command
|
||||||
|
# ran no provisioner at all.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/mailu/dist/index.js,/app/modules/mailu/dist/tools/index.js,/app/modules/mailu/dist/provisioner/index.js
|
||||||
+41
-30
@@ -135,15 +135,11 @@
|
|||||||
"protocol": "tcp",
|
"protocol": "tcp",
|
||||||
"from": "mesh",
|
"from": "mesh",
|
||||||
"why": "automx: mail client autoconfiguration; the autoconfig, autodiscover and automx names are route grants reaching it here"
|
"why": "automx: mail client autoconfiguration; the autoconfig, autodiscover and automx names are route grants reaching it here"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "admin-api",
|
|
||||||
"port": 8080,
|
|
||||||
"protocol": "tcp",
|
|
||||||
"from": "machine",
|
|
||||||
"why": "the admin API, which this module's own code reaches on loopback from the node's runtime now that it runs outside the mailu network"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
"id": "mesh-state",
|
"id": "mesh-state",
|
||||||
@@ -309,9 +305,6 @@
|
|||||||
"name": "mailu-admin",
|
"name": "mailu-admin",
|
||||||
"image": "ghcr.io/mailu/admin@sha256:6dbfdadc4a9590dcb7652357b505200115b689b74008653bbf369e4599a3be5a",
|
"image": "ghcr.io/mailu/admin@sha256:6dbfdadc4a9590dcb7652357b505200115b689b74008653bbf369e4599a3be5a",
|
||||||
"network": "mailu",
|
"network": "mailu",
|
||||||
"ports": [
|
|
||||||
"8080"
|
|
||||||
],
|
|
||||||
"env-file": [
|
"env-file": [
|
||||||
"${dir:state}/mailu.env",
|
"${dir:state}/mailu.env",
|
||||||
"${dir:state}/secret.env",
|
"${dir:state}/secret.env",
|
||||||
@@ -480,6 +473,31 @@
|
|||||||
"content": "{}\n",
|
"content": "{}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-mailu",
|
||||||
|
"network": "mailu",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:state}/api-token.secret:/run/secrets/api-token:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_MAILU_URL": "http://mailu-admin:8080/api/v1",
|
||||||
|
"MESH_MAILU_API_KEY_FILE": "/run/secrets/api-token",
|
||||||
|
"MESH_MAILU_IMAP_CONTAINER": "mailu-imap",
|
||||||
|
"MESH_MAILU_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "automx",
|
"id": "automx",
|
||||||
"type": "container",
|
"type": "container",
|
||||||
@@ -499,6 +517,16 @@
|
|||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
"on": [
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"arg": "PYTHON_BASE",
|
"arg": "PYTHON_BASE",
|
||||||
"image": "python@sha256:25f3cfeaceca14921366af4d1240b56457ef46273bdb508c7b0e8f469f6fd228"
|
"image": "python@sha256:25f3cfeaceca14921366af4d1240b56457ef46273bdb508c7b0e8f469f6fd228"
|
||||||
@@ -506,26 +534,9 @@
|
|||||||
],
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_MAILU_URL": "http://127.0.0.1:${port:8080}/api/v1",
|
|
||||||
"MESH_MAILU_API_KEY_FILE": "${dir:state}/api-token.secret",
|
|
||||||
"MESH_MAILU_IMAP_CONTAINER": "mailu-imap",
|
|
||||||
"MESH_MAILU_CONFIG_FILE": "${dir:mesh-state}/config.json",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "automx",
|
"name": "automx",
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# The console (novox/hq ADR 0152, design 34): the mesh's tools for whoever is on a machine, served
|
||||||
|
# over MCP on that machine's loopback.
|
||||||
|
#
|
||||||
|
# **Nothing is compiled here.** The console is the tool runtime's own client — `mesh serve` — which
|
||||||
|
# the runtime image already carries beside the runtime it runs modules with. This recipe changes the
|
||||||
|
# program the image starts and nothing else, so the console is exactly the client a person can run by
|
||||||
|
# hand, started by the mesh instead, on the credential the mesh sealed to the machine.
|
||||||
|
#
|
||||||
|
# One base, named rather than pinned: the mesh answers with the copy it holds (novox/hq issue 044).
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
ENTRYPOINT ["node", "dist/mesh.js"]
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# mesh-console
|
||||||
|
|
||||||
|
The mesh's tools, on the machine a person sits at, served by a module the mesh assigned there
|
||||||
|
(novox/hq [ADR 0152](https://git.novox.be/novox/hq), design 34).
|
||||||
|
|
||||||
|
Assign it to a machine and an agent on that machine has the mesh's tools at
|
||||||
|
`http://127.0.0.1:<port>/mcp` — MCP over HTTP, `initialize`, `tools/list`, `tools/call`. A person at
|
||||||
|
a terminal reaches the same endpoint with `mesh tools --console http://127.0.0.1:<port>` and
|
||||||
|
`mesh call <module>.<tool> --console …`, with no credential of their own: the console holds it.
|
||||||
|
|
||||||
|
## What it is
|
||||||
|
|
||||||
|
The tool runtime's own client, `mesh serve`, started by the mesh on the credential it sealed to the
|
||||||
|
machine for `<node>.mesh-console`. The manifest says three things nothing else in the catalogue says
|
||||||
|
together:
|
||||||
|
|
||||||
|
- `invokes: ["*"]` — it calls every tool on the mesh, and the bus grants exactly that publish side;
|
||||||
|
- a listener `from: machine` — loopback only, and the filter opens nothing for it;
|
||||||
|
- no `emits`, no `consumes`, no `tools` — nothing on the bus can address it.
|
||||||
|
|
||||||
|
**Loopback is the authority boundary.** Whoever can connect is on the machine, and whoever is on the
|
||||||
|
machine is the account that owns the mesh there (ADR 0034, ADR 0144). There is no token and no login,
|
||||||
|
and `mesh serve` refuses to bind anything but a loopback address.
|
||||||
|
|
||||||
|
## What it lists
|
||||||
|
|
||||||
|
What the running modules answer: every tool runtime serves a `tools` verb for its module, and the
|
||||||
|
console asks the catalogue which modules the mesh holds and each module what it serves. A module that
|
||||||
|
did not answer — not assigned, not up, or built before the runtime answered `tools` — is named in the
|
||||||
|
list's `_meta.notAnswering` and can still be called by `<module>.<tool>`.
|
||||||
|
|
||||||
|
The mesh's own verbs (`status`, `push`, `assign`) are the `mesh-controller` seat's tools under
|
||||||
|
ADR 0132 and are not served on the bus yet; they appear here when they are.
|
||||||
|
|
||||||
|
## Port
|
||||||
|
|
||||||
|
The manifest declares port 4270 and the mesh assigns the machine port as it does for any listener;
|
||||||
|
the console binds `127.0.0.1:${port:4270}`. `node show <machine>` says which port a machine was given.
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
{
|
||||||
|
"module": "mesh-console",
|
||||||
|
"version": "1",
|
||||||
|
"slug": "console",
|
||||||
|
"capabilities": [
|
||||||
|
"container-runtime"
|
||||||
|
],
|
||||||
|
"invokes": [
|
||||||
|
"*"
|
||||||
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
|
"listens": [
|
||||||
|
{
|
||||||
|
"name": "mcp",
|
||||||
|
"port": 4270,
|
||||||
|
"protocol": "tcp",
|
||||||
|
"from": "machine",
|
||||||
|
"why": "the mesh's tools for whoever is on this machine, over MCP on loopback; the machine's login is the authority (novox/hq ADR 0152)"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "server",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-console",
|
||||||
|
"network": "host",
|
||||||
|
"args": [
|
||||||
|
"serve"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_CONSOLE_LISTEN": "127.0.0.1:${port:4270}"
|
||||||
|
},
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"artifacts": [
|
||||||
|
{
|
||||||
|
"name": "runtime",
|
||||||
|
"kind": "image",
|
||||||
|
"from": "Dockerfile"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# mesh-vault's runtime: the tool runtime, carrying this module's compiled provisioner, tools and event
|
||||||
|
# consumer. The same shape as postgres's, minus the client the database needs: mesh-vault reaches no
|
||||||
|
# server, because what it provides is a value the mesh already delivered to its node.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk is in the base image, so
|
||||||
|
# nothing is copied out of a neighbouring checkout (novox/hq ADR 0069). Two bases, named rather than
|
||||||
|
# pinned — the image this is COMPILED in and the image it RUNS in — answered by the mesh from
|
||||||
|
# `build.on` in module.json (novox/hq issue 044).
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/vault
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts provisioner/index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/vault/dist /app/modules/vault/dist
|
||||||
|
# The entrypoints a tool host loads from this module: its event consumer, its tools and its
|
||||||
|
# provisioner — one image, one process, one broker account (novox/hq ADR 0052).
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/vault/dist/index.js,/app/modules/vault/dist/tools/index.js,/app/modules/vault/dist/provisioner/index.js
|
||||||
@@ -27,7 +27,16 @@
|
|||||||
"secret": "${dir:grants}"
|
"secret": "${dir:grants}"
|
||||||
},
|
},
|
||||||
"keeps": "/var/lib/mesh-vault/root",
|
"keeps": "/var/lib/mesh-vault/root",
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -48,29 +57,45 @@
|
|||||||
"id": "root",
|
"id": "root",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
"mode": "0700"
|
"mode": "0700"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-vault",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro",
|
||||||
|
"${dir:ledger}:${dir:ledger}",
|
||||||
|
"${dir:root}:${dir:root}:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
||||||
|
"MESH_VAULT_LEDGER": "${dir:ledger}",
|
||||||
|
"MESH_VAULT_ROOT": "${dir:root}"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
|
||||||
"MESH_VAULT_LEDGER": "${dir:ledger}",
|
|
||||||
"MESH_VAULT_ROOT": "${dir:root}"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# minio's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
ARG MC_CLI
|
||||||
|
|
||||||
|
# Named so the final stage's COPY --from can reference a stage, not an ARG — the legacy builder
|
||||||
|
# this host still runs doesn't expand ARGs inside COPY --from, only inside FROM.
|
||||||
|
FROM ${MC_CLI} AS mccli
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/minio
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts provisioner/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/minio/dist /app/modules/minio/dist
|
||||||
|
# The provisioner shells out to mc to actually create buckets and service accounts on the running
|
||||||
|
# minio server — mc itself was never in this runtime image, only in minio's own. Silently retried
|
||||||
|
# "spawn mc ENOENT" forever: a requirement was granted at the control-plane level without ever
|
||||||
|
# materializing the credential on minio. /usr/bin/mc there is a symlink to the real binary, mcli —
|
||||||
|
# both copied so the symlink resolves.
|
||||||
|
COPY --from=mccli /usr/bin/mcli /usr/bin/mcli
|
||||||
|
COPY --from=mccli /usr/bin/mc /usr/bin/mc
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/minio/dist/tools/index.js,/app/modules/minio/dist/provisioner/index.js
|
||||||
+5
-15
@@ -303,21 +303,11 @@ export class MinioClient {
|
|||||||
|
|
||||||
// --- module-scoped helpers -------------------------------------------------
|
// --- module-scoped helpers -------------------------------------------------
|
||||||
|
|
||||||
/** A deterministic 20-char access key id from a consumer name, so removal needs no stored state:
|
// **Neither the access key nor the bucket is derived here any more.** `accessKeyFor` minted an id
|
||||||
* the provisioner recomputes the same id at teardown that it minted at creation. */
|
// of its own until the mesh took that over (ADR 0048: the login is the mesh's, handed to both
|
||||||
export function accessKeyFor(consumer: string): string {
|
// ends), and `bucketFor` derived the bucket until the mesh took that over too (ADR 0188: the rule
|
||||||
const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
|
// is a line of this module's manifest, filled per consumer and delivered to both ends). Both
|
||||||
const digest = createHash("sha256").update(consumer).digest();
|
// survived with no callers, which is the state a rule comes back from; they are gone.
|
||||||
let out = "";
|
|
||||||
for (let i = 0; i < 20; i++) out += chars[digest[i] % chars.length];
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A DNS-safe bucket name derived from a consumer — the removable identity of its storage. */
|
|
||||||
export function bucketFor(consumer: string): string {
|
|
||||||
const name = consumer.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 63);
|
|
||||||
return name.length >= 3 ? name : `mesh-${name}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function bucketPolicy(bucket: string): string {
|
function bucketPolicy(bucket: string): string {
|
||||||
return JSON.stringify({
|
return JSON.stringify({
|
||||||
|
|||||||
+47
-25
@@ -49,7 +49,8 @@
|
|||||||
"s3-bucket": {
|
"s3-bucket": {
|
||||||
"scheme": "http",
|
"scheme": "http",
|
||||||
"region": "eu-west",
|
"region": "eu-west",
|
||||||
"port": 9000
|
"port": 9000,
|
||||||
|
"bucket": "${consumer:as:dns}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"receives": {
|
"receives": {
|
||||||
@@ -59,9 +60,16 @@
|
|||||||
"s3-bucket": "${dir:grants}"
|
"s3-bucket": "${dir:grants}"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"root": "${dir:state}/root.secret"
|
"root": "${dir:state}/root.secret",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -120,34 +128,48 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "client",
|
"id": "runtime",
|
||||||
"type": "package",
|
"type": "container",
|
||||||
"package": "minio-client"
|
"name": "mesh-minio",
|
||||||
|
"network": "minio-net",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro",
|
||||||
|
"${dir:state}/root.secret:/run/secrets/root:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_MINIO_ENDPOINT": "http://minio:9000",
|
||||||
|
"MESH_MINIO_ROOT_USER": "meshroot",
|
||||||
|
"MESH_MINIO_ROOT_PASSWORD_FILE": "/run/secrets/root",
|
||||||
|
"MESH_MINIO_REGION": "eu-west",
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "MC_CLI",
|
||||||
|
"image": "docker.io/pgsty/minio@sha256:b6bfe7239bfc83fb90d31612d9704d86039dd714f7904b3f1ad68f211e602372"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_MINIO_ENDPOINT": "http://127.0.0.1:${port:9000}",
|
|
||||||
"MESH_MINIO_ROOT_USER": "meshroot",
|
|
||||||
"MESH_MINIO_ROOT_PASSWORD_FILE": "${dir:state}/root.secret",
|
|
||||||
"MESH_MINIO_REGION": "eu-west",
|
|
||||||
"MESH_MINIO_MC_BIN": "mcli",
|
|
||||||
"MESH_MINIO_MC_CONFIG": "${dir:state}/mc",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@novox/mesh-sdk": "^0.1.1"
|
"@novox/mesh-sdk": "^0.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^22.0.0",
|
"@types/node": "^22.0.0",
|
||||||
|
|||||||
@@ -10,18 +10,24 @@
|
|||||||
// **The access key and its secret are the mesh's, not the provisioner's (ADR 0048).** The mesh
|
// **The access key and its secret are the mesh's, not the provisioner's (ADR 0048).** The mesh
|
||||||
// derives the login (the access-key id) and hands it to both ends, and mints the secret key. minio
|
// derives the login (the access-key id) and hands it to both ends, and mints the secret key. minio
|
||||||
// creates the service account under exactly that access key with exactly that secret — a credential
|
// creates the service account under exactly that access key with exactly that secret — a credential
|
||||||
// the provisioner invented is one the consumer could never present. The bucket is derived from the
|
// the provisioner invented is one the consumer could never present.
|
||||||
// login, so teardown recomputes it with nothing to persist.
|
//
|
||||||
|
// **The bucket name is the mesh's too (ADR 0188).** It used to be computed here, from the login,
|
||||||
|
// and every consumer transcribed the same rule into its own definition by hand — two copies of
|
||||||
|
// one rule with nothing comparing them, and one of three was wrong for months. Now the rule is a
|
||||||
|
// line of this module's manifest (`serves.s3-bucket.bucket: ${consumer:as:dns}`), the mesh fills
|
||||||
|
// it per consumer, and the same filled value reaches this provisioner and the consumer's own
|
||||||
|
// configuration. There is no second computation to disagree with.
|
||||||
|
|
||||||
import { runProvisioner, type Provision } from "@novox/mesh-sdk/provisioner";
|
import { runProvisioner, type Provision } from "@novox/mesh-sdk/provisioner";
|
||||||
import { emit } from "@novox/mesh-sdk/events";
|
import { emit } from "@novox/mesh-sdk/events";
|
||||||
import { MinioClient, bucketFor } from "../client.js";
|
import { MinioClient } from "../client.js";
|
||||||
|
|
||||||
const minio = MinioClient.fromEnv();
|
const minio = MinioClient.fromEnv();
|
||||||
|
|
||||||
runProvisioner("s3-bucket", {
|
runProvisioner("s3-bucket", {
|
||||||
async create(p: Provision): Promise<void> {
|
async create(p: Provision): Promise<void> {
|
||||||
const bucket = bucketFor(p.as);
|
const bucket = bucketNamed(p.derived);
|
||||||
const accessKeyId = p.as;
|
const accessKeyId = p.as;
|
||||||
|
|
||||||
if (!(await minio.bucketExists(bucket))) await minio.createBucket(bucket);
|
if (!(await minio.bucketExists(bucket))) await minio.createBucket(bucket);
|
||||||
@@ -38,8 +44,8 @@ runProvisioner("s3-bucket", {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
async remove(p: { as: string }): Promise<void> {
|
async remove(p: { as: string; derived: Readonly<Record<string, unknown>> }): Promise<void> {
|
||||||
const bucket = bucketFor(p.as);
|
const bucket = bucketNamed(p.derived);
|
||||||
|
|
||||||
// Revoking the key is what cuts the consumer's access. The bucket is emptied-then-dropped only if
|
// Revoking the key is what cuts the consumer's access. The bucket is emptied-then-dropped only if
|
||||||
// empty; a bucket that still holds objects is left for an operator rather than erroring on every
|
// empty; a bucket that still holds objects is left for an operator rather than erroring on every
|
||||||
@@ -57,10 +63,28 @@ runProvisioner("s3-bucket", {
|
|||||||
// Asked every minute by the harness: whether the backend still holds this consumer exactly as
|
// Asked every minute by the harness: whether the backend still holds this consumer exactly as
|
||||||
// the mesh gave it, so a login lost behind the provisioner's back is made again (novox/hq issue 120).
|
// the mesh gave it, so a login lost behind the provisioner's back is made again (novox/hq issue 120).
|
||||||
async holds(p: Provision): Promise<boolean> {
|
async holds(p: Provision): Promise<boolean> {
|
||||||
return minio.canReachAs(bucketFor(p.as), p.as, p.password);
|
return minio.canReachAs(bucketNamed(p.derived), p.as, p.password);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/** The bucket the mesh derived for this consumer.
|
||||||
|
*
|
||||||
|
* Absent means this module is running against a control plane that does not fill `${consumer:…}`
|
||||||
|
* yet, or a manifest whose `serves` block lost the line. Both are the same mistake from here —
|
||||||
|
* nobody said which bucket — and both are said rather than guessed: a provisioner that fell back
|
||||||
|
* to deriving one would restore the second rule and hide the fault behind a bucket that happens
|
||||||
|
* to be right. */
|
||||||
|
function bucketNamed(derived: Readonly<Record<string, unknown>>): string {
|
||||||
|
const bucket = derived.bucket;
|
||||||
|
if (typeof bucket !== "string" || bucket === "") {
|
||||||
|
throw new Error(
|
||||||
|
"the mesh did not say which bucket this consumer gets: minio's manifest must serve " +
|
||||||
|
"`bucket` under s3-bucket (novox/hq ADR 0188)",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return bucket;
|
||||||
|
}
|
||||||
|
|
||||||
/** Emit best-effort: a broker hiccup is logged and dropped, never allowed to throw back and fail a
|
/** Emit best-effort: a broker hiccup is logged and dropped, never allowed to throw back and fail a
|
||||||
* bucket that was made. */
|
* bucket that was made. */
|
||||||
async function announce(type: string, body: unknown): Promise<void> {
|
async function announce(type: string, body: unknown): Promise<void> {
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# mosquitto's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/mosquitto
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc topics.ts client.ts index.ts tools/index.ts provisioner/index.ts bootstrap/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
# mosquitto's client and bootstrap drive `mosquitto_ctrl`; the apt package carries it with its
|
||||||
|
# shared libraries — the musl binary from the eclipse image would not load on this glibc base.
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends mosquitto \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
COPY --from=build /app/modules/mosquitto/dist /app/modules/mosquitto/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/mosquitto/dist/index.js,/app/modules/mosquitto/dist/tools/index.js,/app/modules/mosquitto/dist/provisioner/index.js
|
||||||
@@ -32,7 +32,8 @@
|
|||||||
"mqtt-topic": "${dir:grants}"
|
"mqtt-topic": "${dir:grants}"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"admin": "${dir:mesh-state}/admin"
|
"admin": "${dir:mesh-state}/admin",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
@@ -87,29 +88,26 @@
|
|||||||
"type": "network",
|
"type": "network",
|
||||||
"name": "mosquitto"
|
"name": "mosquitto"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "bootstrap-env",
|
|
||||||
"type": "file",
|
|
||||||
"path": "${dir:state}/bootstrap.env",
|
|
||||||
"mode": "0600",
|
|
||||||
"content": "MESH_PROVISION_MQTT=127.0.0.1:${port:1883}\nMESH_PROVISION_ADMIN_USER=mesh-admin\nMESH_PROVISION_PASSWORD_FILE=${dir:mesh-state}/admin\nMESH_DYNSEC_FILE=${dir:data}/dynamic-security.json\n"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "bootstrap",
|
"id": "bootstrap",
|
||||||
"type": "process",
|
"type": "container",
|
||||||
"name": "mosquitto-bootstrap",
|
"name": "mosquitto-bootstrap",
|
||||||
"artifact": "code",
|
|
||||||
"run": [
|
|
||||||
"node",
|
|
||||||
"bootstrap/index.js"
|
|
||||||
],
|
|
||||||
"run-once": true,
|
"run-once": true,
|
||||||
"env-file": [
|
"volumes": [
|
||||||
"${dir:state}/bootstrap.env"
|
"${dir:data}:/mosquitto/data",
|
||||||
|
"${dir:mesh-state}/admin:/run/secrets/admin:ro"
|
||||||
],
|
],
|
||||||
"restart-on": [
|
"env": {
|
||||||
"bootstrap-env"
|
"MESH_PROVISION_MQTT": "mosquitto:1883",
|
||||||
]
|
"MESH_PROVISION_ADMIN_USER": "mesh-admin",
|
||||||
|
"MESH_PROVISION_PASSWORD_FILE": "/run/secrets/admin",
|
||||||
|
"MESH_DYNSEC_FILE": "/mosquitto/data/dynamic-security.json"
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/mosquitto/dist/bootstrap/index.js"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "server",
|
"id": "server",
|
||||||
@@ -127,34 +125,43 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "client",
|
"id": "runtime",
|
||||||
"type": "package",
|
"type": "container",
|
||||||
"package": "mosquitto"
|
"name": "mesh-mosquitto",
|
||||||
|
"network": "mosquitto",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro",
|
||||||
|
"${dir:mesh-state}/admin:/run/secrets/admin:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
||||||
|
"MESH_PROVISION_MQTT": "mosquitto:1883",
|
||||||
|
"MESH_PROVISION_ADMIN_USER": "mesh-admin",
|
||||||
|
"MESH_PROVISION_PASSWORD_FILE": "/run/secrets/admin"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js",
|
|
||||||
"bootstrap/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
|
||||||
"MESH_PROVISION_MQTT": "127.0.0.1:${port:1883}",
|
|
||||||
"MESH_PROVISION_ADMIN_USER": "mesh-admin",
|
|
||||||
"MESH_PROVISION_PASSWORD_FILE": "${dir:mesh-state}/admin"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# nextcloud's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
ARG DOCKER_CLI
|
||||||
|
|
||||||
|
# Named so the final stage's COPY --from can reference a stage, not an ARG — the legacy builder
|
||||||
|
# this host still runs doesn't expand ARGs inside COPY --from, only inside FROM.
|
||||||
|
FROM ${DOCKER_CLI} AS dockercli
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/nextcloud
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/nextcloud/dist /app/modules/nextcloud/dist
|
||||||
|
# occ runs inside nextcloud's own container, reached over the mounted docker socket — which needs
|
||||||
|
# the docker CLI itself present here, not only the socket. Copied from Docker's own official client
|
||||||
|
# image rather than apt-installed, so this stays the one binary and nothing else (no daemon, no
|
||||||
|
# systemd unit, no package manager tree pulled in for it).
|
||||||
|
COPY --from=dockercli /usr/local/bin/docker /usr/local/bin/docker
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled. A container that instead ran only its
|
||||||
|
# provisioner (`run`) served no tools and emitted no events; a container that named no command
|
||||||
|
# ran no provisioner at all.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/nextcloud/dist/index.js,/app/modules/nextcloud/dist/tools/index.js
|
||||||
@@ -30,7 +30,8 @@
|
|||||||
"share.created"
|
"share.created"
|
||||||
],
|
],
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"admin": "${dir:state}/admin.secret"
|
"admin": "${dir:state}/admin.secret",
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
@@ -62,7 +63,7 @@
|
|||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "${dir:state}/server.env",
|
"path": "${dir:state}/server.env",
|
||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "POSTGRES_HOST=${bound:postgres-database:at}:${bound:postgres-database:port}\nPOSTGRES_DB=${bound:postgres-database:as}\nPOSTGRES_USER=${bound:postgres-database:as}\nPOSTGRES_PASSWORD=${secret:postgres-database}\nNEXTCLOUD_ADMIN_USER=mesh-admin\nNEXTCLOUD_ADMIN_PASSWORD=${secret:admin}\nOBJECTSTORE_S3_HOST=${bound:s3-bucket:at}\nOBJECTSTORE_S3_PORT=${bound:s3-bucket:port}\nOBJECTSTORE_S3_BUCKET=mesh-novox-ncloud\nOBJECTSTORE_S3_KEY=${bound:s3-bucket:as}\nOBJECTSTORE_S3_SECRET=${secret:s3-bucket}\nOBJECTSTORE_S3_SSL=false\nOBJECTSTORE_S3_USEPATH_STYLE=true\nOBJECTSTORE_S3_REGION=${bound:s3-bucket:region}\n"
|
"content": "POSTGRES_HOST=${bound:postgres-database:at}:${bound:postgres-database:port}\nPOSTGRES_DB=${bound:postgres-database:as}\nPOSTGRES_USER=${bound:postgres-database:as}\nPOSTGRES_PASSWORD=${secret:postgres-database}\nNEXTCLOUD_ADMIN_USER=mesh-admin\nNEXTCLOUD_ADMIN_PASSWORD=${secret:admin}\nOBJECTSTORE_S3_HOST=${bound:s3-bucket:at}\nOBJECTSTORE_S3_PORT=${bound:s3-bucket:port}\nOBJECTSTORE_S3_BUCKET=${bound:s3-bucket:bucket}\nOBJECTSTORE_S3_KEY=${bound:s3-bucket:as}\nOBJECTSTORE_S3_SECRET=${secret:s3-bucket}\nOBJECTSTORE_S3_SSL=false\nOBJECTSTORE_S3_USEPATH_STYLE=true\nOBJECTSTORE_S3_REGION=${bound:s3-bucket:region}\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "html",
|
"id": "html",
|
||||||
@@ -93,28 +94,53 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{}\n",
|
"content": "{}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-nextcloud",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:state}/admin.secret:/run/secrets/admin:ro",
|
||||||
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_NEXTCLOUD_URL": "http://127.0.0.1:${port:80}",
|
||||||
|
"MESH_NEXTCLOUD_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_NEXTCLOUD_ADMIN_USER": "mesh-admin",
|
||||||
|
"MESH_NEXTCLOUD_ADMIN_PASSWORD_FILE": "/run/secrets/admin"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "DOCKER_CLI",
|
||||||
|
"image": "docker@sha256:018edbc908e08fcc9dbf029c812c34251e9b4719e6f71ca0e5eae2a987d014ca"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_NEXTCLOUD_URL": "http://127.0.0.1:${port:80}",
|
|
||||||
"MESH_NEXTCLOUD_CONFIG_FILE": "${dir:mesh-state}/config.json",
|
|
||||||
"MESH_NEXTCLOUD_ADMIN_USER": "mesh-admin",
|
|
||||||
"MESH_NEXTCLOUD_ADMIN_PASSWORD_FILE": "${dir:state}/admin.secret"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# nftables' runtime: the tool runtime, carrying the packet filter's tools and the binaries they speak.
|
||||||
|
#
|
||||||
|
# Built from this module's own directory and nothing else (novox/hq ADR 0069). Two bases, named in
|
||||||
|
# module.json's `build.on`: the image this is compiled in and the image it runs in.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/nftables
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
# The filter's own tools: nft for the machine's ruleset and the mesh's table, iptables for the
|
||||||
|
# legacy filter and the tables iptables-nft manages — a predecessor's rules live there (ADR 0168).
|
||||||
|
# The container runs on the machine's network with NET_ADMIN (ADR 0170), so these act on the
|
||||||
|
# machine's packet filter, not on a namespace of their own.
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends nftables iptables \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
COPY --from=build /app/modules/nftables/dist /app/modules/nftables/dist
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/nftables/dist/tools/index.js
|
||||||
+13
-71
@@ -2,13 +2,9 @@
|
|||||||
// rule set from every module's `listens` and writes it to the filter file (ADR 0045); the module
|
// rule set from every module's `listens` and writes it to the filter file (ADR 0045); the module
|
||||||
// loads it through its own unit. This code reads the filter back as the machine enforces it, reloads
|
// loads it through its own unit. This code reads the filter back as the machine enforces it, reloads
|
||||||
// the mesh's own table, and removes one thing the mesh did not write when the operator names it
|
// the mesh's own table, and removes one thing the mesh did not write when the operator names it
|
||||||
// (ADR 0168, ADR 0170) — the seat's three verbs, over the machine's own tools. Root is the module's
|
// (ADR 0168, ADR 0170) — the seat's three verbs, over the machine's own tools.
|
||||||
// concern (ADR 0175 §4): the runtime loading this bundle runs as the operator's account (to-be 38
|
|
||||||
// WP4), so the commands go through sudo without a prompt where the account is not root.
|
|
||||||
|
|
||||||
import { execFile } from "node:child_process";
|
import { execFile } from "node:child_process";
|
||||||
import { accessSync, constants } from "node:fs";
|
|
||||||
import { delimiter, join } from "node:path";
|
|
||||||
import { promisify } from "node:util";
|
import { promisify } from "node:util";
|
||||||
|
|
||||||
const execFileP = promisify(execFile);
|
const execFileP = promisify(execFile);
|
||||||
@@ -16,54 +12,9 @@ const execFileP = promisify(execFile);
|
|||||||
/** A command runner, so the acts can be tested without a packet filter. */
|
/** A command runner, so the acts can be tested without a packet filter. */
|
||||||
export type Runner = (cmd: string, args: string[]) => Promise<string>;
|
export type Runner = (cmd: string, args: string[]) => Promise<string>;
|
||||||
|
|
||||||
/** Where the mesh writes this node's filter: the path the manifest's `filtering.into` names. A
|
|
||||||
* bundle has no environment of its own (to-be 38 WP4), so the path is said here once, and a test
|
|
||||||
* holds it to the manifest's. */
|
|
||||||
export const FILTER_FILE = "/etc/nftables.conf";
|
|
||||||
|
|
||||||
/** The command as it is run: as given when this process is root, else through sudo without a
|
|
||||||
* prompt. The packet filter answers only to root, listing included. */
|
|
||||||
export function escalated(cmd: string, args: string[], uid: number | undefined = process.getuid?.()): [string, string[]] {
|
|
||||||
if (uid === 0) return [cmd, args];
|
|
||||||
return ["sudo", ["-n", cmd, ...args]];
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Whether a tool is on this machine: an executable of that name on the path, or where the
|
|
||||||
* system keeps its administration. Asked before a tool is run, so "not here" and "refused" are
|
|
||||||
* never confused — the former is a fact to work around, the latter an error to say. */
|
|
||||||
export function installed(tool: string, path: string = process.env.PATH ?? ""): boolean {
|
|
||||||
const dirs = [...path.split(delimiter), "/usr/sbin", "/sbin", "/usr/bin"].filter((d) => d !== "");
|
|
||||||
return dirs.some((dir) => {
|
|
||||||
try {
|
|
||||||
accessSync(join(dir, tool), constants.X_OK);
|
|
||||||
return true;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export const execRunner: Runner = async (cmd, args) => {
|
export const execRunner: Runner = async (cmd, args) => {
|
||||||
const [program, argv] = escalated(cmd, args);
|
const { stdout } = await execFileP(cmd, args, { maxBuffer: 16 * 1024 * 1024 });
|
||||||
try {
|
return stdout;
|
||||||
const { stdout } = await execFileP(program, argv, { maxBuffer: 16 * 1024 * 1024 });
|
|
||||||
return stdout;
|
|
||||||
} catch (err) {
|
|
||||||
// What failed is named by how it failed, not by prose: sudo missing is a spawn error; sudo
|
|
||||||
// refusing speaks on its own stderr line; anything else is the command's own failure.
|
|
||||||
const e = err as { code?: string | number; stderr?: string };
|
|
||||||
if (program === "sudo") {
|
|
||||||
if (e.code === "ENOENT") {
|
|
||||||
throw new Error(`${cmd} needs root, and sudo is not installed here for the runtime's account to escalate with`);
|
|
||||||
}
|
|
||||||
const stderr = String(e.stderr ?? "").trim();
|
|
||||||
if (/^sudo: .*command not found/m.test(stderr)) throw new Error(`${cmd} is not installed here`);
|
|
||||||
if (/^sudo:/m.test(stderr)) {
|
|
||||||
throw new Error(`${cmd} needs root and the runtime's account may not run it without a prompt: ${stderr}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/** The mesh's own tables, which `remove` never touches. */
|
/** The mesh's own tables, which `remove` never touches. */
|
||||||
@@ -83,17 +34,14 @@ export interface Removal {
|
|||||||
export class FirewallClient {
|
export class FirewallClient {
|
||||||
private readonly run: Runner;
|
private readonly run: Runner;
|
||||||
private readonly filterFile: string;
|
private readonly filterFile: string;
|
||||||
private readonly have: (tool: string) => boolean;
|
|
||||||
|
|
||||||
constructor(run: Runner = execRunner, filterFile: string = FILTER_FILE, have: (tool: string) => boolean = installed) {
|
constructor(run: Runner = execRunner, filterFile: string = process.env.MESH_FILTER_FILE ?? "/etc/nftables.conf") {
|
||||||
this.run = run;
|
this.run = run;
|
||||||
this.filterFile = filterFile;
|
this.filterFile = filterFile;
|
||||||
this.have = have;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The filter as this machine has it: its own tools, the mesh's file. */
|
static fromEnv(env: NodeJS.ProcessEnv = process.env): FirewallClient {
|
||||||
static onThisMachine(): FirewallClient {
|
return new FirewallClient(execRunner, env.MESH_FILTER_FILE ?? "/etc/nftables.conf");
|
||||||
return new FirewallClient();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The mesh's live table — exactly what the mesh's own filter is dropping and accepting. */
|
/** The mesh's live table — exactly what the mesh's own filter is dropping and accepting. */
|
||||||
@@ -117,14 +65,11 @@ export class FirewallClient {
|
|||||||
const legacy: Record<string, string> = {};
|
const legacy: Record<string, string> = {};
|
||||||
if (!table) {
|
if (!table) {
|
||||||
for (const tool of ["iptables-legacy", "ip6tables-legacy"]) {
|
for (const tool of ["iptables-legacy", "ip6tables-legacy"]) {
|
||||||
if (!this.have(tool)) continue; // no legacy tool, nothing to list
|
|
||||||
try {
|
try {
|
||||||
const out = await this.run(tool, ["-S"]);
|
const out = await this.run(tool, ["-S"]);
|
||||||
if (out.trim()) legacy[tool] = out;
|
if (out.trim()) legacy[tool] = out;
|
||||||
} catch (err) {
|
} catch {
|
||||||
// The tool is here and would not answer: said, not swallowed — a listing that silently
|
// the tool is not here, or the legacy filter is empty: nothing to list
|
||||||
// leaves out a predecessor's rules reads as "none".
|
|
||||||
legacy[tool] = `error: ${err instanceof Error ? err.message : String(err)}`;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -137,17 +82,14 @@ export class FirewallClient {
|
|||||||
return { loaded: this.filterFile, table: await this.ruleset() };
|
return { loaded: this.filterFile, table: await this.ruleset() };
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether the found front end is in force, whose chains `remove` leaves alone. Absent, it is
|
/** Whether the found front end is in force, whose chains `remove` leaves alone. */
|
||||||
* not; present and not answering, nothing is removed on a guess. */
|
|
||||||
private async ufwActive(): Promise<boolean> {
|
private async ufwActive(): Promise<boolean> {
|
||||||
if (!this.have("ufw")) return false;
|
|
||||||
let out: string;
|
|
||||||
try {
|
try {
|
||||||
out = await this.run("ufw", ["status"]);
|
const out = await this.run("ufw", ["status"]);
|
||||||
} catch (err) {
|
return /^Status:\s*active/m.test(out);
|
||||||
throw new Error(`cannot tell whether the found firewall is in force, so nothing of its is removed: ${err instanceof Error ? err.message : String(err)}`);
|
} catch {
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return /^Status:\s*active/m.test(out);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Remove one rule set the mesh did not write, named as the host reports it (ADR 0168). */
|
/** Remove one rule set the mesh did not write, named as the host reports it (ADR 0168). */
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
"module": "nftables",
|
"module": "nftables",
|
||||||
"version": "1",
|
"version": "1",
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"firewall"
|
"firewall",
|
||||||
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"claims": [
|
"claims": [
|
||||||
{
|
{
|
||||||
@@ -19,16 +20,17 @@
|
|||||||
"into": "/etc/nftables.conf"
|
"into": "/etc/nftables.conf"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "package",
|
"id": "package",
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"package": "nftables"
|
"package": "nftables"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "legacy-tools",
|
|
||||||
"type": "package",
|
|
||||||
"package": "iptables"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "unit",
|
"id": "unit",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
@@ -40,7 +42,7 @@
|
|||||||
"id": "stock-unit-stop",
|
"id": "stock-unit-stop",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "/etc/systemd/system/nftables.service.d/mesh.conf",
|
"path": "/etc/systemd/system/nftables.service.d/mesh.conf",
|
||||||
"content": "# The mesh: stopping the stock unit deletes only the mesh's table, never the whole ruleset\n# (novox/hq ADR 0100) — a flush would take the container runtime's rules and any firewall with it.\n[Service]\nExecStop=\nExecStop=nft delete table inet mesh\n",
|
"content": "# The mesh: stopping the stock unit deletes only the mesh's table, never the whole ruleset\n# (novox/hq ADR 0100) \u2014 a flush would take the container runtime's rules and any firewall with it.\n[Service]\nExecStop=\nExecStop=nft delete table inet mesh\n",
|
||||||
"mode": "0644"
|
"mode": "0644"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -62,20 +64,50 @@
|
|||||||
"type": "package",
|
"type": "package",
|
||||||
"package": "ufw",
|
"package": "ufw",
|
||||||
"absent": true
|
"absent": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-nftables",
|
||||||
|
"network": "host",
|
||||||
|
"capabilities": [
|
||||||
|
"NET_ADMIN"
|
||||||
|
],
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"/etc/nftables.conf:/etc/nftables.conf:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_FILTER_FILE": "/etc/nftables.conf"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"tools": [
|
"tools": [
|
||||||
"firewall_rules"
|
"firewall_rules"
|
||||||
],
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsc client.ts tools/index.ts --module NodeNext --moduleResolution NodeNext --target ES2022 --rootDir . --outDir dist",
|
"build": "tsc client.ts tools/index.ts --module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist",
|
||||||
"test": "node --test --experimental-strip-types 'test/*.test.ts'"
|
"test": "node --test --experimental-strip-types 'test/*.test.ts'"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -4,8 +4,7 @@
|
|||||||
// and the same in an iptables-nft table. It refuses what is not the operator's to remove.
|
// and the same in an iptables-nft table. It refuses what is not the operator's to remove.
|
||||||
import { test } from "node:test";
|
import { test } from "node:test";
|
||||||
import assert from "node:assert/strict";
|
import assert from "node:assert/strict";
|
||||||
import { readFileSync } from "node:fs";
|
import { FirewallClient, chainsJumpingTo, type Runner } from "../client.ts";
|
||||||
import { FILTER_FILE, FirewallClient, chainsJumpingTo, escalated, installed, type Runner } from "../client.ts";
|
|
||||||
|
|
||||||
const legacy = [
|
const legacy = [
|
||||||
"-P INPUT ACCEPT", "-P FORWARD DROP", "-P OUTPUT ACCEPT",
|
"-P INPUT ACCEPT", "-P FORWARD DROP", "-P OUTPUT ACCEPT",
|
||||||
@@ -35,7 +34,7 @@ function fake(ufwActive = false): { run: Runner; asked: string[] } {
|
|||||||
|
|
||||||
test("a predecessor's chain in the legacy filter loses its jumps, is flushed and deleted", async () => {
|
test("a predecessor's chain in the legacy filter loses its jumps, is flushed and deleted", async () => {
|
||||||
const f = fake();
|
const f = fake();
|
||||||
const out = await new FirewallClient(f.run, undefined, () => true).remove("chain HAL-MESH-ONLY (iptables-legacy)");
|
const out = await new FirewallClient(f.run).remove("chain HAL-MESH-ONLY (iptables-legacy)");
|
||||||
assert.deepEqual(out.did, [
|
assert.deepEqual(out.did, [
|
||||||
"iptables-legacy -D DOCKER-USER -i enp6s0 -p tcp -m conntrack --ctstate NEW -j HAL-MESH-ONLY",
|
"iptables-legacy -D DOCKER-USER -i enp6s0 -p tcp -m conntrack --ctstate NEW -j HAL-MESH-ONLY",
|
||||||
"iptables-legacy -F HAL-MESH-ONLY",
|
"iptables-legacy -F HAL-MESH-ONLY",
|
||||||
@@ -45,27 +44,27 @@ test("a predecessor's chain in the legacy filter loses its jumps, is flushed and
|
|||||||
|
|
||||||
test("the runtime's user chain is emptied back to its one return, never deleted", async () => {
|
test("the runtime's user chain is emptied back to its one return, never deleted", async () => {
|
||||||
const f = fake();
|
const f = fake();
|
||||||
const out = await new FirewallClient(f.run, undefined, () => true).remove("chain DOCKER-USER (ip6tables-legacy)");
|
const out = await new FirewallClient(f.run).remove("chain DOCKER-USER (ip6tables-legacy)");
|
||||||
assert.deepEqual(out.did, ["ip6tables-legacy -F DOCKER-USER", "ip6tables-legacy -A DOCKER-USER -j RETURN"]);
|
assert.deepEqual(out.did, ["ip6tables-legacy -F DOCKER-USER", "ip6tables-legacy -A DOCKER-USER -j RETURN"]);
|
||||||
const nft = await new FirewallClient(fake().run, undefined, () => true).remove("table ip6 filter, chain DOCKER-USER");
|
const nft = await new FirewallClient(fake().run).remove("table ip6 filter, chain DOCKER-USER");
|
||||||
assert.deepEqual(nft.did, ["ip6tables -F DOCKER-USER", "ip6tables -A DOCKER-USER -j RETURN"]);
|
assert.deepEqual(nft.did, ["ip6tables -F DOCKER-USER", "ip6tables -A DOCKER-USER -j RETURN"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a chain of the machine's own nftables table goes with the rules that reach it", async () => {
|
test("a chain of the machine's own nftables table goes with the rules that reach it", async () => {
|
||||||
const f = fake();
|
const f = fake();
|
||||||
const out = await new FirewallClient(f.run, undefined, () => true).remove("table ip6 own, chain deny");
|
const out = await new FirewallClient(f.run).remove("table ip6 own, chain deny");
|
||||||
assert.deepEqual(out.did, ["nft delete rule ip6 own forward handle 7", "nft delete chain ip6 own deny"]);
|
assert.deepEqual(out.did, ["nft delete rule ip6 own forward handle 7", "nft delete chain ip6 own deny"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("what is not the operator's to remove is refused by name", async () => {
|
test("what is not the operator's to remove is refused by name", async () => {
|
||||||
const c = new FirewallClient(fake(true).run, undefined, () => true);
|
const c = new FirewallClient(fake(true).run);
|
||||||
await assert.rejects(c.remove("table inet mesh, chain forward"), /the mesh's own table/);
|
await assert.rejects(c.remove("table inet mesh, chain forward"), /the mesh's own table/);
|
||||||
await assert.rejects(c.remove("chain DOCKER (iptables-legacy)"), /container runtime's own/);
|
await assert.rejects(c.remove("chain DOCKER (iptables-legacy)"), /container runtime's own/);
|
||||||
await assert.rejects(c.remove("chain FORWARD (iptables-legacy)"), /built in/);
|
await assert.rejects(c.remove("chain FORWARD (iptables-legacy)"), /built in/);
|
||||||
await assert.rejects(c.remove("chain ufw6-docker-logging-deny (ip6tables-legacy)"), /found firewall, which is in force/);
|
await assert.rejects(c.remove("chain ufw6-docker-logging-deny (ip6tables-legacy)"), /found firewall, which is in force/);
|
||||||
await assert.rejects(c.remove("something else"), /not a rule set as the host reports one/);
|
await assert.rejects(c.remove("something else"), /not a rule set as the host reports one/);
|
||||||
// Retired, a front end's leftover is nobody's and goes.
|
// Retired, a front end's leftover is nobody's and goes.
|
||||||
const retired = await new FirewallClient(fake(false).run, undefined, () => true).remove("chain ufw6-docker-logging-deny (ip6tables-legacy)");
|
const retired = await new FirewallClient(fake(false).run).remove("chain ufw6-docker-logging-deny (ip6tables-legacy)");
|
||||||
assert.ok(retired.did.includes("ip6tables-legacy -X ufw6-docker-logging-deny"));
|
assert.ok(retired.did.includes("ip6tables-legacy -X ufw6-docker-logging-deny"));
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -73,36 +72,3 @@ test("which chains jump to a target is read from a listing", () => {
|
|||||||
const listing = "table ip6 own {\n\tchain a {\n\t\tjump deny\n\t}\n\tchain b {\n\t\tgoto deny\n\t}\n\tchain deny {\n\t\tdrop\n\t}\n}\n";
|
const listing = "table ip6 own {\n\tchain a {\n\t\tjump deny\n\t}\n\tchain b {\n\t\tgoto deny\n\t}\n\tchain deny {\n\t\tdrop\n\t}\n}\n";
|
||||||
assert.deepEqual(chainsJumpingTo(listing, "deny"), ["a", "b"]);
|
assert.deepEqual(chainsJumpingTo(listing, "deny"), ["a", "b"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("the filter's commands run as given by root and through sudo without a prompt by anyone else", () => {
|
|
||||||
assert.deepEqual(escalated("nft", ["list", "ruleset"], 0), ["nft", ["list", "ruleset"]]);
|
|
||||||
assert.deepEqual(escalated("nft", ["-f", "/etc/nftables.conf"], 1000), ["sudo", ["-n", "nft", "-f", "/etc/nftables.conf"]]);
|
|
||||||
assert.deepEqual(escalated("iptables-legacy", ["-S"], undefined), ["sudo", ["-n", "iptables-legacy", "-S"]]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the filter file is the one the manifest's filtering names", () => {
|
|
||||||
const manifest = JSON.parse(readFileSync(new URL("../module.json", import.meta.url), "utf8")) as { filtering: { into: string } };
|
|
||||||
assert.equal(FILTER_FILE, manifest.filtering.into);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a tool is installed when an executable of its name is on the path, and not otherwise", () => {
|
|
||||||
assert.equal(installed("sh"), true);
|
|
||||||
assert.equal(installed("no-such-tool-of-the-mesh"), false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a found firewall that is absent guards nothing; one that will not answer stops the removal", async () => {
|
|
||||||
// Absent: its leftover chain is nobody's and goes, without asking it.
|
|
||||||
const absent = fake(true);
|
|
||||||
const out = await new FirewallClient(absent.run, undefined, () => false).remove("chain ufw6-docker-logging-deny (ip6tables-legacy)");
|
|
||||||
assert.ok(out.did.includes("ip6tables-legacy -X ufw6-docker-logging-deny"));
|
|
||||||
assert.ok(!absent.asked.some((a) => a.startsWith("ufw ")));
|
|
||||||
// Present and failing — refused by sudo, say — nothing is removed on a guess.
|
|
||||||
const refusing: Runner = async (cmd, args) => {
|
|
||||||
if (cmd === "ufw") throw new Error("ufw needs root and the runtime's account may not run it without a prompt");
|
|
||||||
return fake().run(cmd, args);
|
|
||||||
};
|
|
||||||
await assert.rejects(
|
|
||||||
new FirewallClient(refusing, undefined, () => true).remove("chain ufw6-docker-logging-deny (ip6tables-legacy)"),
|
|
||||||
/cannot tell whether the found firewall is in force/,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export function getFirewallTools(firewall: FirewallClient): ToolDefinition[] {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
const firewall = FirewallClient.onThisMachine();
|
const firewall = FirewallClient.fromEnv();
|
||||||
// The seat's verbs under the seat's name: the runtime serves them on the seat's subjects where this
|
// The seat's verbs under the seat's name: the runtime serves them on the seat's subjects where this
|
||||||
// module holds it (ADR 0159, 0160). The module's own under its own.
|
// module holds it (ADR 0159, 0160). The module's own under its own.
|
||||||
registerModuleTools("node-packet-filter", () => getSeatVerbs(firewall));
|
registerModuleTools("node-packet-filter", () => getSeatVerbs(firewall));
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# nodered's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/nodered
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts mqtt/probe.ts mqtt/connection.ts mqtt/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/nodered/dist /app/modules/nodered/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/nodered/dist/tools/index.js
|
||||||
|
# NOT dist/mqtt/index.js: that is a step the host runs to completion, named by the `mqtt`
|
||||||
|
# container's args as `mesh-tools run …` (novox/hq ADR 0052). Listed here it would run inside the
|
||||||
|
# serving sidecar too, and exit it.
|
||||||
+55
-31
@@ -12,7 +12,8 @@
|
|||||||
"api-token": {
|
"api-token": {
|
||||||
"path": "${dir:mesh-state}/api-token",
|
"path": "${dir:mesh-state}/api-token",
|
||||||
"taken": "at-start"
|
"taken": "at-start"
|
||||||
}
|
},
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
@@ -100,31 +101,53 @@
|
|||||||
"content": "{\n \"token\": \"${secret:api-token}\"\n}\n"
|
"content": "{\n \"token\": \"${secret:api-token}\"\n}\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "mqtt-env",
|
"id": "runtime",
|
||||||
"type": "file",
|
"type": "container",
|
||||||
"path": "${dir:state}/mqtt.env",
|
"name": "mesh-nodered",
|
||||||
"mode": "0600",
|
"network": "host",
|
||||||
"content": "MESH_NODERED_URL=http://127.0.0.1:${port:1880}\nMESH_NODERED_CONFIG_FILE=${dir:mesh-state}/config.json\nMESH_PROVISIONS_DIR=${dir:state}\nMESH_WRITTEN_DIR=${dir:written}\n"
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_NODERED_URL": "http://127.0.0.1:${port:1880}",
|
||||||
|
"MESH_NODERED_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "mqtt",
|
"id": "mqtt",
|
||||||
"type": "process",
|
"type": "container",
|
||||||
"name": "nodered-mqtt",
|
"name": "mesh-nodered-mqtt",
|
||||||
"artifact": "code",
|
"network": "host",
|
||||||
"run": [
|
|
||||||
"node",
|
|
||||||
"mqtt/index.js"
|
|
||||||
],
|
|
||||||
"run-once": true,
|
"run-once": true,
|
||||||
"env-file": [
|
"volumes": [
|
||||||
"${dir:state}/mqtt.env"
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:written}:/var/lib/nodered-provisions",
|
||||||
|
"${dir:state}/mqtt-topic.json:/run/provisions/mqtt-topic.json:ro",
|
||||||
|
"${dir:state}/mqtt-topic.secret:/run/provisions/mqtt-topic.secret:ro",
|
||||||
|
"${dir:state}/settings.json:/run/provisions/settings.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_NODERED_URL": "http://127.0.0.1:${port:1880}",
|
||||||
|
"MESH_NODERED_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_PROVISIONS_DIR": "/run/provisions",
|
||||||
|
"MESH_WRITTEN_DIR": "/var/lib/nodered-provisions"
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/nodered/dist/mqtt/index.js"
|
||||||
],
|
],
|
||||||
"restart-on": [
|
"restart-on": [
|
||||||
"mqtt-env",
|
|
||||||
"bound-mqtt-topic",
|
"bound-mqtt-topic",
|
||||||
"secret-mqtt-topic",
|
"secret-mqtt-topic",
|
||||||
"settings"
|
"settings"
|
||||||
]
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -150,22 +173,23 @@
|
|||||||
"mqtt-topic": "${dir:state}/mqtt-topic.secret"
|
"mqtt-topic": "${dir:state}/mqtt-topic.secret"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js",
|
|
||||||
"mqtt/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_NODERED_URL": "http://127.0.0.1:${port:1880}",
|
|
||||||
"MESH_NODERED_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# openai-consumer's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/openai-consumer
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc apply/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/openai-consumer/dist /app/modules/openai-consumer/dist
|
||||||
|
# No serve-time entrypoints: every container of this module names its command (`run` on a
|
||||||
|
# schedule), so nothing here serves — deliberately no MESH_TOOL_MODULES.
|
||||||
@@ -28,31 +28,44 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "apply",
|
"id": "apply",
|
||||||
"type": "process",
|
"type": "container",
|
||||||
"name": "openai-consumer-apply",
|
"name": "mesh-openai-consumer-apply",
|
||||||
"artifact": "code",
|
"network": "host",
|
||||||
"run": [
|
|
||||||
"node",
|
|
||||||
"apply/index.js"
|
|
||||||
],
|
|
||||||
"schedule": "*/5 * * * *",
|
"schedule": "*/5 * * * *",
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/openai-consumer/dist/apply/index.js"
|
||||||
|
],
|
||||||
|
"volumes": [
|
||||||
|
"${dir:state}:/run/state"
|
||||||
|
],
|
||||||
"env": {
|
"env": {
|
||||||
"MESH_MODEL_ACCESS_SECRET_FILE": "${dir:state}/api-key",
|
"MESH_MODEL_ACCESS_SECRET_FILE": "/run/state/api-key",
|
||||||
"MESH_MODEL_ACCESS_BIND_FILE": "${dir:state}/model.json",
|
"MESH_MODEL_ACCESS_BIND_FILE": "/run/state/model.json",
|
||||||
"MESH_OPENAI_ENV_FILE": "${dir:state}/config/openai.env",
|
"MESH_OPENAI_ENV_FILE": "/run/state/config/openai.env",
|
||||||
"MESH_OPENAI_CREDENTIALS_FILE": "${dir:state}/config/auth.json"
|
"MESH_OPENAI_CREDENTIALS_FILE": "/run/state/config/auth.json"
|
||||||
}
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"apply/index.js"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "${dir:state}/server.env",
|
"path": "${dir:state}/server.env",
|
||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "NODE_ENV=production\nPORT=9000\nMONGO_URL=mongodb://${bound:mongodb-database:as}:${secret:mongodb-database}@${bound:mongodb-database:at}:${bound:mongodb-database:port}/${bound:mongodb-database:as}?authSource=admin\nMONGO_DB=${bound:mongodb-database:as}\nMINIO_ENDPOINT=${bound:s3-bucket:at}\nMINIO_PORT=${bound:s3-bucket:port}\nMINIO_BUCKET=mesh-novox-photos\nMINIO_ACCESSKEY=${bound:s3-bucket:as}\nMINIO_SECRET=${secret:s3-bucket}\nMINIO_USE_SSL=false\n"
|
"content": "NODE_ENV=production\nPORT=9000\nMONGO_URL=mongodb://${bound:mongodb-database:as}:${secret:mongodb-database}@${bound:mongodb-database:at}:${bound:mongodb-database:port}/${bound:mongodb-database:as}?authSource=admin\nMONGO_DB=${bound:mongodb-database:as}\nMINIO_ENDPOINT=${bound:s3-bucket:at}\nMINIO_PORT=${bound:s3-bucket:port}\nMINIO_BUCKET=${bound:s3-bucket:bucket}\nMINIO_ACCESSKEY=${bound:s3-bucket:as}\nMINIO_SECRET=${secret:s3-bucket}\nMINIO_USE_SSL=false\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "net",
|
"id": "net",
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# portainer's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/portainer
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/portainer/dist /app/modules/portainer/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled. A container that instead ran only its
|
||||||
|
# provisioner (`run`) served no tools and emitted no events; a container that named no command
|
||||||
|
# ran no provisioner at all.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/portainer/dist/tools/index.js
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
// The Portainer API client — portainer's own code, living in the module (novox/hq ADR 0039).
|
||||||
|
// portainer is tools-only: its "events" would really be the underlying containers' lifecycle,
|
||||||
|
// which the host owns and emits — so this module reads Portainer's own resources (endpoints,
|
||||||
|
// stacks, containers) and exposes them, and stops there.
|
||||||
|
|
||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
|
||||||
|
export interface PortainerEndpoint {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
type: number;
|
||||||
|
url: string;
|
||||||
|
status: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PortainerStack {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
type: number;
|
||||||
|
endpointId: number;
|
||||||
|
status: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PortainerContainer {
|
||||||
|
id: string;
|
||||||
|
names: string[];
|
||||||
|
image: string;
|
||||||
|
state: string;
|
||||||
|
status: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The settings-merged config the mesh delivers (novox/hq ADR 0046): { url, apiKey, token, password, user, ... }. */
|
||||||
|
function meshConfig(file?: string): Record<string, string> {
|
||||||
|
if (!file) return {};
|
||||||
|
try { return JSON.parse(readFileSync(file, "utf8")) as Record<string, string>; }
|
||||||
|
catch { return {}; }
|
||||||
|
}
|
||||||
|
|
||||||
|
export class PortainerClient {
|
||||||
|
readonly baseUrl: string;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
url: string,
|
||||||
|
private readonly token: string,
|
||||||
|
) {
|
||||||
|
this.baseUrl = url.replace(/\/+$/, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build from the module's resolved environment. The URL is MESH_PORTAINER_URL (or the local
|
||||||
|
* dashboard port) and the API token is MESH_PORTAINER_TOKEN — an access token minted in
|
||||||
|
* Portainer, sent as X-API-Key. Throws when no token is configured, so a misconfigured module
|
||||||
|
* exposes nothing rather than calling Portainer unauthenticated.
|
||||||
|
*/
|
||||||
|
static fromEnv(env: NodeJS.ProcessEnv = process.env): PortainerClient {
|
||||||
|
const cfg = meshConfig(env.MESH_PORTAINER_CONFIG_FILE);
|
||||||
|
const url = cfg.url ?? env.MESH_PORTAINER_URL ?? `https://127.0.0.1:${env.PORTAINER_PORT ?? "9443"}`;
|
||||||
|
const token = cfg.token ?? env.MESH_PORTAINER_TOKEN;
|
||||||
|
if (!token) throw new Error("no Portainer token — set MESH_PORTAINER_TOKEN");
|
||||||
|
return new PortainerClient(url, token);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async get<T>(path: string): Promise<T> {
|
||||||
|
const res = await fetch(`${this.baseUrl}${path}`, { headers: { "X-API-Key": this.token } });
|
||||||
|
if (!res.ok) throw new Error(`Portainer ${path}: ${res.status} ${await res.text()}`);
|
||||||
|
return res.json() as Promise<T>;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The environments (endpoints) Portainer manages — each a Docker host or cluster it talks to. */
|
||||||
|
async listEndpoints(): Promise<PortainerEndpoint[]> {
|
||||||
|
const raw = await this.get<any[]>("/api/endpoints");
|
||||||
|
return (raw ?? []).map((e) => ({
|
||||||
|
id: e.Id,
|
||||||
|
name: e.Name,
|
||||||
|
type: e.Type,
|
||||||
|
url: e.URL,
|
||||||
|
status: e.Status,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The stacks (compose/swarm deployments) Portainer knows about. */
|
||||||
|
async listStacks(): Promise<PortainerStack[]> {
|
||||||
|
const raw = await this.get<any[]>("/api/stacks");
|
||||||
|
return (raw ?? []).map((s) => ({
|
||||||
|
id: s.Id,
|
||||||
|
name: s.Name,
|
||||||
|
type: s.Type,
|
||||||
|
endpointId: s.EndpointId,
|
||||||
|
status: s.Status,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The containers on one endpoint, read through Portainer's Docker API proxy. Includes stopped
|
||||||
|
* containers, so the caller sees the whole picture rather than only what is running.
|
||||||
|
*/
|
||||||
|
async listContainers(endpointId: number): Promise<PortainerContainer[]> {
|
||||||
|
const raw = await this.get<any[]>(`/api/endpoints/${endpointId}/docker/containers/json?all=1`);
|
||||||
|
return (raw ?? []).map((c) => ({
|
||||||
|
id: c.Id,
|
||||||
|
names: c.Names ?? [],
|
||||||
|
image: c.Image,
|
||||||
|
state: c.State,
|
||||||
|
status: c.Status,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
{
|
||||||
|
"module": "portainer",
|
||||||
|
"version": "1",
|
||||||
|
"slug": "portain",
|
||||||
|
"capabilities": [
|
||||||
|
"container-runtime"
|
||||||
|
],
|
||||||
|
"listens": [
|
||||||
|
{
|
||||||
|
"name": "web",
|
||||||
|
"port": 9000,
|
||||||
|
"protocol": "tcp",
|
||||||
|
"from": "mesh",
|
||||||
|
"why": "the dashboard over http; its public name is a route grant and the proxy reaches it here"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "web-tls",
|
||||||
|
"port": 9443,
|
||||||
|
"protocol": "tcp",
|
||||||
|
"from": "mesh",
|
||||||
|
"why": "the same dashboard over its own tls; the runtime sidecar talks to it here"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "data",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "server",
|
||||||
|
"type": "container",
|
||||||
|
"name": "portainer",
|
||||||
|
"image": "portainer/portainer-ce@sha256:4d616db18cfeb5dd41a69c0958bc825c84483ea9cde1106eb82a5d26f3bd8b0e",
|
||||||
|
"ports": [
|
||||||
|
"9000",
|
||||||
|
"9443"
|
||||||
|
],
|
||||||
|
"volumes": [
|
||||||
|
"${dir:data}:/data",
|
||||||
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime-config",
|
||||||
|
"type": "file",
|
||||||
|
"path": "${dir:mesh-state}/config.json",
|
||||||
|
"mode": "0600",
|
||||||
|
"content": "{}\n",
|
||||||
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-portainer",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_PORTAINER_URL": "https://127.0.0.1:9443",
|
||||||
|
"MESH_PORTAINER_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"artifacts": [
|
||||||
|
{
|
||||||
|
"name": "runtime",
|
||||||
|
"kind": "image",
|
||||||
|
"from": "Dockerfile"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"requires": [
|
||||||
|
"route"
|
||||||
|
],
|
||||||
|
"contributes": {
|
||||||
|
"route": {
|
||||||
|
"label": "portainer",
|
||||||
|
"endpoint": "web"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"binds": {
|
||||||
|
"route": "${dir:mesh-state}/route.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"name": "@novox/module-portainer",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"description": "portainer — container management UI. Its API client and tools live here (novox/hq ADR 0039).",
|
||||||
|
"type": "module",
|
||||||
|
"private": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@novox/mesh-sdk": "^0.1.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/node": "^22.0.0",
|
||||||
|
"typescript": "^5.6.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
// portainer's tools — its own code (novox/hq ADR 0039), importing portainer's own client. They
|
||||||
|
// return structured data; the mesh serves them through the sdk's tool harness. portainer is
|
||||||
|
// tools-only (no events entrypoint): a container starting or stopping is the host's signal to emit,
|
||||||
|
// not Portainer's to re-announce.
|
||||||
|
|
||||||
|
import { registerModuleTools, type ToolDefinition } from "@novox/mesh-sdk/tools";
|
||||||
|
import { PortainerClient } from "../client.js";
|
||||||
|
|
||||||
|
export function getPortainerTools(portainer: PortainerClient): ToolDefinition[] {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
name: "portainer_endpoints",
|
||||||
|
description: "List the environments (endpoints) Portainer manages — each a Docker host or cluster.",
|
||||||
|
input: {},
|
||||||
|
run: async () => {
|
||||||
|
const endpoints = await portainer.listEndpoints();
|
||||||
|
return { count: endpoints.length, endpoints };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "portainer_stacks",
|
||||||
|
description: "List the stacks (compose/swarm deployments) Portainer knows about.",
|
||||||
|
input: {},
|
||||||
|
run: async () => {
|
||||||
|
const stacks = await portainer.listStacks();
|
||||||
|
return { count: stacks.length, stacks };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "portainer_containers",
|
||||||
|
description: "List the containers on one Portainer endpoint, including stopped ones.",
|
||||||
|
input: { endpoint: { type: "number", description: "the endpoint id (see portainer_endpoints)" } },
|
||||||
|
run: async (args) => {
|
||||||
|
const endpointId = Number(args.endpoint);
|
||||||
|
const containers = await portainer.listContainers(endpointId);
|
||||||
|
return { endpointId, count: containers.length, containers };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
// The tools exist only when a token is configured; without one, portainer contributes none rather
|
||||||
|
// than failing the whole runtime.
|
||||||
|
registerModuleTools("portainer", (env) => {
|
||||||
|
try {
|
||||||
|
return getPortainerTools(PortainerClient.fromEnv(env));
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "ES2022",
|
||||||
|
"module": "NodeNext",
|
||||||
|
"moduleResolution": "NodeNext",
|
||||||
|
"strict": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"noEmit": true
|
||||||
|
},
|
||||||
|
"include": ["client.ts", "tools/index.ts"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# postgres's runtime: the tool runtime, carrying this module's compiled provisioner, tools and
|
||||||
|
# event consumer.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk is in the base image, so
|
||||||
|
# nothing is copied out of a neighbouring checkout — which is what lets the mesh build this from a
|
||||||
|
# repository and a path (novox/hq ADR 0069) rather than only on a workstation that happens to have
|
||||||
|
# the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned: the image this is COMPILED in, and the image it RUNS in.
|
||||||
|
# They are different images on purpose — the first carries a compiler and the second must not, or
|
||||||
|
# every running container would carry one it never invokes. The mesh answers both with the copies it
|
||||||
|
# holds, because a fingerprint written here would name one particular copy and no other mesh has it
|
||||||
|
# (novox/hq issue 044). Declared in module.json's `build.on`; deliberately no defaults, so a build
|
||||||
|
# nobody told stops here and says which module to build first.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against.
|
||||||
|
WORKDIR /app/modules/postgres
|
||||||
|
COPY . .
|
||||||
|
# The compiler is invoked by its real path rather than through node_modules/.bin, whose entries are
|
||||||
|
# symlinks to a launcher that requires its library relatively — resolved away when the base image
|
||||||
|
# was assembled.
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts provisioner/index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
# **This module talks to its database through psql, so psql has to be here.** The client is how
|
||||||
|
# postgres's provisioner runs DDL — it does not carry a driver — and the runtime base holds only
|
||||||
|
# what every module needs.
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends postgresql-client \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
COPY --from=build /app/modules/postgres/dist /app/modules/postgres/dist
|
||||||
|
# What a tool host should load from this module: its event consumer and its tools, which are
|
||||||
|
# separate entrypoints because they are loaded by different things. The provisioner is the third,
|
||||||
|
# and is not listed here — the declaration names it in the container's `args`, because it is what
|
||||||
|
# this module's own container runs. One image, because they are one module and share a client.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/postgres/dist/index.js,/app/modules/postgres/dist/tools/index.js,/app/modules/postgres/dist/provisioner/index.js
|
||||||
@@ -53,9 +53,16 @@
|
|||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"superuser": "${dir:state}/superuser.secret",
|
"superuser": "${dir:state}/superuser.secret",
|
||||||
|
"broker": "${dir:mesh-state}/broker",
|
||||||
"reader": "${dir:state}/reader.secret"
|
"reader": "${dir:state}/reader.secret"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -92,33 +99,45 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "client",
|
"id": "runtime",
|
||||||
"type": "package",
|
"type": "container",
|
||||||
"package": "postgresql-libs"
|
"name": "mesh-postgres",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:grants}:${dir:grants}:ro",
|
||||||
|
"${dir:state}/superuser.secret:/run/secrets/superuser:ro",
|
||||||
|
"${dir:state}/reader.secret:/run/secrets/reader:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_PROVISION_POSTGRES": "postgres://postgres@127.0.0.1:${port:5432}/postgres?sslmode=disable",
|
||||||
|
"MESH_PROVISION_POSTGRES_PORT": "${seat:mesh-store:5432}",
|
||||||
|
"MESH_PROVISION_PASSWORD_FILE": "/run/secrets/superuser",
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
||||||
|
"MESH_POSTGRES_READER_PASSWORD_FILE": "/run/secrets/reader"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_PROVISION_POSTGRES": "postgres://postgres@127.0.0.1:${port:5432}/postgres?sslmode=disable",
|
|
||||||
"MESH_PROVISION_PASSWORD_FILE": "${dir:state}/superuser.secret",
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
|
||||||
"MESH_POSTGRES_READER_PASSWORD_FILE": "${dir:state}/reader.secret"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# records' runtime: the tool runtime, carrying this module's compiled reader and its tools.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk is in the base image, so
|
||||||
|
# nothing is copied out of a neighbouring checkout (novox/hq ADR 0069).
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned: the image this is COMPILED in, and the image it RUNS in
|
||||||
|
# (novox/hq issue 044). Declared in module.json's `build.on`; deliberately no defaults.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/records
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc records.ts index.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
# **A module may need something the base image does not carry.** The reader keeps a checkout of the
|
||||||
|
# repository it reads (novox/hq ADR 0153) — a git working copy, kept current, not a derived copy — and
|
||||||
|
# the base image has no git. Certificates too, because the origin may be reached over TLS.
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends git ca-certificates \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
COPY --from=build /app/modules/records/dist /app/modules/records/dist
|
||||||
|
# Both entrypoints, loaded in serve mode: the consumer that pulls on a merge, and the tools.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/records/dist/index.js,/app/modules/records/dist/tools/index.js
|
||||||
+39
-19
@@ -11,6 +11,9 @@
|
|||||||
"binds": {
|
"binds": {
|
||||||
"git": "${dir:mesh-state}/git.json"
|
"git": "${dir:mesh-state}/git.json"
|
||||||
},
|
},
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"consumes": [
|
"consumes": [
|
||||||
"gitea.pull.merged"
|
"gitea.pull.merged"
|
||||||
],
|
],
|
||||||
@@ -50,30 +53,47 @@
|
|||||||
"content": "${bound:git:scheme}://${bound:git:at}:${bound:git:port}\n"
|
"content": "${bound:git:scheme}://${bound:git:at}:${bound:git:port}\n"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "git",
|
"id": "runtime",
|
||||||
"type": "package",
|
"type": "container",
|
||||||
"package": "git"
|
"name": "records",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${dir:mesh-state}/origin:/run/config/origin:ro",
|
||||||
|
"${dir:checkout}:${dir:checkout}"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECORDS_CONFIG_FILE": "/run/config/config.json",
|
||||||
|
"MESH_RECORDS_ORIGIN_FILE": "/run/config/origin",
|
||||||
|
"MESH_RECORDS_DIR": "${dir:checkout}"
|
||||||
|
},
|
||||||
|
"artifact": "runtime",
|
||||||
|
"restart-on": [
|
||||||
|
"config",
|
||||||
|
"origin"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_RECORDS_CONFIG_FILE": "${dir:mesh-state}/config.json",
|
|
||||||
"MESH_RECORDS_ORIGIN_FILE": "${dir:mesh-state}/origin",
|
|
||||||
"MESH_RECORDS_DIR": "${dir:checkout}"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# redis's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/redis
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts index.ts tools/index.ts provisioner/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/redis/dist /app/modules/redis/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled. A container that instead ran only its
|
||||||
|
# provisioner (`run`) served no tools and emitted no events; a container that named no command
|
||||||
|
# ran no provisioner at all.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/redis/dist/index.js,/app/modules/redis/dist/tools/index.js,/app/modules/redis/dist/provisioner/index.js
|
||||||
+42
-18
@@ -35,6 +35,9 @@
|
|||||||
"secrets": {
|
"secrets": {
|
||||||
"secret": "${dir:state}/default.secret"
|
"secret": "${dir:state}/default.secret"
|
||||||
},
|
},
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
"name": "cache",
|
"name": "cache",
|
||||||
@@ -45,6 +48,12 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -94,29 +103,44 @@
|
|||||||
"restart-on": [
|
"restart-on": [
|
||||||
"server-conf"
|
"server-conf"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-redis",
|
||||||
|
"network": "redis",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:grants}:/var/lib/redis-module/grants:ro",
|
||||||
|
"${dir:state}/default.secret:/run/secrets/default:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECEIVES": "/var/lib/redis-module/grants/mesh.json",
|
||||||
|
"MESH_PROVISION_REDIS": "redis:6379",
|
||||||
|
"MESH_PROVISION_PASSWORD_FILE": "/run/secrets/default"
|
||||||
|
},
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"index.js",
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
|
||||||
"MESH_PROVISION_REDIS": "127.0.0.1:${port:6379}",
|
|
||||||
"MESH_PROVISION_PASSWORD_FILE": "${dir:state}/default.secret"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# route-adapter's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/route-adapter
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc adapter.ts index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/route-adapter/dist /app/modules/route-adapter/dist
|
||||||
|
# **No MESH_TOOL_MODULES, deliberately.** This module serves no tool and consumes no event: it is a
|
||||||
|
# step the host runs to completion, named by the container's `args` as `mesh-tools run …`. Setting a
|
||||||
|
# serve-time entrypoint here would give the image a second way to be started — one that connects to
|
||||||
|
# the broker and never exits.
|
||||||
@@ -47,18 +47,23 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "adapt",
|
"id": "adapt",
|
||||||
"type": "process",
|
"type": "container",
|
||||||
"name": "route-adapter",
|
"name": "mesh-route-adapter",
|
||||||
"artifact": "code",
|
"artifact": "runtime",
|
||||||
"run": [
|
|
||||||
"node",
|
|
||||||
"index.js"
|
|
||||||
],
|
|
||||||
"run-once": true,
|
"run-once": true,
|
||||||
|
"volumes": [
|
||||||
|
"${dir:routes-dir}/mesh.json:${dir:routes-dir}/mesh.json:ro",
|
||||||
|
"${dir:state}/config.json:/run/config/config.json:ro",
|
||||||
|
"${access:dynamic}:/services/traefik/dynamic"
|
||||||
|
],
|
||||||
"env": {
|
"env": {
|
||||||
"MESH_RECEIVES": "${dir:routes-dir}/mesh.json",
|
"MESH_RECEIVES": "${dir:routes-dir}/mesh.json",
|
||||||
"MESH_ROUTE_ADAPTER_CONFIG": "${dir:state}/config.json"
|
"MESH_ROUTE_ADAPTER_CONFIG": "/run/config/config.json"
|
||||||
},
|
},
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"/app/modules/route-adapter/dist/index.js"
|
||||||
|
],
|
||||||
"restart-on": [
|
"restart-on": [
|
||||||
"received-route",
|
"received-route",
|
||||||
"config"
|
"config"
|
||||||
@@ -66,14 +71,23 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"index.js"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# searxng's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/searxng
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/searxng/dist /app/modules/searxng/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/searxng/dist/tools/index.js
|
||||||
+36
-14
@@ -8,7 +8,8 @@
|
|||||||
"secret": {
|
"secret": {
|
||||||
"path": "${dir:mesh-state}/secret",
|
"path": "${dir:mesh-state}/secret",
|
||||||
"taken": "at-start"
|
"taken": "at-start"
|
||||||
}
|
},
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
},
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
@@ -90,6 +91,25 @@
|
|||||||
"path": "${dir:mesh-state}/config.json",
|
"path": "${dir:mesh-state}/config.json",
|
||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{}\n"
|
"content": "{}\n"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-searxng",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_SEARXNG_URL": "http://127.0.0.1:${port:8080}",
|
||||||
|
"MESH_SEARXNG_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -105,21 +125,23 @@
|
|||||||
"route": "${dir:state}/route.json"
|
"route": "${dir:state}/route.json"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_SEARXNG_URL": "http://127.0.0.1:${port:8080}",
|
|
||||||
"MESH_SEARXNG_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"module": "ssh-client",
|
|
||||||
"version": "1",
|
|
||||||
"resources": [
|
|
||||||
{
|
|
||||||
"id": "ssh-dir",
|
|
||||||
"type": "directory",
|
|
||||||
"path": "${machine:account-home}/.ssh",
|
|
||||||
"owner": "${machine:account}",
|
|
||||||
"mode": "0700"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"facts": {
|
|
||||||
"ssh-config": {
|
|
||||||
"path": ".ssh/config",
|
|
||||||
"home": true,
|
|
||||||
"shared": true,
|
|
||||||
"template": "# The mesh's Host blocks — every other node, so `ssh <node>` reaches it as the\n# right account. This region is replaced whenever a node joins, leaves or is\n# renamed; the rest of this file is yours and is kept untouched.\n{{range .Machines}}{{if ne .Name $.Node}}\nHost {{.Name}} {{.FQDN}}\n HostName {{.FQDN}}\n{{if .Account}} User {{.Account}}\n{{end}}{{end}}{{end}}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,12 +5,20 @@
|
|||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
"provides": [
|
"provides": [
|
||||||
|
{
|
||||||
|
"name": "acme-ca",
|
||||||
|
"scope": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "internal-acme-ca",
|
"name": "internal-acme-ca",
|
||||||
"scope": "mesh"
|
"scope": "mesh"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"serves": {
|
"serves": {
|
||||||
|
"acme-ca": {
|
||||||
|
"path": "/acme/acme/directory",
|
||||||
|
"roots": "/roots.pem"
|
||||||
|
},
|
||||||
"internal-acme-ca": {
|
"internal-acme-ca": {
|
||||||
"path": "/acme/acme/directory",
|
"path": "/acme/acme/directory",
|
||||||
"roots": "/roots.pem"
|
"roots": "/roots.pem"
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# umami's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
# Compiled under /app/modules so `@novox/mesh-sdk` resolves upward into the base's own
|
||||||
|
# node_modules — the module is compiled against exactly the sdk it will run against. The compiler
|
||||||
|
# is invoked by its real path: node_modules/.bin entries are launcher symlinks the base image
|
||||||
|
# resolved away.
|
||||||
|
WORKDIR /app/modules/umami
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts provisioner/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/umami/dist /app/modules/umami/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled. A container that instead ran only its
|
||||||
|
# provisioner (`run`) served no tools and emitted no events; a container that named no command
|
||||||
|
# ran no provisioner at all.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/umami/dist/tools/index.js,/app/modules/umami/dist/provisioner/index.js
|
||||||
+51
-16
@@ -44,6 +44,9 @@
|
|||||||
"grants": {
|
"grants": {
|
||||||
"analytics": "${dir:grants}"
|
"analytics": "${dir:grants}"
|
||||||
},
|
},
|
||||||
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker"
|
||||||
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
"name": "web",
|
"name": "web",
|
||||||
@@ -54,6 +57,12 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"resources": [
|
"resources": [
|
||||||
|
{
|
||||||
|
"id": "mesh-state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "mesh"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
@@ -72,6 +81,13 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "DATABASE_URL=postgresql://${bound:postgres-database:as}:${secret:postgres-database}@${bound:postgres-database:at}:${bound:postgres-database:port}/${bound:postgres-database:as}\nDATABASE_TYPE=postgresql\nAPP_SECRET=${secret:app-secret}\n"
|
"content": "DATABASE_URL=postgresql://${bound:postgres-database:as}:${secret:postgres-database}@${bound:postgres-database:at}:${bound:postgres-database:port}/${bound:postgres-database:as}\nDATABASE_TYPE=postgresql\nAPP_SECRET=${secret:app-secret}\n"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "provisioner-env",
|
||||||
|
"type": "file",
|
||||||
|
"path": "${dir:state}/provisioner.env",
|
||||||
|
"mode": "0600",
|
||||||
|
"content": "MESH_PROVISION_UMAMI_URL=http://umami:3000\nGRANTS=${dir:grants}\n"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "net",
|
"id": "net",
|
||||||
"type": "network",
|
"type": "network",
|
||||||
@@ -90,27 +106,46 @@
|
|||||||
"3000"
|
"3000"
|
||||||
],
|
],
|
||||||
"secrets-in-environment": "a Next.js/Prisma application: DATABASE_URL and APP_SECRET are read from the environment only; not convertible"
|
"secrets-in-environment": "a Next.js/Prisma application: DATABASE_URL and APP_SECRET are read from the environment only; not convertible"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-umami",
|
||||||
|
"network": "umami",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:grants}:${dir:grants}",
|
||||||
|
"${dir:state}/admin.secret:/run/secrets/admin:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
||||||
|
"MESH_UMAMI_ADMIN_PASSWORD_FILE": "/run/secrets/admin"
|
||||||
|
},
|
||||||
|
"env-file": [
|
||||||
|
"${dir:state}/provisioner.env"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "code",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js",
|
|
||||||
"provisioner/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_RECEIVES": "${dir:grants}/mesh.json",
|
|
||||||
"MESH_UMAMI_ADMIN_PASSWORD_FILE": "${dir:state}/admin.secret",
|
|
||||||
"MESH_PROVISION_UMAMI_URL": "http://127.0.0.1:${port:3000}"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# unifi's runtime: the tool runtime, carrying this module's compiled code.
|
||||||
|
#
|
||||||
|
# **Built from this module's own directory and nothing else.** The sdk and the tool runtime are in
|
||||||
|
# the base images, published like any other artifact — which is what makes this buildable by the
|
||||||
|
# mesh from a repository and a path (novox/hq ADR 0069) rather than only on a workstation that
|
||||||
|
# happens to have the siblings.
|
||||||
|
#
|
||||||
|
# Two bases, named rather than pinned (novox/hq issue 044): the image this is COMPILED in and the
|
||||||
|
# image it RUNS in — the second must not carry a compiler. Declared in module.json's `build.on`.
|
||||||
|
ARG BUILD_BASE
|
||||||
|
ARG RUNTIME_BASE
|
||||||
|
|
||||||
|
FROM ${BUILD_BASE} AS build
|
||||||
|
WORKDIR /app/modules/unifi
|
||||||
|
COPY . .
|
||||||
|
RUN node /app/node_modules/typescript/bin/tsc client.ts tools/index.ts \
|
||||||
|
--module NodeNext --moduleResolution NodeNext --target ES2022 --outDir dist
|
||||||
|
|
||||||
|
FROM ${RUNTIME_BASE}
|
||||||
|
COPY --from=build /app/modules/unifi/dist /app/modules/unifi/dist
|
||||||
|
# Every serve-time entrypoint, loaded by the runtime in serve mode: tools and events serve, and a
|
||||||
|
# provider's provisioner runs its reconcile loop in the same process, with the broker connected —
|
||||||
|
# the convention novox/hq issues 060/061 settled.
|
||||||
|
ENV MESH_TOOL_MODULES=/app/modules/unifi/dist/tools/index.js
|
||||||
+35
-13
@@ -122,6 +122,25 @@
|
|||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "{\n \"site\": \"default\",\n \"password\": \"${secret:controller}\"\n}\n",
|
"content": "{\n \"site\": \"default\",\n \"password\": \"${secret:controller}\"\n}\n",
|
||||||
"merge": "json"
|
"merge": "json"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "runtime",
|
||||||
|
"type": "container",
|
||||||
|
"name": "mesh-unifi",
|
||||||
|
"network": "host",
|
||||||
|
"volumes": [
|
||||||
|
"${dir:mesh-state}/broker:/run/secrets/broker:ro",
|
||||||
|
"${dir:mesh-state}/config.json:/run/config/config.json:ro"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
"MESH_UNIFI_URL": "https://127.0.0.1:${port:8443}",
|
||||||
|
"MESH_UNIFI_CONFIG_FILE": "/run/config/config.json"
|
||||||
|
},
|
||||||
|
"restart-on": [
|
||||||
|
"runtime-config"
|
||||||
|
],
|
||||||
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"requires": [
|
"requires": [
|
||||||
@@ -139,24 +158,27 @@
|
|||||||
"route": "${dir:state}/route.json"
|
"route": "${dir:state}/route.json"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
|
"broker": "${dir:mesh-state}/broker",
|
||||||
"controller": "${dir:mesh-state}/controller"
|
"controller": "${dir:mesh-state}/controller"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
"on": [
|
||||||
|
{
|
||||||
|
"arg": "BUILD_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "build"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"arg": "RUNTIME_BASE",
|
||||||
|
"module": "mesh-tools",
|
||||||
|
"artifact": "runtime"
|
||||||
|
}
|
||||||
|
],
|
||||||
"artifacts": [
|
"artifacts": [
|
||||||
{
|
{
|
||||||
"name": "tools",
|
"name": "runtime",
|
||||||
"kind": "bundle",
|
"kind": "image",
|
||||||
"language": "typescript",
|
"from": "Dockerfile"
|
||||||
"entrypoints": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"loads": [
|
|
||||||
"tools/index.js"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"MESH_UNIFI_URL": "https://127.0.0.1:${port:8443}",
|
|
||||||
"MESH_UNIFI_CONFIG_FILE": "${dir:mesh-state}/config.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user