@aion0/bastion 0.1.11 → 0.1.12
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/README.md +22 -3
- package/README.zh.md +22 -19
- package/config/default.yaml +2 -2
- package/dist/cli/commands/pro.d.ts +3 -0
- package/dist/cli/commands/pro.d.ts.map +1 -0
- package/dist/cli/commands/pro.js +261 -0
- package/dist/cli/commands/pro.js.map +1 -0
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/config/paths.d.ts +3 -0
- package/dist/config/paths.d.ts.map +1 -1
- package/dist/config/paths.js +3 -0
- package/dist/config/paths.js.map +1 -1
- package/dist/config/schema.d.ts +1 -1
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/core/bootstrap.d.ts.map +1 -1
- package/dist/core/bootstrap.js +5 -0
- package/dist/core/bootstrap.js.map +1 -1
- package/dist/dashboard/api-routes.d.ts.map +1 -1
- package/dist/dashboard/api-routes.js +23 -0
- package/dist/dashboard/api-routes.js.map +1 -1
- package/dist/dashboard/page.d.ts.map +1 -1
- package/dist/dashboard/page.js +13 -5
- package/dist/dashboard/page.js.map +1 -1
- package/dist/dlp/ai-validator.d.ts +5 -2
- package/dist/dlp/ai-validator.d.ts.map +1 -1
- package/dist/dlp/ai-validator.js +22 -2
- package/dist/dlp/ai-validator.js.map +1 -1
- package/dist/license/pro-license.d.ts +11 -0
- package/dist/license/pro-license.d.ts.map +1 -0
- package/dist/license/pro-license.js +88 -0
- package/dist/license/pro-license.js.map +1 -0
- package/dist/plugin-api/index.d.ts +1 -1
- package/dist/plugin-api/index.d.ts.map +1 -1
- package/dist/plugin-api/index.js.map +1 -1
- package/dist/plugin-api/types.d.ts +19 -0
- package/dist/plugin-api/types.d.ts.map +1 -1
- package/dist/plugins/builtin/audit-logger.js +1 -1
- package/dist/plugins/builtin/dlp-scanner.d.ts +2 -0
- package/dist/plugins/builtin/dlp-scanner.d.ts.map +1 -1
- package/dist/plugins/builtin/dlp-scanner.js +6 -3
- package/dist/plugins/builtin/dlp-scanner.js.map +1 -1
- package/dist/plugins/builtin/metrics-collector.js +1 -1
- package/dist/plugins/builtin/metrics-collector.js.map +1 -1
- package/dist/plugins/builtin/token-optimizer.js +1 -1
- package/dist/plugins/builtin/tool-guard.d.ts.map +1 -1
- package/dist/plugins/builtin/tool-guard.js +47 -5
- package/dist/plugins/builtin/tool-guard.js.map +1 -1
- package/dist/plugins/loader.d.ts.map +1 -1
- package/dist/plugins/loader.js +22 -5
- package/dist/plugins/loader.js.map +1 -1
- package/integration/openclaw-docker/fix-issues/not-install-brew/Dockerfile.patch +31 -0
- package/integration/openclaw-docker/fix-issues/not-install-brew/docker-setup.sh.patch +33 -0
- package/package.json +1 -1
|
@@ -52,7 +52,7 @@ function createMetricsCollectorPlugin(db) {
|
|
|
52
52
|
const sessionsRepo = new sessions_js_1.SessionsRepository(db);
|
|
53
53
|
return {
|
|
54
54
|
name: 'metrics-collector',
|
|
55
|
-
priority:
|
|
55
|
+
priority: 1,
|
|
56
56
|
version: '1.0.0',
|
|
57
57
|
apiVersion: 2,
|
|
58
58
|
async onResponseComplete(context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-collector.js","sourceRoot":"","sources":["../../../src/plugins/builtin/metrics-collector.ts"],"names":[],"mappings":";;AA+CA,oEAgEC;AA9GD,6DAA4D;AAC5D,wEAA4E;AAC5E,wEAA4E;AAC5E,mEAAqE;AACrE,qDAAqD;AAErD,yCAAqC;AAErC,MAAM,GAAG,GAAG,IAAA,wBAAY,EAAC,gBAAgB,CAAC,CAAC;AAE3C;;;GAGG;AACH,SAAS,kBAAkB,CAAC,UAAmC;IAC7D,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,OAAO,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC1C,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;IACjC,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtC,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,UAAU,IAAI,KAAK,CAAC;iBAC9C,IAAI,KAAK,EAAE,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC;QAC9F,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,KAAK,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,IAAI,OAAO,OAAO,KAAK,QAAQ;gBAAE,UAAU,GAAG,OAAO,CAAC;iBACjD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ;wBAAE,UAAU,IAAI,KAAK,CAAC;yBAC9C,IAAI,KAAK,EAAE,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;wBAAE,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC;gBAC9F,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACxE,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAElC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,4BAA4B,CAAC,EAAqB;IAChE,MAAM,YAAY,GAAG,IAAI,gCAAkB,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,IAAI,gCAAkB,CAAC,EAAE,CAAC,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"metrics-collector.js","sourceRoot":"","sources":["../../../src/plugins/builtin/metrics-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ function createTokenOptimizerPlugin(db, config) {
|
|
|
37
37
|
const optimizerRepo = new optimizer_events_js_1.OptimizerEventsRepository(db);
|
|
38
38
|
return {
|
|
39
39
|
name: 'token-optimizer',
|
|
40
|
-
priority:
|
|
40
|
+
priority: 20,
|
|
41
41
|
version: '1.0.0',
|
|
42
42
|
apiVersion: 2,
|
|
43
43
|
async onRequest(context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-guard.d.ts","sourceRoot":"","sources":["../../../src/plugins/builtin/tool-guard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EAMP,MAAM,aAAa,CAAC;AAQrB,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAI3C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,MAAM;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;CAClH;AAqFD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,OAAO,iBAAiB,EAAE,cAAc,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"tool-guard.d.ts","sourceRoot":"","sources":["../../../src/plugins/builtin/tool-guard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EAMP,MAAM,aAAa,CAAC;AAQrB,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAI3C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,MAAM;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;CAClH;AAqFD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,OAAO,iBAAiB,EAAE,cAAc,GAAG,MAAM,CAmQjJ"}
|
|
@@ -82,11 +82,51 @@ function createToolGuardPlugin(db, config, eventBus) {
|
|
|
82
82
|
const auditRepo = new audit_log_js_1.AuditLogRepository(db);
|
|
83
83
|
// Seed built-in rules on first init (INSERT OR IGNORE preserves user toggles)
|
|
84
84
|
rulesRepo.seedBuiltins(rules_js_1.BUILTIN_RULES);
|
|
85
|
+
// ── PI escalation: track sessions flagged by pi-classifier ──
|
|
86
|
+
const escalatedSessions = new Map();
|
|
87
|
+
const ESCALATION_TTL_MS = 60 * 60 * 1000; // 1 hour
|
|
88
|
+
// Listen for pi:detected events from pi-classifier plugin
|
|
89
|
+
if (eventBus) {
|
|
90
|
+
eventBus.on('pi:detected', (data) => {
|
|
91
|
+
const event = data;
|
|
92
|
+
if (!event?.sessionId)
|
|
93
|
+
return;
|
|
94
|
+
// Escalate session: lower the blockMinSeverity to 'medium' (stricter)
|
|
95
|
+
escalatedSessions.set(event.sessionId, {
|
|
96
|
+
blockMinSeverity: 'medium',
|
|
97
|
+
expiresAt: Date.now() + ESCALATION_TTL_MS,
|
|
98
|
+
});
|
|
99
|
+
log.warn('Session escalated due to prompt injection detection', {
|
|
100
|
+
sessionId: event.sessionId,
|
|
101
|
+
escalatedBlockMinSeverity: 'medium',
|
|
102
|
+
});
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
/** Clean up expired escalations */
|
|
106
|
+
function cleanExpiredEscalations() {
|
|
107
|
+
const now = Date.now();
|
|
108
|
+
for (const [sessionId, entry] of escalatedSessions) {
|
|
109
|
+
if (entry.expiresAt <= now) {
|
|
110
|
+
escalatedSessions.delete(sessionId);
|
|
111
|
+
log.debug('Escalation expired', { sessionId });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
85
115
|
// Live config readers — support hot-reload from Dashboard
|
|
86
116
|
const getAction = () => config.getLiveConfig ? config.getLiveConfig().action : config.action;
|
|
87
117
|
const getRecordAll = () => config.getLiveConfig ? config.getLiveConfig().recordAll : config.recordAll;
|
|
88
118
|
const getBlockMinSeverity = () => config.getLiveConfig ? config.getLiveConfig().blockMinSeverity : config.blockMinSeverity;
|
|
89
119
|
const getAlertMinSeverity = () => config.getLiveConfig ? config.getLiveConfig().alertMinSeverity : config.alertMinSeverity;
|
|
120
|
+
/** Get effective blockMinSeverity for a session (may be escalated) */
|
|
121
|
+
function getEffectiveBlockMinSeverity(sessionId) {
|
|
122
|
+
if (sessionId) {
|
|
123
|
+
const escalation = escalatedSessions.get(sessionId);
|
|
124
|
+
if (escalation && escalation.expiresAt > Date.now()) {
|
|
125
|
+
return escalation.blockMinSeverity;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
return getBlockMinSeverity();
|
|
129
|
+
}
|
|
90
130
|
function getAlertConfig() {
|
|
91
131
|
return {
|
|
92
132
|
minSeverity: getAlertMinSeverity() ?? 'high',
|
|
@@ -159,16 +199,18 @@ function createToolGuardPlugin(db, config, eventBus) {
|
|
|
159
199
|
}
|
|
160
200
|
return {
|
|
161
201
|
name: 'tool-guard',
|
|
162
|
-
priority:
|
|
202
|
+
priority: 5,
|
|
163
203
|
version: '1.0.0',
|
|
164
204
|
apiVersion: 2,
|
|
165
205
|
// ── Load rules from DB and set streaming block flag ──
|
|
166
206
|
async onRequest(context) {
|
|
207
|
+
cleanExpiredEscalations();
|
|
167
208
|
const rules = rulesRepo.getEnabled();
|
|
168
209
|
context._toolGuardRules = rules;
|
|
169
|
-
|
|
210
|
+
const effectiveBlockMin = getEffectiveBlockMinSeverity(context.sessionId);
|
|
211
|
+
log.debug('onRequest', { action: getAction(), recordAll: getRecordAll(), isStreaming: context.isStreaming, effectiveBlockMin });
|
|
170
212
|
if (getAction() === 'block' && context.isStreaming) {
|
|
171
|
-
context._toolGuardStreamBlock =
|
|
213
|
+
context._toolGuardStreamBlock = effectiveBlockMin;
|
|
172
214
|
}
|
|
173
215
|
},
|
|
174
216
|
// ── Pre-send: block dangerous tool calls in non-streaming responses ──
|
|
@@ -188,8 +230,8 @@ function createToolGuardPlugin(db, config, eventBus) {
|
|
|
188
230
|
});
|
|
189
231
|
if (matches.length === 0)
|
|
190
232
|
return;
|
|
191
|
-
// Check if any flagged call meets the block severity threshold
|
|
192
|
-
const currentBlockMin =
|
|
233
|
+
// Check if any flagged call meets the block severity threshold (may be escalated)
|
|
234
|
+
const currentBlockMin = getEffectiveBlockMinSeverity(context.request.sessionId);
|
|
193
235
|
const blockable = matches.filter(m => m.ruleMatch && (0, alert_js_1.shouldAlert)(m.ruleMatch.rule.severity, currentBlockMin));
|
|
194
236
|
// Record all tool calls and dispatch alerts
|
|
195
237
|
const flagged = recordAndAlert(matches, context.request.id, context.request.sessionId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-guard.js","sourceRoot":"","sources":["../../../src/plugins/builtin/tool-guard.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-guard.js","sourceRoot":"","sources":["../../../src/plugins/builtin/tool-guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/plugins/loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQrD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,oBAAoB,EAAE,EACvC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,gBAAgB,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAAC,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/plugins/loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQrD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,oBAAoB,EAAE,EACvC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,gBAAgB,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAAC,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC,CAwHxJ"}
|
package/dist/plugins/loader.js
CHANGED
|
@@ -18,10 +18,25 @@ async function loadExternalPlugins(externalConfigs, db, eventBus) {
|
|
|
18
18
|
log.info('External plugin disabled, skipping', { package: cfg.package });
|
|
19
19
|
continue;
|
|
20
20
|
}
|
|
21
|
-
// Dynamic import
|
|
21
|
+
// Dynamic import — resolve directory to package.json main entry for ESM compatibility
|
|
22
|
+
let importPath = cfg.package;
|
|
23
|
+
try {
|
|
24
|
+
const { join } = await import('node:path');
|
|
25
|
+
const { readFileSync, statSync } = await import('node:fs');
|
|
26
|
+
const s = statSync(importPath);
|
|
27
|
+
if (s.isDirectory()) {
|
|
28
|
+
const pkgPath = join(importPath, 'package.json');
|
|
29
|
+
const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
|
|
30
|
+
const entry = pkg.main ?? 'index.js';
|
|
31
|
+
importPath = join(importPath, entry);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
// If stat/read fails, keep original path and let import() handle the error
|
|
36
|
+
}
|
|
22
37
|
let mod;
|
|
23
38
|
try {
|
|
24
|
-
mod = await import(
|
|
39
|
+
mod = await import(importPath);
|
|
25
40
|
}
|
|
26
41
|
catch (err) {
|
|
27
42
|
log.warn('Failed to import external plugin package', {
|
|
@@ -74,9 +89,11 @@ async function loadExternalPlugins(externalConfigs, db, eventBus) {
|
|
|
74
89
|
});
|
|
75
90
|
continue;
|
|
76
91
|
}
|
|
77
|
-
// Adapt to internal Plugin interface
|
|
78
|
-
const
|
|
79
|
-
|
|
92
|
+
// Adapt to internal Plugin interface — use declared priority if available
|
|
93
|
+
const declaredPriority = externalPlugin.priority ?? priorityCounter;
|
|
94
|
+
const adapted = (0, adapter_js_1.adaptPlugin)(externalPlugin, declaredPriority, repo, cfg.package);
|
|
95
|
+
if (!externalPlugin.priority)
|
|
96
|
+
priorityCounter += 1;
|
|
80
97
|
plugins.push(adapted);
|
|
81
98
|
// Collect destroy callbacks
|
|
82
99
|
if (externalPlugin.onDestroy) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/plugins/loader.ts"],"names":[],"mappings":";;AAkBA,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/plugins/loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
--- Dockerfile.upstream 2026-03-02 00:45:51
|
|
2
|
+
+++ Dockerfile 2026-03-02 00:11:32
|
|
3
|
+
@@ -89,6 +89,28 @@
|
|
4
|
+
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*; \
|
|
5
|
+
fi
|
|
6
|
+
|
|
7
|
+
+# Optional: Install Linuxbrew for skill dependency management.
|
|
8
|
+
+# Build with: docker build --build-arg OPENCLAW_INSTALL_BREW=1 ...
|
|
9
|
+
+# Adds ~500MB but enables brew-based skill installation (uv, go, signal-cli, etc.)
|
|
10
|
+
+ARG OPENCLAW_INSTALL_BREW=""
|
|
11
|
+
+RUN if [ -n "$OPENCLAW_INSTALL_BREW" ]; then \
|
|
12
|
+
+ apt-get update && \
|
|
13
|
+
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential curl file git procps && \
|
|
14
|
+
+ if ! id -u linuxbrew >/dev/null 2>&1; then useradd -m -s /bin/bash linuxbrew; fi && \
|
|
15
|
+
+ mkdir -p /home/linuxbrew/.linuxbrew && \
|
|
16
|
+
+ chown -R linuxbrew:linuxbrew /home/linuxbrew && \
|
|
17
|
+
+ su - linuxbrew -c "NONINTERACTIVE=1 CI=1 /bin/bash -c '$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)'" && \
|
|
18
|
+
+ if [ ! -e /home/linuxbrew/.linuxbrew/Library ]; then ln -s /home/linuxbrew/.linuxbrew/Homebrew/Library /home/linuxbrew/.linuxbrew/Library; fi && \
|
|
19
|
+
+ if [ ! -x /home/linuxbrew/.linuxbrew/bin/brew ]; then echo "brew install failed"; exit 1; fi && \
|
|
20
|
+
+ chown -R node:node /home/linuxbrew/.linuxbrew && \
|
|
21
|
+
+ apt-get clean && \
|
|
22
|
+
+ rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*; \
|
|
23
|
+
+ fi
|
|
24
|
+
+ENV HOMEBREW_PREFIX=/home/linuxbrew/.linuxbrew
|
|
25
|
+
+ENV HOMEBREW_CELLAR=/home/linuxbrew/.linuxbrew/Cellar
|
|
26
|
+
+ENV HOMEBREW_REPOSITORY=/home/linuxbrew/.linuxbrew/Homebrew
|
|
27
|
+
+ENV PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:${PATH}"
|
|
28
|
+
+
|
|
29
|
+
USER node
|
|
30
|
+
COPY --chown=node:node . .
|
|
31
|
+
# Normalize copied plugin/agent paths so plugin safety checks do not reject
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
--- docker-setup.sh.upstream 2026-03-02 00:47:22
|
|
2
|
+
+++ docker-setup.sh 2026-03-02 00:31:55
|
|
3
|
+
@@ -200,6 +200,7 @@
|
|
4
|
+
export OPENCLAW_GATEWAY_BIND="${OPENCLAW_GATEWAY_BIND:-lan}"
|
|
5
|
+
export OPENCLAW_IMAGE="$IMAGE_NAME"
|
|
6
|
+
export OPENCLAW_DOCKER_APT_PACKAGES="${OPENCLAW_DOCKER_APT_PACKAGES:-}"
|
|
7
|
+
+export OPENCLAW_INSTALL_BREW="${OPENCLAW_INSTALL_BREW:-}"
|
|
8
|
+
export OPENCLAW_EXTRA_MOUNTS="$EXTRA_MOUNTS"
|
|
9
|
+
export OPENCLAW_HOME_VOLUME="$HOME_VOLUME_NAME"
|
|
10
|
+
export OPENCLAW_ALLOW_INSECURE_PRIVATE_WS="${OPENCLAW_ALLOW_INSECURE_PRIVATE_WS:-}"
|
|
11
|
+
@@ -382,13 +383,20 @@
|
|
12
|
+
OPENCLAW_DOCKER_SOCKET \
|
|
13
|
+
DOCKER_GID \
|
|
14
|
+
OPENCLAW_INSTALL_DOCKER_CLI \
|
|
15
|
+
- OPENCLAW_ALLOW_INSECURE_PRIVATE_WS
|
|
16
|
+
+ OPENCLAW_ALLOW_INSECURE_PRIVATE_WS \
|
|
17
|
+
+ OPENCLAW_INSTALL_BREW
|
|
18
|
+
|
|
19
|
+
-if [[ "$IMAGE_NAME" == "openclaw:local" ]]; then
|
|
20
|
+
+if [[ -n "${OPENCLAW_SKIP_BUILD:-}" ]]; then
|
|
21
|
+
+ echo "==> Skipping image build/pull (OPENCLAW_SKIP_BUILD is set)"
|
|
22
|
+
+ if ! docker image inspect "$IMAGE_NAME" >/dev/null 2>&1; then
|
|
23
|
+
+ fail "Image '$IMAGE_NAME' not found locally. Run 'bastion openclaw build' first."
|
|
24
|
+
+ fi
|
|
25
|
+
+elif [[ "$IMAGE_NAME" == "openclaw:local" ]]; then
|
|
26
|
+
echo "==> Building Docker image: $IMAGE_NAME"
|
|
27
|
+
docker build \
|
|
28
|
+
--build-arg "OPENCLAW_DOCKER_APT_PACKAGES=${OPENCLAW_DOCKER_APT_PACKAGES}" \
|
|
29
|
+
--build-arg "OPENCLAW_INSTALL_DOCKER_CLI=${OPENCLAW_INSTALL_DOCKER_CLI:-}" \
|
|
30
|
+
+ --build-arg "OPENCLAW_INSTALL_BREW=${OPENCLAW_INSTALL_BREW}" \
|
|
31
|
+
-t "$IMAGE_NAME" \
|
|
32
|
+
-f "$ROOT_DIR/Dockerfile" \
|
|
33
|
+
"$ROOT_DIR"
|