@argusaudit/cli 0.2.3 → 0.2.5
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.
|
@@ -169,6 +169,10 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
169
169
|
// best-effort: report each container's error to the API
|
|
170
170
|
const containerErrors = getContainerErrors(composePath);
|
|
171
171
|
if (containerErrors.length > 0) {
|
|
172
|
+
for (const e of containerErrors) {
|
|
173
|
+
console.error(chalk.red(`\n${e.containerName} logs:`));
|
|
174
|
+
console.error(chalk.dim(e.errorDetails));
|
|
175
|
+
}
|
|
172
176
|
const reportSpinner = startSpinner('Reporting errors…');
|
|
173
177
|
try {
|
|
174
178
|
await Promise.all(containerErrors.map((e) => post(`/audits/${result.public_id}/container-errors`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../../src/commands/audit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../../src/commands/audit.ts"],"names":[],"mappings":"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"}
|
package/dist/src/lib/docker.js
CHANGED
|
@@ -66,6 +66,13 @@ export function generateCompose({ ddlPath, auditId, apiUrl, authToken, workerIma
|
|
|
66
66
|
const services = compose.services;
|
|
67
67
|
if (postgresImage) {
|
|
68
68
|
services.postgres.image = postgresImage;
|
|
69
|
+
// Pre-18 images still expect the volume at /var/lib/postgresql/data;
|
|
70
|
+
// the template mounts at /var/lib/postgresql for 18+. Unparseable tags
|
|
71
|
+
// (e.g. "latest") are current majors, so they keep the 18+ path.
|
|
72
|
+
const major = Number.parseInt(postgresImage.split(':')[1] ?? '', 10);
|
|
73
|
+
if (major < 18) {
|
|
74
|
+
services.postgres.volumes = ['pg_data:/var/lib/postgresql/data'];
|
|
75
|
+
}
|
|
69
76
|
}
|
|
70
77
|
services.seeder.image = workerImage;
|
|
71
78
|
services.worker.image = workerImage;
|
|
@@ -130,7 +137,9 @@ export function cleanupWorker({ composePath, tmpTokenPath }) {
|
|
|
130
137
|
}
|
|
131
138
|
export function getContainerErrors(composePath) {
|
|
132
139
|
try {
|
|
133
|
-
const ps = spawnSync('docker',
|
|
140
|
+
const ps = spawnSync('docker',
|
|
141
|
+
// --all: since Compose v2.23, `ps` hides exited containers by default
|
|
142
|
+
['compose', '-f', composePath, 'ps', '--all', '--format', 'json'], { stdio: 'pipe', encoding: 'utf8' });
|
|
134
143
|
if (ps.status !== 0)
|
|
135
144
|
return [];
|
|
136
145
|
// Compose 2.20.x prints a JSON array; 2.21+ prints one JSON object per line.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/lib/docker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/lib/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,10 @@ services:
|
|
|
15
15
|
POSTGRES_PASSWORD: argus
|
|
16
16
|
POSTGRES_DB: argus
|
|
17
17
|
volumes:
|
|
18
|
-
-
|
|
18
|
+
# 18+ images keep PGDATA in a version-specific subdirectory and refuse to
|
|
19
|
+
# start if anything is mounted at the old /var/lib/postgresql/data path.
|
|
20
|
+
# generateCompose rewrites this to the old path for pre-18 images.
|
|
21
|
+
- pg_data:/var/lib/postgresql
|
|
19
22
|
healthcheck:
|
|
20
23
|
test: [ "CMD-SHELL", "pg_isready -U argus" ]
|
|
21
24
|
interval: 2s
|
package/package.json
CHANGED