genbox 1.0.107 → 1.0.108
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/commands/init.js +17 -22
- package/dist/commands/status.js +29 -2
- package/package.json +1 -1
package/dist/commands/init.js
CHANGED
|
@@ -1164,35 +1164,30 @@ async function setupProfiles(detected, environments) {
|
|
|
1164
1164
|
}
|
|
1165
1165
|
// Start with default profiles
|
|
1166
1166
|
let profiles = { ...defaultProfiles };
|
|
1167
|
-
// If there are
|
|
1168
|
-
if (Object.keys(
|
|
1169
|
-
console.log(chalk_1.default.dim('Found
|
|
1167
|
+
// If there are user-created profiles, offer to retain them
|
|
1168
|
+
if (Object.keys(userCreatedProfiles).length > 0) {
|
|
1169
|
+
console.log(chalk_1.default.dim('Found user-created profiles in genbox.yaml:'));
|
|
1170
1170
|
console.log('');
|
|
1171
|
-
// Display
|
|
1172
|
-
for (const [name, profile] of Object.entries(
|
|
1173
|
-
|
|
1174
|
-
const label = isUserCreated ? chalk_1.default.yellow(' (user-created)') : chalk_1.default.dim(' (auto-generated)');
|
|
1175
|
-
console.log(` ${chalk_1.default.cyan(name)}${label}`);
|
|
1171
|
+
// Display user-created profiles
|
|
1172
|
+
for (const [name, profile] of Object.entries(userCreatedProfiles)) {
|
|
1173
|
+
console.log(` ${chalk_1.default.cyan(name)}`);
|
|
1176
1174
|
console.log(chalk_1.default.dim(` ${profile.description || 'No description'}`));
|
|
1177
1175
|
console.log(chalk_1.default.dim(` Apps: ${profile.apps?.join(', ') || 'all'}`));
|
|
1178
1176
|
console.log('');
|
|
1179
1177
|
}
|
|
1180
|
-
// Let user select which
|
|
1181
|
-
const retainChoices = Object.entries(
|
|
1182
|
-
|
|
1183
|
-
|
|
1184
|
-
|
|
1185
|
-
|
|
1186
|
-
checked: isUserCreated, // User-created profiles are checked by default
|
|
1187
|
-
};
|
|
1188
|
-
});
|
|
1178
|
+
// Let user select which user-created profiles to retain
|
|
1179
|
+
const retainChoices = Object.entries(userCreatedProfiles).map(([name, profile]) => ({
|
|
1180
|
+
name: `${name} - ${profile.description || 'No description'}`,
|
|
1181
|
+
value: name,
|
|
1182
|
+
checked: true, // All user-created profiles are checked by default
|
|
1183
|
+
}));
|
|
1189
1184
|
const retainedNames = await prompts.checkbox({
|
|
1190
|
-
message: 'Select
|
|
1185
|
+
message: 'Select user-created profiles to retain:',
|
|
1191
1186
|
choices: retainChoices,
|
|
1192
1187
|
});
|
|
1193
|
-
// Add retained profiles
|
|
1188
|
+
// Add retained user-created profiles
|
|
1194
1189
|
for (const name of retainedNames) {
|
|
1195
|
-
profiles[name] =
|
|
1190
|
+
profiles[name] = userCreatedProfiles[name];
|
|
1196
1191
|
}
|
|
1197
1192
|
}
|
|
1198
1193
|
if (Object.keys(profiles).length === 0) {
|
|
@@ -1204,8 +1199,8 @@ async function setupProfiles(detected, environments) {
|
|
|
1204
1199
|
console.log(chalk_1.default.dim('Final profiles:'));
|
|
1205
1200
|
console.log('');
|
|
1206
1201
|
for (const [name, profile] of Object.entries(profiles)) {
|
|
1207
|
-
const
|
|
1208
|
-
const label =
|
|
1202
|
+
const isUserCreated = userCreatedProfiles[name] !== undefined;
|
|
1203
|
+
const label = isUserCreated ? chalk_1.default.yellow(' (user-created)') : '';
|
|
1209
1204
|
console.log(` ${chalk_1.default.cyan(name)}${label}`);
|
|
1210
1205
|
console.log(chalk_1.default.dim(` ${profile.description || 'No description'}`));
|
|
1211
1206
|
console.log(chalk_1.default.dim(` Apps: ${profile.apps?.join(', ') || 'all'}`));
|
package/dist/commands/status.js
CHANGED
|
@@ -438,8 +438,35 @@ exports.statusCommand = new commander_1.Command('status')
|
|
|
438
438
|
console.log(chalk_1.default.dim(' Fix the error and run: cd ~/goodpass/api && docker compose up -d'));
|
|
439
439
|
}
|
|
440
440
|
else {
|
|
441
|
-
// No errors in DB -
|
|
442
|
-
|
|
441
|
+
// No errors in DB - try SSH fallback for older genboxes
|
|
442
|
+
// First check ~/.genbox-errors file (fast)
|
|
443
|
+
const savedErrors = sshExec(target.ipAddress, keyPath, 'cat ~/.genbox-errors 2>/dev/null || echo ""', 10);
|
|
444
|
+
if (savedErrors && savedErrors.trim()) {
|
|
445
|
+
console.log(chalk_1.default.red('[ERROR] Build failed during setup:'));
|
|
446
|
+
console.log(savedErrors);
|
|
447
|
+
console.log('');
|
|
448
|
+
console.log(chalk_1.default.dim(' Fix the error and run: cd ~/goodpass/api && docker compose up -d'));
|
|
449
|
+
}
|
|
450
|
+
else {
|
|
451
|
+
// No saved errors - check if there's a docker compose error
|
|
452
|
+
console.log(chalk_1.default.dim(' Checking for build errors...'));
|
|
453
|
+
const buildResult = sshExec(target.ipAddress, keyPath, 'cd ~/goodpass/api 2>/dev/null && docker compose build 2>&1 | tail -60 || echo ""', 120);
|
|
454
|
+
if (buildResult && (buildResult.includes('ERROR') || buildResult.includes('TS2') ||
|
|
455
|
+
buildResult.includes('failed') || buildResult.includes('ELIFECYCLE'))) {
|
|
456
|
+
console.log(chalk_1.default.red('[ERROR] Docker build failed:'));
|
|
457
|
+
const lines = buildResult.split('\n');
|
|
458
|
+
const errorLines = lines.filter(line => line.includes('ERROR') || line.includes('TS2') || line.includes('TS1') ||
|
|
459
|
+
line.includes('failed') || line.includes('exit code') ||
|
|
460
|
+
line.includes('>') || line.includes('^') ||
|
|
461
|
+
line.match(/^\s*\d+\s*\|/)).slice(-20);
|
|
462
|
+
console.log(errorLines.length > 0 ? errorLines.join('\n') : lines.slice(-25).join('\n'));
|
|
463
|
+
console.log('');
|
|
464
|
+
console.log(chalk_1.default.dim(' Fix the error and run: cd ~/goodpass/api && docker compose up -d'));
|
|
465
|
+
}
|
|
466
|
+
else {
|
|
467
|
+
console.log(chalk_1.default.dim(' Try: cd ~/goodpass/api && docker compose up -d'));
|
|
468
|
+
}
|
|
469
|
+
}
|
|
443
470
|
}
|
|
444
471
|
console.log('');
|
|
445
472
|
}
|