Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/evm-wallet-experiment/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ x-kernel-standard: &kernel-standard
networks: [ocap-e2e]
volumes:
- ocap-run:/run/ocap
- ocap-logs:/logs
- ../logs:/logs
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is ../logs? Is it the same /logs inside the container?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../logs is relative to this docker-compose file

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so packages/evm-wallet-experiment/logs

entrypoint:
- node
- '--conditions'
Expand Down Expand Up @@ -46,7 +46,7 @@ services:
ports: ['8545:8545']
volumes:
- ocap-run:/run/ocap
- ocap-logs:/logs
- ../logs:/logs
healthcheck:
test: ['CMD', 'test', '-f', '/run/ocap/contracts.json']
interval: 3s
Expand Down Expand Up @@ -211,4 +211,3 @@ networks:

volumes:
ocap-run:
ocap-logs:
20 changes: 19 additions & 1 deletion packages/evm-wallet-experiment/docker/entrypoint-kernel.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,32 @@ import { NodejsPlatformServices } from '@metamask/kernel-node-runtime';
import { startRpcSocketServer } from '@metamask/kernel-node-runtime/daemon';
import { makeSQLKernelDatabase } from '@metamask/kernel-store/sqlite/nodejs';
import { Kernel } from '@metamask/ocap-kernel';
import { mkdirSync, unlinkSync, writeFileSync } from 'node:fs';
import {
createWriteStream,
mkdirSync,
unlinkSync,
writeFileSync,
} from 'node:fs';
import { dirname } from 'node:path';

const NAME = process.env.SERVICE_NAME ?? 'kernel';
const { SOCKET_PATH } = process.env;
const QUIC_ADDR = process.env.QUIC_LISTEN_ADDRESS;
const { READY_FILE } = process.env;

// Tee stdout/stderr to a file so logs are accessible on the host via the
// bind-mounted logs directory even after the container exits.
mkdirSync('/logs', { recursive: true });
const logStream = createWriteStream(`/logs/${NAME}.log`, { flags: 'w' });
for (const stream of [process.stdout, process.stderr]) {
const original = stream.write.bind(stream);
// eslint-disable-next-line jsdoc/require-jsdoc
stream.write = (chunk, ...args) => {
logStream.write(chunk);
return original(chunk, ...args);
};
}

if (!SOCKET_PATH) {
console.error(`[${NAME}] FATAL: SOCKET_PATH is required`);
process.exit(1);
Expand Down
5 changes: 3 additions & 2 deletions packages/evm-wallet-experiment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@
"docker:compose:interactive": "node docker/run-interactive-compose.mjs",
"docker:build": "yarn docker:compose build",
"docker:build:force": "yarn docker:compose build --no-cache",
"docker:up": "yarn docker:compose up",
"docker:ensure-logs": "mkdir -p logs",
"docker:up": "yarn docker:ensure-logs && yarn docker:compose up",
"docker:down": "yarn docker:compose down",
"docker:interactive:up": "node docker/run-interactive-compose.mjs up --build",
"docker:interactive:up": "yarn docker:ensure-logs && node docker/run-interactive-compose.mjs up --build",
"docker:interactive:down": "node docker/run-interactive-compose.mjs down",
"docker:setup:wallets": "yarn tsx test/e2e/docker/setup-wallets.ts",
"docker:interactive:setup": "node docker/interactive-setup.mjs",
Expand Down
5 changes: 5 additions & 0 deletions packages/evm-wallet-experiment/vitest.config.docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@ export default defineConfig({
testTimeout: 180_000,
// No setupFiles — we need real fetch (not mocked) and no lockdown shims.
setupFiles: [],
// Write structured results to logs/ so agents and CI can inspect failures
// without parsing terminal output. Kernel service logs land alongside in
// logs/<service-name>.log via the entrypoint tee.
reporters: ['default', 'json'],
outputFile: 'logs/test-results.json',
},
});
Loading