@specific.dev/spectest 0.131.11 → 0.131.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/android.js +2 -1
- package/dist/components/aws.d.ts +1 -1
- package/dist/components/aws.js +2 -1
- package/dist/components/electron.js +2 -1
- package/dist/components/email.js +2 -1
- package/dist/components/emulate/service.js +2 -1
- package/dist/components/expo.js +4 -3
- package/dist/components/k3s.js +5 -4
- package/dist/components/postgres.js +3 -2
- package/dist/components/replay-websocket.js +6 -1
- package/dist/components/supabase-pooler.js +2 -1
- package/dist/components/supabase.js +12 -11
- package/dist/components/temporal.js +3 -2
- package/dist/daemon.js +67 -51
- package/dist/harness/built-image.d.ts +3 -0
- package/dist/harness/built-image.js +5 -0
- package/dist/harness/builtin-images.d.ts +29 -0
- package/dist/harness/builtin-images.js +29 -0
- package/dist/harness/log-delta.d.ts +9 -0
- package/dist/harness/log-delta.js +10 -0
- package/dist/harness/registry-seed.d.ts +1 -1
- package/dist/harness/registry-seed.js +2 -1
- package/dist/harness/sticky-kubernetes.js +12 -0
- package/package.json +1 -1
- package/src/components/android.ts +2 -1
- package/src/components/aws.ts +2 -1
- package/src/components/electron.test.ts +2 -0
- package/src/components/electron.ts +2 -1
- package/src/components/email.ts +2 -1
- package/src/components/emulate/service.ts +2 -1
- package/src/components/expo.test.ts +2 -2
- package/src/components/expo.ts +5 -4
- package/src/components/image-pins.test.ts +44 -0
- package/src/components/k3s.ts +5 -4
- package/src/components/postgres.ts +3 -2
- package/src/components/replay-websocket.ts +6 -1
- package/src/components/replayFake-websocket.test.ts +23 -0
- package/src/components/supabase-pooler.ts +2 -1
- package/src/components/supabase.ts +12 -11
- package/src/components/temporal.ts +3 -2
- package/src/daemon.ts +71 -57
- package/src/harness/built-image-docker.test.ts +62 -0
- package/src/harness/built-image.ts +6 -0
- package/src/harness/builtin-images.ts +29 -0
- package/src/harness/log-delta.test.ts +17 -0
- package/src/harness/log-delta.ts +15 -0
- package/src/harness/registry-seed.ts +2 -1
- package/src/harness/sticky-kubernetes.test.ts +23 -0
- package/src/harness/sticky-kubernetes.ts +12 -0
- package/src/runtime-service-logs.test.ts +74 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { readFileSync } from "node:fs";
|
|
2
3
|
import { posix } from "node:path";
|
|
3
4
|
import { serviceGroup } from "../index.js";
|
|
@@ -21,7 +22,7 @@ a = 'scrcpy_print_version(void) {'
|
|
|
21
22
|
assert s.count(a) == 1
|
|
22
23
|
p.write_text(s.replace(a, a + '\n puts("spectest-first-frame-v1");'))`;
|
|
23
24
|
const shellQuote = (value) => "'" + value.replaceAll("'", "'\\''") + "'";
|
|
24
|
-
export const ANDROID_TOOLS_DOCKERFILE = `FROM node:22-bookworm-slim
|
|
25
|
+
export const ANDROID_TOOLS_DOCKERFILE = `FROM ${BUILTIN_IMAGES["node:22-bookworm-slim"]}
|
|
25
26
|
RUN apt-get update && apt-get install -y --no-install-recommends adb aapt apksigner zipalign ffmpeg default-jdk-headless ca-certificates openssl curl gcc python3 pkg-config meson ninja-build libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswresample-dev libusb-1.0-0-dev && rm -rf /var/lib/apt/lists/*
|
|
26
27
|
RUN curl -fL https://github.com/Genymobile/scrcpy/archive/refs/tags/v3.3.1.tar.gz | tar xz -C /tmp && curl -fL https://github.com/Genymobile/scrcpy/releases/download/v3.3.1/scrcpy-server-v3.3.1 -o /tmp/scrcpy-server && python3 -c ${shellQuote(recorderPatch.replaceAll("\n", ";"))} && meson setup /tmp/scrcpy-build /tmp/scrcpy-3.3.1 --buildtype=release -Dprebuilt_server=/tmp/scrcpy-server && ninja -C /tmp/scrcpy-build -j4 install && rm -rf /tmp/scrcpy*
|
|
27
28
|
ENV ANDROID_HOME=/opt/android JAVA_HOME=/usr/lib/jvm/default-java APPIUM_HOME=/opt/appium
|
package/dist/components/aws.d.ts
CHANGED
|
@@ -105,7 +105,7 @@ export declare function aws(opts?: AwsOptions): {
|
|
|
105
105
|
inputs?: string[] | undefined;
|
|
106
106
|
image: {
|
|
107
107
|
type: "registry";
|
|
108
|
-
reference:
|
|
108
|
+
reference: "ministackorg/ministack:1.4.8@sha256:eb0a00c897ec91589eb78a77f0afaf13a6d7be99abfeca2d1d719a7ec76d3141";
|
|
109
109
|
};
|
|
110
110
|
env: {
|
|
111
111
|
AWS_DEFAULT_REGION: string;
|
package/dist/components/aws.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
// `aws()` — the AWS cloud APIs, emulated inside the environment, answering
|
|
2
3
|
// at their **real** endpoints.
|
|
3
4
|
//
|
|
@@ -64,7 +65,7 @@ import { deflateRawSync } from "node:zlib";
|
|
|
64
65
|
import { certificate, provides, proxy, SELF_SERVICE_TOKEN } from "../index.js";
|
|
65
66
|
import { pauseRecording, resumeRecording } from "../recorder.js";
|
|
66
67
|
/** Backing image, pinned internally (not part of the documented surface). */
|
|
67
|
-
const AWS_IMAGE = "ministackorg/ministack:1.4.8";
|
|
68
|
+
const AWS_IMAGE = BUILTIN_IMAGES["ministackorg/ministack:1.4.8"];
|
|
68
69
|
/** Port the emulator serves every AWS API on. Internal: callers reach the
|
|
69
70
|
* emulator through the AWS hostnames, never through this port. */
|
|
70
71
|
const AWS_PORT = 4566;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { existsSync, readFileSync } from "node:fs";
|
|
2
3
|
import { posix } from "node:path";
|
|
3
4
|
import { resolveProjectPath } from "../project-files.js";
|
|
@@ -104,7 +105,7 @@ export function electron(options = {}) {
|
|
|
104
105
|
type: "dockerfile",
|
|
105
106
|
context,
|
|
106
107
|
exclude: ["node_modules", "**/node_modules", "out", "test-results", ".data"],
|
|
107
|
-
content: `FROM node:${node}
|
|
108
|
+
content: `FROM ${options.nodeVersion === undefined ? BUILTIN_IMAGES["node:24-bookworm-slim"] : `node:${node}`}
|
|
108
109
|
RUN apt-get update && apt-get install -y --no-install-recommends xvfb xauth libgtk-3-0 libnss3 libgbm1 libasound2 fonts-liberation ca-certificates && rm -rf /var/lib/apt/lists/*
|
|
109
110
|
WORKDIR /app
|
|
110
111
|
COPY . .
|
package/dist/components/email.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { rawFetch } from "../harness/raw-fetch.js";
|
|
2
3
|
import { recordEmail, reserveEvent, truncateUtf8, } from "../recorder.js";
|
|
3
4
|
import { wrap } from "../inspect.js";
|
|
4
|
-
const DEFAULT_IMAGE = "axllent/mailpit:v1.30";
|
|
5
|
+
const DEFAULT_IMAGE = BUILTIN_IMAGES["axllent/mailpit:v1.30"];
|
|
5
6
|
const SMTP_PORT = 1025;
|
|
6
7
|
const API_PORT = 8025;
|
|
7
8
|
/**
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../../harness/builtin-images.js";
|
|
1
2
|
// Shared runtime behind the third-party provider components — `google()`,
|
|
2
3
|
// `github()`, `apple()`, `microsoft()`, `okta()`.
|
|
3
4
|
//
|
|
@@ -49,7 +50,7 @@ import path from "node:path";
|
|
|
49
50
|
import { fileURLToPath } from "node:url";
|
|
50
51
|
import { certificate, provides, proxy, SELF_SERVICE_TOKEN } from "../../index.js";
|
|
51
52
|
/** Base image, pinned. Bun runs the emulators' ESM directly. */
|
|
52
|
-
const IMAGE_BASE = "oven/bun:1.3.14-alpine";
|
|
53
|
+
const IMAGE_BASE = BUILTIN_IMAGES["oven/bun:1.3.14-alpine"];
|
|
53
54
|
/** Emulator package version, pinned rather than floated. */
|
|
54
55
|
const EMULATE_VERSION = "0.9.0";
|
|
55
56
|
/** The port the provider is served on. Callers reach it through the
|
package/dist/components/expo.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
// `expo()` — a ready-to-use service for an Expo / React Native app rendered
|
|
2
3
|
// to the web, built for `ctx.mobile(...)`.
|
|
3
4
|
//
|
|
@@ -299,8 +300,8 @@ function publicEnvLines(env) {
|
|
|
299
300
|
* BuildKit, which every builder in a VM is.
|
|
300
301
|
*/
|
|
301
302
|
function generateDockerfile(input) {
|
|
302
|
-
const {
|
|
303
|
-
const lines = [`FROM
|
|
303
|
+
const { nodeImage, plan, publicEnv, outputDir } = input;
|
|
304
|
+
const lines = [`FROM ${nodeImage}`, "WORKDIR /app", "ENV CI=1", ...plan.env];
|
|
304
305
|
for (const step of plan.bootstrap)
|
|
305
306
|
lines.push(`RUN ${step}`);
|
|
306
307
|
lines.push(`COPY ${plan.manifests.join(" ")} ./`);
|
|
@@ -389,7 +390,7 @@ export function expo(opts = {}) {
|
|
|
389
390
|
image = {
|
|
390
391
|
type: "dockerfile",
|
|
391
392
|
content: generateDockerfile({
|
|
392
|
-
|
|
393
|
+
nodeImage: node.source === "the default" ? BUILTIN_IMAGES["node:22-bookworm-slim"] : `node:${node.tag}`,
|
|
393
394
|
plan,
|
|
394
395
|
publicEnv: publicEnvLines(opts.env ?? {}),
|
|
395
396
|
outputDir,
|
package/dist/components/k3s.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { isIP } from "node:net";
|
|
2
3
|
import { waitForK3sNodes } from "./k3s-nodes.js";
|
|
3
4
|
import { JOIN_DIRECTORY, prepareK3sJoin } from "./k3s-join.js";
|
|
@@ -492,7 +493,7 @@ function withTagging(api) {
|
|
|
492
493
|
* `registries.yaml`, then captured into the warm-template snapshot so
|
|
493
494
|
* warm starts never pull.
|
|
494
495
|
*/
|
|
495
|
-
const TRAEFIK_IMAGE = "rancher/mirrored-library-traefik:3.3.2";
|
|
496
|
+
const TRAEFIK_IMAGE = BUILTIN_IMAGES["rancher/mirrored-library-traefik:3.3.2"];
|
|
496
497
|
/**
|
|
497
498
|
* Names of the in-cluster resources that carry the CA-signed default
|
|
498
499
|
* ingress certificate (created in `setupK3sCluster` when TLS is enabled).
|
|
@@ -730,7 +731,7 @@ spec:
|
|
|
730
731
|
- operator: Exists
|
|
731
732
|
containers:
|
|
732
733
|
- name: registry
|
|
733
|
-
image: ${
|
|
734
|
+
image: ${REGISTRY_IMAGE}
|
|
734
735
|
imagePullPolicy: IfNotPresent
|
|
735
736
|
env:
|
|
736
737
|
- name: REGISTRY_HTTP_ADDR
|
|
@@ -1476,7 +1477,7 @@ function createK3sCluster(opts, count) {
|
|
|
1476
1477
|
// checked all Nodes and finished loading images, not at API readiness.
|
|
1477
1478
|
const readyCmd = "kubectl get --raw=/readyz >/dev/null 2>&1";
|
|
1478
1479
|
const def = {
|
|
1479
|
-
image: { type: "registry", reference: `rancher/k3s:${version}` },
|
|
1480
|
+
image: { type: "registry", reference: opts.version === undefined ? BUILTIN_IMAGES["rancher/k3s:v1.33.5-k3s1"] : `rancher/k3s:${version}` },
|
|
1480
1481
|
imageBuilds: server ? images.builds : [],
|
|
1481
1482
|
tls: server && registryHost ? [{ hostname: registryHost, port: K3S_REGISTRY_PORT }] : [],
|
|
1482
1483
|
command: cmd,
|
|
@@ -1588,7 +1589,7 @@ function createK3sCluster(opts, count) {
|
|
|
1588
1589
|
for (;;) {
|
|
1589
1590
|
try {
|
|
1590
1591
|
const pod = (await helpers.client.core.createNamespacedPod({ namespace: "default", dryRun: "All", body: {
|
|
1591
|
-
metadata: { generateName: "spectest-trust-probe-" }, spec: { containers: [{ name: "probe", image: "registry.k8s.io/pause:3.10" }] },
|
|
1592
|
+
metadata: { generateName: "spectest-trust-probe-" }, spec: { containers: [{ name: "probe", image: BUILTIN_IMAGES["registry.k8s.io/pause:3.10"] }] },
|
|
1592
1593
|
} })).unwrap();
|
|
1593
1594
|
if (pod.spec?.containers[0].env?.some(e => e.name === "SSL_CERT_FILE" && e.value === "/spectest/ca-bundle.crt"))
|
|
1594
1595
|
break;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { SQL } from "../sql.js";
|
|
2
3
|
import { postgresTls } from "./postgres-tls.js";
|
|
3
4
|
/**
|
|
@@ -26,8 +27,8 @@ import { postgresTls } from "./postgres-tls.js";
|
|
|
26
27
|
* ```
|
|
27
28
|
*/
|
|
28
29
|
export function postgres(opts) {
|
|
29
|
-
const
|
|
30
|
-
|
|
30
|
+
const reference = opts.image ?? (opts.version === undefined
|
|
31
|
+
? BUILTIN_IMAGES["postgres:18-alpine"] : `postgres:${opts.version}`);
|
|
31
32
|
const port = opts.port ?? 5432;
|
|
32
33
|
const persistent = opts.persistent ?? true;
|
|
33
34
|
const tls = opts.tls !== false ? postgresTls() : undefined;
|
|
@@ -176,7 +176,12 @@ export function replayWebSocket(args) {
|
|
|
176
176
|
const progress = record.inputMode === "anchors"
|
|
177
177
|
? ` occurrence ${record.inputOccurrences[position]}; observed ${occurrences.get(expected) ?? 0} occurrences; received ${receivedMessages} messages, ${receivedCandidates} candidates; last candidate ${lastCandidate ?? "<none>"}`
|
|
178
178
|
: "";
|
|
179
|
-
|
|
179
|
+
const reordered = record.inputMode === "anchors"
|
|
180
|
+
&& (occurrences.get(expected) ?? 0) >= record.inputOccurrences[position];
|
|
181
|
+
const detail = reordered
|
|
182
|
+
? "required input arrived before preceding anchors matched"
|
|
183
|
+
: "required input never arrived";
|
|
184
|
+
return diagnostic(`${detail}; expected ${expected}${progress}`);
|
|
180
185
|
};
|
|
181
186
|
const armDeadline = () => {
|
|
182
187
|
clearTimeout(deadline);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
export const DEFAULT_POOLER_CONFIG = {
|
|
2
3
|
enabled: false,
|
|
3
4
|
port: 54329,
|
|
@@ -64,7 +65,7 @@ export function supabasePoolerService(opts) {
|
|
|
64
65
|
const { config, dbHost, tenantId, password, jwtSecret, tls, url } = opts;
|
|
65
66
|
const quotedUrl = `'${url.replace(/'/g, "'\\''")}'`;
|
|
66
67
|
return {
|
|
67
|
-
image: { type: "registry", reference: "supabase/supavisor:2.9.12" },
|
|
68
|
+
image: { type: "registry", reference: BUILTIN_IMAGES["supabase/supavisor:2.9.12"] },
|
|
68
69
|
// eval starts the OTP application too. Give that temporary instance
|
|
69
70
|
// ephemeral SQL ports so readiness only sees the final server process.
|
|
70
71
|
command: '/app/bin/migrate && PROXY_PORT_SESSION=0 PROXY_PORT_TRANSACTION=0 /app/bin/supavisor eval "$(cat /etc/pooler/pooler.exs)" && exec /app/bin/server',
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { rawFetch } from "../harness/raw-fetch.js";
|
|
2
3
|
// A ready-to-use, self-hosted **Supabase** stack, expressed as a set of
|
|
3
4
|
// spectest services (one container each) wired together on spectest-net.
|
|
@@ -68,22 +69,22 @@ import { supabasePoolerService } from "./supabase-pooler.js";
|
|
|
68
69
|
import { SUPABASE_COVERAGE_COLLECTOR, supabaseFunctionsCoverage } from "./supabase-coverage.js";
|
|
69
70
|
import { mapSupabaseConfig, parseSupabaseConfigFile, } from "./supabase-config.js";
|
|
70
71
|
// ──────────────────────────────────────────────────────────────────────────
|
|
71
|
-
//
|
|
72
|
-
//
|
|
72
|
+
// Digest-pinned upstream images. Update BUILTIN_IMAGES together for compatible
|
|
73
|
+
// Supabase releases; each is pulled through the host Hub mirror on
|
|
73
74
|
// first cold boot and captured into the warm-template snapshot thereafter.
|
|
74
75
|
// ──────────────────────────────────────────────────────────────────────────
|
|
75
76
|
const IMAGES = {
|
|
76
|
-
db: "supabase/postgres:17.6.1.136",
|
|
77
|
-
kong: "kong/kong:3.9.1",
|
|
78
|
-
auth: "supabase/gotrue:v2.189.0",
|
|
79
|
-
rest: "postgrest/postgrest:v14.12",
|
|
80
|
-
realtime: "supabase/realtime:v2.102.3",
|
|
81
|
-
storage: "supabase/storage-api:v1.60.4",
|
|
82
|
-
imgproxy: "darthsim/imgproxy:v3.30.1",
|
|
83
|
-
functions: "supabase/edge-runtime:v1.74.0",
|
|
77
|
+
db: BUILTIN_IMAGES["supabase/postgres:17.6.1.136"],
|
|
78
|
+
kong: BUILTIN_IMAGES["kong/kong:3.9.1"],
|
|
79
|
+
auth: BUILTIN_IMAGES["supabase/gotrue:v2.189.0"],
|
|
80
|
+
rest: BUILTIN_IMAGES["postgrest/postgrest:v14.12"],
|
|
81
|
+
realtime: BUILTIN_IMAGES["supabase/realtime:v2.102.3"],
|
|
82
|
+
storage: BUILTIN_IMAGES["supabase/storage-api:v1.60.4"],
|
|
83
|
+
imgproxy: BUILTIN_IMAGES["darthsim/imgproxy:v3.30.1"],
|
|
84
|
+
functions: BUILTIN_IMAGES["supabase/edge-runtime:v1.74.0"],
|
|
84
85
|
// Serves custom mail templates to GoTrue over HTTP (see the `templates`
|
|
85
86
|
// part). Tiny, and only pulled by a stack that configures a template.
|
|
86
|
-
templates: "busybox:1.37",
|
|
87
|
+
templates: BUILTIN_IMAGES["busybox:1.37"],
|
|
87
88
|
};
|
|
88
89
|
/** Override tables without mutating the parsed project config. */
|
|
89
90
|
function mergeConfig(base, overrides) {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "../harness/builtin-images.js";
|
|
1
2
|
import { serviceGroup } from "../index.js";
|
|
2
3
|
import { rawFetch } from "../harness/raw-fetch.js";
|
|
3
4
|
import { readRaw } from "../inspect.js";
|
|
@@ -164,14 +165,14 @@ export function temporal(opts = {}) {
|
|
|
164
165
|
primary, expectKey: name,
|
|
165
166
|
services: () => {
|
|
166
167
|
const server = {
|
|
167
|
-
image: { type: "registry", reference: opts.image ?? "temporalio/temporal:1.9.1" }, args,
|
|
168
|
+
image: { type: "registry", reference: opts.image ?? BUILTIN_IMAGES["temporalio/temporal:1.9.1"] }, args,
|
|
168
169
|
ports: [port, httpPort, ...(opts.ui ? [8233] : [])],
|
|
169
170
|
readyCheck: { type: "http", port: httpPort, path: `/api/v1/namespaces/${encodeURIComponent(namespace)}`, timeoutSecs: 30 },
|
|
170
171
|
};
|
|
171
172
|
if (!opts.tls)
|
|
172
173
|
return { server };
|
|
173
174
|
return { server, tls: {
|
|
174
|
-
image: { type: "registry", reference: "nginx:1.29.6-alpine" },
|
|
175
|
+
image: { type: "registry", reference: BUILTIN_IMAGES["nginx:1.29.6-alpine"] },
|
|
175
176
|
ports: [port], hostnames: [opts.tls.hostname], dependsOn: [serverName],
|
|
176
177
|
certificates: [{ hostnames: [opts.tls.hostname], certPath: "/tls/server.crt", keyPath: "/tls/server.key" }],
|
|
177
178
|
files: [{ path: "/etc/nginx/nginx.conf", content: `worker_processes 1;\nevents { worker_connections 1024; }\nstream { server { listen ${port} ssl; ssl_certificate /tls/server.crt; ssl_certificate_key /tls/server.key; ssl_protocols TLSv1.2 TLSv1.3; ssl_alpn h2; proxy_pass ${serverName}:${port}; } }\n` }],
|
package/dist/daemon.js
CHANGED
|
@@ -4,6 +4,7 @@ import { collectSecretRefs } from "./fake-upstream.js";
|
|
|
4
4
|
import { phoneScope, phoneRecordingChunk, releasePhoneRecording } from "./phone.js";
|
|
5
5
|
import { runWithBackgroundFailures } from "./harness/background-failures.js";
|
|
6
6
|
import { generateHostCert as mintHostCert } from "./harness/certificate.js";
|
|
7
|
+
import { containerdImageOutput } from "./harness/built-image.js";
|
|
7
8
|
import { componentBuildTasks, COMPONENT_RUNTIME } from "./harness/component-images.js";
|
|
8
9
|
import { waitForAll } from "./harness/concurrency.js";
|
|
9
10
|
import { updateServiceProgress, serviceProgressSnapshot } from "./harness/service-progress.js";
|
|
@@ -52,7 +53,7 @@ import { fakeFunctions, fakeFunctionParameters, callFakeFunction } from "./harne
|
|
|
52
53
|
import { dispatchFake } from "./harness/fake-websocket.js";
|
|
53
54
|
import { casesMetadata as catalogueCases, groupsMetadata as catalogueGroups, } from "./harness/catalogue.js";
|
|
54
55
|
import { summarizeBuildKit } from "./harness/buildkit-progress.js";
|
|
55
|
-
import { LOG_DELTA_MAX_BYTES, capMiddle, streamDelta } from "./harness/log-delta.js";
|
|
56
|
+
import { LOG_DELTA_MAX_BYTES, capMiddle, streamDelta, mergeServiceLogDeltas } from "./harness/log-delta.js";
|
|
56
57
|
import { resolveHostPath as resolveVolumeHostPath, sanitizeSegment, } from "./harness/volume-paths.js";
|
|
57
58
|
import { pollUntilReady } from "./harness/ready-poll.js";
|
|
58
59
|
import { fsUsageDiagnostics } from "./harness/wrapper-rules.js";
|
|
@@ -491,22 +492,6 @@ function ensureLocalBuildkitd() {
|
|
|
491
492
|
})();
|
|
492
493
|
return _localBuilder;
|
|
493
494
|
}
|
|
494
|
-
/**
|
|
495
|
-
* A reference as containerd names it. buildx's `-t` on a remote builder
|
|
496
|
-
* stores an unqualified name (`probe:bx`) that dockerd then cannot
|
|
497
|
-
* resolve (measured, CONTAINER_STORE.md), so the in-VM build names its
|
|
498
|
-
* output in full.
|
|
499
|
-
*/
|
|
500
|
-
function qualifyImageRef(ref) {
|
|
501
|
-
const slash = ref.indexOf("/");
|
|
502
|
-
const first = slash < 0 ? "" : ref.slice(0, slash);
|
|
503
|
-
const isRegistry = first.includes(".") || first.includes(":") || first === "localhost";
|
|
504
|
-
if (slash < 0)
|
|
505
|
-
return `docker.io/library/${ref}`;
|
|
506
|
-
if (!isRegistry)
|
|
507
|
-
return `docker.io/${ref}`;
|
|
508
|
-
return ref;
|
|
509
|
-
}
|
|
510
495
|
/** Host directory backing one volume mount. Rules (notably which volumes
|
|
511
496
|
* survive the delta-restore teardown) live in `harness/volume-paths.ts`. */
|
|
512
497
|
function resolveHostPath(service, vol) {
|
|
@@ -1053,11 +1038,15 @@ async function runServiceBuild(name, image, tag) {
|
|
|
1053
1038
|
// every cached parent before the first uncached step (11–79 s for
|
|
1054
1039
|
// one `COPY` on Specific's dashboard) and a second full pass to
|
|
1055
1040
|
// export after every miss.
|
|
1041
|
+
// Keep an immutable image reference as well as the service tag. The
|
|
1042
|
+
// containerd exporter replaces the tag directly, bypassing Docker's
|
|
1043
|
+
// dangling-image retention. Old versions must remain usable until our
|
|
1044
|
+
// image GC decides they are no longer needed (including by nested stores).
|
|
1056
1045
|
buildArgs = [
|
|
1057
1046
|
"buildx", "build",
|
|
1058
1047
|
"--builder", LOCAL_BUILDER_NAME,
|
|
1059
1048
|
"--progress=plain",
|
|
1060
|
-
"--output",
|
|
1049
|
+
"--output", containerdImageOutput(tag),
|
|
1061
1050
|
...argFlags,
|
|
1062
1051
|
"-f", dfPath, contextDir,
|
|
1063
1052
|
];
|
|
@@ -1158,6 +1147,12 @@ async function runContainer(svc, tag, volumeFlags,
|
|
|
1158
1147
|
// runtime `startService` (whose service isn't in LOWERED) to give the new
|
|
1159
1148
|
// container docker-native multi-label resolution for its `hostnames`.
|
|
1160
1149
|
extraAliases = []) {
|
|
1150
|
+
// Preserve the previous incarnation before the name is reused.
|
|
1151
|
+
if (RUNTIME_SERVICES.has(svc.name))
|
|
1152
|
+
await stopRuntimeService(svc.name);
|
|
1153
|
+
STOPPED_LOG_SERVICES.delete(svc.name);
|
|
1154
|
+
LOG_MARKERS.delete(`${svc.name}\0stdout`);
|
|
1155
|
+
LOG_MARKERS.delete(`${svc.name}\0stderr`);
|
|
1161
1156
|
// Idempotent: clean up any leftover container with the same name.
|
|
1162
1157
|
await docker(["rm", "-f", svc.name], 30_000);
|
|
1163
1158
|
// The argv, and every rule shaping it, lives in `harness/container-run.ts`
|
|
@@ -2469,6 +2464,15 @@ async function stopRuntimeService(name) {
|
|
|
2469
2464
|
const t0 = Date.now();
|
|
2470
2465
|
const resv = reserveEvent();
|
|
2471
2466
|
const svc = RUNTIME_SERVICES.get(name);
|
|
2467
|
+
// Freeze log production before reading, while Docker still owns the logs.
|
|
2468
|
+
// Keep force-stop semantics; removing first destroys the only copy.
|
|
2469
|
+
await docker(["kill", name], 30_000);
|
|
2470
|
+
if (!STOPPED_LOG_SERVICES.has(name)) {
|
|
2471
|
+
const delta = await captureServiceLogDelta(name, true);
|
|
2472
|
+
const previous = STOPPED_LOG_DELTAS.get(name);
|
|
2473
|
+
STOPPED_LOG_DELTAS.set(name, previous ? mergeServiceLogDeltas(previous, delta) : delta);
|
|
2474
|
+
STOPPED_LOG_SERVICES.add(name);
|
|
2475
|
+
}
|
|
2472
2476
|
await docker(["rm", "-f", name], 30_000);
|
|
2473
2477
|
RUNTIME_SERVICES.delete(name);
|
|
2474
2478
|
for (const entry of svc?.tls ?? [])
|
|
@@ -2921,6 +2925,10 @@ function parkCoverageBundle(caseId, captures) {
|
|
|
2921
2925
|
* so it travels with the snapshot into every fork.
|
|
2922
2926
|
*/
|
|
2923
2927
|
const LOG_MARKERS = new Map();
|
|
2928
|
+
// Fork with the harness, like markers. Deltas drain once per case; names remain
|
|
2929
|
+
// excluded from Docker reads until a replacement container starts.
|
|
2930
|
+
const STOPPED_LOG_DELTAS = new Map();
|
|
2931
|
+
const STOPPED_LOG_SERVICES = new Set();
|
|
2924
2932
|
/**
|
|
2925
2933
|
* Inspect a container's run state for {@link ServiceLogDelta}: `{}` while
|
|
2926
2934
|
* running (or when inspect fails — a removed container has no state left to
|
|
@@ -2949,43 +2957,51 @@ async function captureServiceLogDeltas() {
|
|
|
2949
2957
|
byName.set(s.name, s);
|
|
2950
2958
|
for (const [name, s] of RUNTIME_SERVICES)
|
|
2951
2959
|
byName.set(name, s);
|
|
2952
|
-
const
|
|
2953
|
-
|
|
2954
|
-
|
|
2955
|
-
|
|
2956
|
-
|
|
2957
|
-
|
|
2958
|
-
|
|
2959
|
-
|
|
2960
|
-
|
|
2961
|
-
|
|
2962
|
-
|
|
2963
|
-
|
|
2964
|
-
|
|
2965
|
-
|
|
2966
|
-
|
|
2967
|
-
|
|
2968
|
-
|
|
2969
|
-
...stop,
|
|
2970
|
-
};
|
|
2971
|
-
}
|
|
2972
|
-
const outKey = `${svc.name}stdout`;
|
|
2973
|
-
const errKey = `${svc.name}stderr`;
|
|
2974
|
-
const out = streamDelta(r.stdout, LOG_MARKERS.get(outKey)?.lines ?? 0);
|
|
2975
|
-
const err = streamDelta(r.stderr, LOG_MARKERS.get(errKey)?.lines ?? 0);
|
|
2976
|
-
LOG_MARKERS.set(outKey, { lines: out.total });
|
|
2977
|
-
LOG_MARKERS.set(errKey, { lines: err.total });
|
|
2960
|
+
const deltas = new Map(STOPPED_LOG_DELTAS);
|
|
2961
|
+
for (const delta of await Promise.all([...byName.keys()]
|
|
2962
|
+
.filter(name => !STOPPED_LOG_SERVICES.has(name)).map(name => captureServiceLogDelta(name)))) {
|
|
2963
|
+
const previous = deltas.get(delta.service);
|
|
2964
|
+
deltas.set(delta.service, previous ? mergeServiceLogDeltas(previous, delta) : delta);
|
|
2965
|
+
}
|
|
2966
|
+
STOPPED_LOG_DELTAS.clear();
|
|
2967
|
+
return [...deltas.values()];
|
|
2968
|
+
}
|
|
2969
|
+
async function captureServiceLogDelta(name, final = false) {
|
|
2970
|
+
const [r, stop] = await Promise.all([
|
|
2971
|
+
docker(["logs", "--timestamps", name], 30_000),
|
|
2972
|
+
containerStopState(name),
|
|
2973
|
+
]);
|
|
2974
|
+
if (r.code !== 0) {
|
|
2975
|
+
// Container gone/renamed — surface the CLI error, leave markers put.
|
|
2976
|
+
const err = capMiddle(r.stderr || r.stdout, LOG_DELTA_MAX_BYTES);
|
|
2978
2977
|
return {
|
|
2979
|
-
service:
|
|
2980
|
-
stdout:
|
|
2981
|
-
stdoutTruncated:
|
|
2982
|
-
stdoutReset:
|
|
2983
|
-
stderr: err.
|
|
2978
|
+
service: name,
|
|
2979
|
+
stdout: "",
|
|
2980
|
+
stdoutTruncated: false,
|
|
2981
|
+
stdoutReset: false,
|
|
2982
|
+
stderr: err.value,
|
|
2984
2983
|
stderrTruncated: err.truncated,
|
|
2985
|
-
stderrReset:
|
|
2984
|
+
stderrReset: false,
|
|
2986
2985
|
...stop,
|
|
2987
2986
|
};
|
|
2988
|
-
}
|
|
2987
|
+
}
|
|
2988
|
+
const outKey = `${name}stdout`;
|
|
2989
|
+
const errKey = `${name}stderr`;
|
|
2990
|
+
const complete = (text) => final && text && !text.endsWith("\n") ? text + "\n" : text;
|
|
2991
|
+
const out = streamDelta(complete(r.stdout), LOG_MARKERS.get(outKey)?.lines ?? 0);
|
|
2992
|
+
const err = streamDelta(complete(r.stderr), LOG_MARKERS.get(errKey)?.lines ?? 0);
|
|
2993
|
+
LOG_MARKERS.set(outKey, { lines: out.total });
|
|
2994
|
+
LOG_MARKERS.set(errKey, { lines: err.total });
|
|
2995
|
+
return {
|
|
2996
|
+
service: name,
|
|
2997
|
+
stdout: out.delta,
|
|
2998
|
+
stdoutTruncated: out.truncated,
|
|
2999
|
+
stdoutReset: out.reset,
|
|
3000
|
+
stderr: err.delta,
|
|
3001
|
+
stderrTruncated: err.truncated,
|
|
3002
|
+
stderrReset: err.reset,
|
|
3003
|
+
...stop,
|
|
3004
|
+
};
|
|
2989
3005
|
}
|
|
2990
3006
|
// ────────────────────────────────────────────────────────────────────────
|
|
2991
3007
|
// Coverage capture (opt-in per service; see coverage.ts + harness/coverage.ts)
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
/** Containerd exports replace mutable tags without Docker's dangling-image
|
|
2
|
+
* retention. Keep each result addressable until the SDK's image GC evicts it. */
|
|
3
|
+
export declare function containerdImageOutput(reference: string): string;
|
|
1
4
|
export interface Descriptor {
|
|
2
5
|
digest: string;
|
|
3
6
|
size: number;
|
|
@@ -3,6 +3,11 @@ import { execFile } from "node:child_process";
|
|
|
3
3
|
import { createHash } from "node:crypto";
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
5
|
import { canonicalImageReference } from "./component-images.js";
|
|
6
|
+
/** Containerd exports replace mutable tags without Docker's dangling-image
|
|
7
|
+
* retention. Keep each result addressable until the SDK's image GC evicts it. */
|
|
8
|
+
export function containerdImageOutput(reference) {
|
|
9
|
+
return `type=image,name=${canonicalImageReference(reference)},name-canonical=true,unpack=true`;
|
|
10
|
+
}
|
|
6
11
|
const digest = (bytes) => `sha256:${createHash("sha256").update(bytes).digest("hex")}`;
|
|
7
12
|
const descriptor = (bytes, mediaType) => ({ digest: digest(bytes), size: bytes.length, mediaType });
|
|
8
13
|
const run = promisify(execFile);
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/** SDK-owned upstream inputs, resolved from registry manifests on 2026-11-02.
|
|
2
|
+
* Pin the multi-platform index, never the workstation's platform manifest.
|
|
3
|
+
* Update deliberately with an SDK release; user image/version overrides bypass
|
|
4
|
+
* these defaults. Keep generated Dockerfiles and helper pods here as well.
|
|
5
|
+
*/
|
|
6
|
+
export declare const BUILTIN_IMAGES: {
|
|
7
|
+
readonly "postgres:18-alpine": "postgres:18-alpine@sha256:10a5c69a83035ab5239f5620d708520e8b28f5aa1f2b20143e6024532edadfb5";
|
|
8
|
+
readonly "rancher/k3s:v1.33.5-k3s1": "rancher/k3s:v1.33.5-k3s1@sha256:fd4740667b7033055c27d424d0d2d660bf66cedbdb225d68e0eab6dd48aa0fd2";
|
|
9
|
+
readonly "rancher/mirrored-library-traefik:3.3.2": "rancher/mirrored-library-traefik:3.3.2@sha256:a03ee2f858f77975fa943f6797da5446b7ac9a83beef6bbdae2afd8feaf67b76";
|
|
10
|
+
readonly "registry:2.8.3": "registry:2.8.3@sha256:a3d8aaa63ed8681a604f1dea0aa03f100d5895b6a58ace528858a7b332415373";
|
|
11
|
+
readonly "registry.k8s.io/pause:3.10": "registry.k8s.io/pause:3.10@sha256:ee6521f290b2168b6e0935a181d4cff9be1ac3f505666ef0e3c98fae8199917a";
|
|
12
|
+
readonly "node:22-bookworm-slim": "node:22-bookworm-slim@sha256:4b150b48b4116e2a22f2c39cc27025fbf4f153e2078fd3b14d159fdb5c7279da";
|
|
13
|
+
readonly "node:24-bookworm-slim": "node:24-bookworm-slim@sha256:c86ecead9e55a5210ac1727de38a4ca840bf03dcaf34dc9749addbf383b1920c";
|
|
14
|
+
readonly "oven/bun:1.3.14-alpine": "oven/bun:1.3.14-alpine@sha256:5acc90a93e91ff07bf72aa90a7c9f0fa189765aec90b47bdbf2152d2196383c0";
|
|
15
|
+
readonly "axllent/mailpit:v1.30": "axllent/mailpit:v1.30@sha256:d5ecbb067db3705fa953d79e1b7f81ef84038df67aba6c52825d8c02a1ea748a";
|
|
16
|
+
readonly "ministackorg/ministack:1.4.8": "ministackorg/ministack:1.4.8@sha256:eb0a00c897ec91589eb78a77f0afaf13a6d7be99abfeca2d1d719a7ec76d3141";
|
|
17
|
+
readonly "temporalio/temporal:1.9.1": "temporalio/temporal:1.9.1@sha256:ad4c82c97bd12b417d1ea942610dbcd511afb250c4d5ed26c694009533df447e";
|
|
18
|
+
readonly "nginx:1.29.6-alpine": "nginx:1.29.6-alpine@sha256:f46cb72c7df02710e693e863a983ac42f6a9579058a59a35f1ae36c9958e4ce0";
|
|
19
|
+
readonly "supabase/supavisor:2.9.12": "supabase/supavisor:2.9.12@sha256:464b93a60ba8c96bc06dad7f241562d6613b2a994922307717b05f432ae415c2";
|
|
20
|
+
readonly "supabase/postgres:17.6.1.136": "supabase/postgres:17.6.1.136@sha256:f371b5f3f2ac0a05703f33d6e6134515fb2498cab708fb948a0aeb7481467c00";
|
|
21
|
+
readonly "kong/kong:3.9.1": "kong/kong:3.9.1@sha256:6addf50e6bd8d578314cb9ce4f2d2d1e3781d2edecef59f707e00c6e05d384f5";
|
|
22
|
+
readonly "supabase/gotrue:v2.189.0": "supabase/gotrue:v2.189.0@sha256:385184459f57569c54c25209f51f3b2be99ddd7c4ce9e3555b5d3eea8447b7cf";
|
|
23
|
+
readonly "postgrest/postgrest:v14.12": "postgrest/postgrest:v14.12@sha256:54000f24847d01a2c2302e0041cf0618b875c57fb48507d743cfa9aaa50bf43c";
|
|
24
|
+
readonly "supabase/realtime:v2.102.3": "supabase/realtime:v2.102.3@sha256:aa1c92c0cf326007563641730ec9da9c60478caa6853887775365fa2c097a471";
|
|
25
|
+
readonly "supabase/storage-api:v1.60.4": "supabase/storage-api:v1.60.4@sha256:c8eb9858eafec891a97c27125470aaad54703c3f4eb4d55ca7f1bf6c6411febf";
|
|
26
|
+
readonly "darthsim/imgproxy:v3.30.1": "darthsim/imgproxy:v3.30.1@sha256:3b709e4a0e5e8e0e959b556b7031229202b4b8e7e7d955c517ea7abed68ee34d";
|
|
27
|
+
readonly "supabase/edge-runtime:v1.74.0": "supabase/edge-runtime:v1.74.0@sha256:2781daf92394db91f7e94129cc3d04ec474ad16a8fe64b3fbeef6e7d557ab120";
|
|
28
|
+
readonly "busybox:1.37": "busybox:1.37@sha256:a7dbc319b1438115a207e11930dc4bb3e643dcb3ec0bdd694bb36cd8fad289ec";
|
|
29
|
+
};
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/** SDK-owned upstream inputs, resolved from registry manifests on 2026-11-02.
|
|
2
|
+
* Pin the multi-platform index, never the workstation's platform manifest.
|
|
3
|
+
* Update deliberately with an SDK release; user image/version overrides bypass
|
|
4
|
+
* these defaults. Keep generated Dockerfiles and helper pods here as well.
|
|
5
|
+
*/
|
|
6
|
+
export const BUILTIN_IMAGES = {
|
|
7
|
+
"postgres:18-alpine": "postgres:18-alpine@sha256:10a5c69a83035ab5239f5620d708520e8b28f5aa1f2b20143e6024532edadfb5",
|
|
8
|
+
"rancher/k3s:v1.33.5-k3s1": "rancher/k3s:v1.33.5-k3s1@sha256:fd4740667b7033055c27d424d0d2d660bf66cedbdb225d68e0eab6dd48aa0fd2",
|
|
9
|
+
"rancher/mirrored-library-traefik:3.3.2": "rancher/mirrored-library-traefik:3.3.2@sha256:a03ee2f858f77975fa943f6797da5446b7ac9a83beef6bbdae2afd8feaf67b76",
|
|
10
|
+
"registry:2.8.3": "registry:2.8.3@sha256:a3d8aaa63ed8681a604f1dea0aa03f100d5895b6a58ace528858a7b332415373",
|
|
11
|
+
"registry.k8s.io/pause:3.10": "registry.k8s.io/pause:3.10@sha256:ee6521f290b2168b6e0935a181d4cff9be1ac3f505666ef0e3c98fae8199917a",
|
|
12
|
+
"node:22-bookworm-slim": "node:22-bookworm-slim@sha256:4b150b48b4116e2a22f2c39cc27025fbf4f153e2078fd3b14d159fdb5c7279da",
|
|
13
|
+
"node:24-bookworm-slim": "node:24-bookworm-slim@sha256:c86ecead9e55a5210ac1727de38a4ca840bf03dcaf34dc9749addbf383b1920c",
|
|
14
|
+
"oven/bun:1.3.14-alpine": "oven/bun:1.3.14-alpine@sha256:5acc90a93e91ff07bf72aa90a7c9f0fa189765aec90b47bdbf2152d2196383c0",
|
|
15
|
+
"axllent/mailpit:v1.30": "axllent/mailpit:v1.30@sha256:d5ecbb067db3705fa953d79e1b7f81ef84038df67aba6c52825d8c02a1ea748a",
|
|
16
|
+
"ministackorg/ministack:1.4.8": "ministackorg/ministack:1.4.8@sha256:eb0a00c897ec91589eb78a77f0afaf13a6d7be99abfeca2d1d719a7ec76d3141",
|
|
17
|
+
"temporalio/temporal:1.9.1": "temporalio/temporal:1.9.1@sha256:ad4c82c97bd12b417d1ea942610dbcd511afb250c4d5ed26c694009533df447e",
|
|
18
|
+
"nginx:1.29.6-alpine": "nginx:1.29.6-alpine@sha256:f46cb72c7df02710e693e863a983ac42f6a9579058a59a35f1ae36c9958e4ce0",
|
|
19
|
+
"supabase/supavisor:2.9.12": "supabase/supavisor:2.9.12@sha256:464b93a60ba8c96bc06dad7f241562d6613b2a994922307717b05f432ae415c2",
|
|
20
|
+
"supabase/postgres:17.6.1.136": "supabase/postgres:17.6.1.136@sha256:f371b5f3f2ac0a05703f33d6e6134515fb2498cab708fb948a0aeb7481467c00",
|
|
21
|
+
"kong/kong:3.9.1": "kong/kong:3.9.1@sha256:6addf50e6bd8d578314cb9ce4f2d2d1e3781d2edecef59f707e00c6e05d384f5",
|
|
22
|
+
"supabase/gotrue:v2.189.0": "supabase/gotrue:v2.189.0@sha256:385184459f57569c54c25209f51f3b2be99ddd7c4ce9e3555b5d3eea8447b7cf",
|
|
23
|
+
"postgrest/postgrest:v14.12": "postgrest/postgrest:v14.12@sha256:54000f24847d01a2c2302e0041cf0618b875c57fb48507d743cfa9aaa50bf43c",
|
|
24
|
+
"supabase/realtime:v2.102.3": "supabase/realtime:v2.102.3@sha256:aa1c92c0cf326007563641730ec9da9c60478caa6853887775365fa2c097a471",
|
|
25
|
+
"supabase/storage-api:v1.60.4": "supabase/storage-api:v1.60.4@sha256:c8eb9858eafec891a97c27125470aaad54703c3f4eb4d55ca7f1bf6c6411febf",
|
|
26
|
+
"darthsim/imgproxy:v3.30.1": "darthsim/imgproxy:v3.30.1@sha256:3b709e4a0e5e8e0e959b556b7031229202b4b8e7e7d955c517ea7abed68ee34d",
|
|
27
|
+
"supabase/edge-runtime:v1.74.0": "supabase/edge-runtime:v1.74.0@sha256:2781daf92394db91f7e94129cc3d04ec474ad16a8fe64b3fbeef6e7d557ab120",
|
|
28
|
+
"busybox:1.37": "busybox:1.37@sha256:a7dbc319b1438115a207e11930dc4bb3e643dcb3ec0bdd694bb36cd8fad289ec",
|
|
29
|
+
};
|
|
@@ -52,3 +52,12 @@ export interface StreamDelta {
|
|
|
52
52
|
* capture repeats the other half, since the marker counts lines.
|
|
53
53
|
*/
|
|
54
54
|
export declare function streamDelta(full: string, marker: number): StreamDelta;
|
|
55
|
+
/** Join successive container incarnations into one bounded per-service delta. */
|
|
56
|
+
export declare function mergeServiceLogDeltas<T extends {
|
|
57
|
+
stdout: string;
|
|
58
|
+
stderr: string;
|
|
59
|
+
stdoutTruncated: boolean;
|
|
60
|
+
stderrTruncated: boolean;
|
|
61
|
+
stdoutReset: boolean;
|
|
62
|
+
stderrReset: boolean;
|
|
63
|
+
}>(earlier: T, later: T): T;
|
|
@@ -81,3 +81,13 @@ export function streamDelta(full, marker) {
|
|
|
81
81
|
const capped = capMiddle(delta, LOG_DELTA_MAX_BYTES);
|
|
82
82
|
return { delta: capped.value, total, reset, truncated: capped.truncated };
|
|
83
83
|
}
|
|
84
|
+
/** Join successive container incarnations into one bounded per-service delta. */
|
|
85
|
+
export function mergeServiceLogDeltas(earlier, later) {
|
|
86
|
+
const stdout = capMiddle(earlier.stdout + later.stdout, LOG_DELTA_MAX_BYTES);
|
|
87
|
+
const stderr = capMiddle(earlier.stderr + later.stderr, LOG_DELTA_MAX_BYTES);
|
|
88
|
+
return { ...later, stdout: stdout.value, stderr: stderr.value,
|
|
89
|
+
stdoutTruncated: earlier.stdoutTruncated || later.stdoutTruncated || stdout.truncated,
|
|
90
|
+
stderrTruncated: earlier.stderrTruncated || later.stderrTruncated || stderr.truncated,
|
|
91
|
+
stdoutReset: earlier.stdoutReset || later.stdoutReset,
|
|
92
|
+
stderrReset: earlier.stderrReset || later.stderrReset };
|
|
93
|
+
}
|
|
@@ -3,7 +3,7 @@ import { type PreparedComponentImage } from "./component-images.js";
|
|
|
3
3
|
export declare const REGISTRY_DATA = "/var/lib/spectest-registry";
|
|
4
4
|
export declare const REGISTRY_CONTENT = "/spectest-registry-content";
|
|
5
5
|
export declare const CONTENT_BLOBS = "io.containerd.content.v1.content/blobs/sha256";
|
|
6
|
-
export declare const REGISTRY_IMAGE
|
|
6
|
+
export declare const REGISTRY_IMAGE: "registry:2.8.3@sha256:a3d8aaa63ed8681a604f1dea0aa03f100d5895b6a58ace528858a7b332415373";
|
|
7
7
|
export declare const registryDirectory: (service: string) => string;
|
|
8
8
|
/** Distribution 2.8 registry/storage/paths.go defines this layout. Seed
|
|
9
9
|
* before starting the registry so it cannot cache partial publication.
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BUILTIN_IMAGES } from "./builtin-images.js";
|
|
1
2
|
/** Distribution v2 publication. Blob data stays in containerd, mounted
|
|
2
3
|
* read-only in the registry. Repository metadata and uploads MUST live on
|
|
3
4
|
* the environment rootfs, outside persistent image/build caches. */
|
|
@@ -8,7 +9,7 @@ import { canonicalImageReference } from "./component-images.js";
|
|
|
8
9
|
export const REGISTRY_DATA = "/var/lib/spectest-registry";
|
|
9
10
|
export const REGISTRY_CONTENT = "/spectest-registry-content";
|
|
10
11
|
export const CONTENT_BLOBS = "io.containerd.content.v1.content/blobs/sha256";
|
|
11
|
-
export const REGISTRY_IMAGE = "registry:2.8.3";
|
|
12
|
+
export const REGISTRY_IMAGE = BUILTIN_IMAGES["registry:2.8.3"];
|
|
12
13
|
export const registryDirectory = (service) => `/var/lib/spectest-registries/${service}`;
|
|
13
14
|
/** Distribution 2.8 registry/storage/paths.go defines this layout. Seed
|
|
14
15
|
* before starting the registry so it cannot cache partial publication.
|
|
@@ -111,6 +111,10 @@ export async function openKubernetesCacheMaintenance(run, root = ROOT) {
|
|
|
111
111
|
throw error;
|
|
112
112
|
});
|
|
113
113
|
try {
|
|
114
|
+
// A successful inventory distinguishes orphaned legacy stores from Docker
|
|
115
|
+
// outages. Only this isolated maintenance copy may discard a store.
|
|
116
|
+
const available = new Set((await run("docker", ["image", "ls", "-aq", "--no-trunc"]))
|
|
117
|
+
.split(/\s+/).filter(Boolean));
|
|
114
118
|
for (const service of entries) {
|
|
115
119
|
if (!service.isDirectory() || !SERVICE_NAME.test(service.name))
|
|
116
120
|
continue;
|
|
@@ -122,6 +126,14 @@ export async function openKubernetesCacheMaintenance(run, root = ROOT) {
|
|
|
122
126
|
if (descriptor.schema !== 1 || !IMAGE_ID.test(descriptor.image) || !Number.isSafeInteger(descriptor.updatedAt)) {
|
|
123
127
|
throw new Error(`invalid Kubernetes cache descriptor: ${directory}`);
|
|
124
128
|
}
|
|
129
|
+
if (!available.has(descriptor.image)) {
|
|
130
|
+
// Older exporters replaced their sole image reference on rebuild.
|
|
131
|
+
// An obsolete version's store can outlive that image. It is disposable
|
|
132
|
+
// cache, and must not prevent publishing the healthy stores.
|
|
133
|
+
console.warn(`Discarding orphaned Kubernetes cache ${directory}: missing runtime image ${descriptor.image}`);
|
|
134
|
+
await run("rm", ["-rf", directory]);
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
125
137
|
const container = `spectest-k8s-cache-${randomUUID()}`;
|
|
126
138
|
await run("docker", ["run", "-d", "--name", container, "--network", "none", "--privileged", "--stop-signal", "SIGTERM", "--tmpfs", "/run", "--tmpfs", "/var/run",
|
|
127
139
|
"--mount", `type=bind,source=${directory}/containerd,target=${STORE_TARGET}`,
|