@getmonoceros/workbench 1.11.6 → 1.11.8
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/bin.js +32 -2
- package/dist/bin.js.map +1 -1
- package/package.json +1 -1
package/dist/bin.js
CHANGED
|
@@ -1413,6 +1413,19 @@ var realDocker = defaultDockerExec;
|
|
|
1413
1413
|
function proxyDynamicDir(home) {
|
|
1414
1414
|
return path4.join(home ?? monocerosHome(), "traefik", "dynamic");
|
|
1415
1415
|
}
|
|
1416
|
+
async function kickProxyReload(opts = {}) {
|
|
1417
|
+
if (process.platform !== "win32") return;
|
|
1418
|
+
const docker = opts.docker ?? realDocker;
|
|
1419
|
+
const inspect = await docker([
|
|
1420
|
+
"inspect",
|
|
1421
|
+
"--format",
|
|
1422
|
+
"{{.State.Running}}",
|
|
1423
|
+
PROXY_CONTAINER_NAME
|
|
1424
|
+
]);
|
|
1425
|
+
if (inspect.exitCode !== 0) return;
|
|
1426
|
+
if (inspect.stdout.trim() !== "true") return;
|
|
1427
|
+
await docker(["restart", PROXY_CONTAINER_NAME]);
|
|
1428
|
+
}
|
|
1416
1429
|
async function ensureProxy(opts = {}) {
|
|
1417
1430
|
const docker = opts.docker ?? realDocker;
|
|
1418
1431
|
const dyn = proxyDynamicDir(opts.monocerosHome);
|
|
@@ -3266,6 +3279,9 @@ async function syncPortsToProxy(input) {
|
|
|
3266
3279
|
...input.proxyDocker ? { docker: input.proxyDocker } : {},
|
|
3267
3280
|
logger: { info: (m) => logger.info(m), warn: (m) => logger.warn(m) }
|
|
3268
3281
|
});
|
|
3282
|
+
await kickProxyReload({
|
|
3283
|
+
...input.proxyDocker ? { docker: input.proxyDocker } : {}
|
|
3284
|
+
});
|
|
3269
3285
|
const urls = proxyUrlsFor(input.name, allPorts, hostPort);
|
|
3270
3286
|
const lines = urls.map((u) => {
|
|
3271
3287
|
const tag = u.isDefault ? " (default)" : "";
|
|
@@ -3275,6 +3291,9 @@ async function syncPortsToProxy(input) {
|
|
|
3275
3291
|
${lines.join("\n")}`);
|
|
3276
3292
|
} else {
|
|
3277
3293
|
await removeDynamicConfig(input.name, { monocerosHome: home });
|
|
3294
|
+
await kickProxyReload({
|
|
3295
|
+
...input.proxyDocker ? { docker: input.proxyDocker } : {}
|
|
3296
|
+
});
|
|
3278
3297
|
await maybeStopProxy({
|
|
3279
3298
|
monocerosHome: home,
|
|
3280
3299
|
...input.proxyDocker ? { docker: input.proxyDocker } : {},
|
|
@@ -3966,7 +3985,6 @@ var spawnDocker = (args) => {
|
|
|
3966
3985
|
child.stderr?.on("data", (chunk) => {
|
|
3967
3986
|
stderr += chunk.toString("utf8");
|
|
3968
3987
|
});
|
|
3969
|
-
child.stderr?.pipe(createSecretMaskStream()).pipe(process.stderr);
|
|
3970
3988
|
child.on("error", reject);
|
|
3971
3989
|
child.on(
|
|
3972
3990
|
"exit",
|
|
@@ -3996,6 +4014,9 @@ async function cleanupDockerObjects(opts) {
|
|
|
3996
4014
|
opts.logger.info(`[${tag}] removing containers: ${ids.join(" ")}`);
|
|
3997
4015
|
const rmResult = await exec(["rm", "-f", ...ids]);
|
|
3998
4016
|
rmExit = rmResult.exitCode;
|
|
4017
|
+
if (rmExit !== 0 && rmResult.stderr.trim()) {
|
|
4018
|
+
opts.logger.info(`[${tag}] ${rmResult.stderr.trim()}`);
|
|
4019
|
+
}
|
|
3999
4020
|
} else {
|
|
4000
4021
|
opts.logger.info(`[${tag}] no containers found`);
|
|
4001
4022
|
}
|
|
@@ -4642,8 +4663,14 @@ ${sectionLine(label)}
|
|
|
4642
4663
|
hostPort: proxyHostPort(globalConfig),
|
|
4643
4664
|
logger
|
|
4644
4665
|
});
|
|
4666
|
+
await kickProxyReload({
|
|
4667
|
+
...opts.proxyDocker ? { docker: opts.proxyDocker } : {}
|
|
4668
|
+
});
|
|
4645
4669
|
} else {
|
|
4646
4670
|
await removeDynamicConfig(opts.name, { monocerosHome: home });
|
|
4671
|
+
await kickProxyReload({
|
|
4672
|
+
...opts.proxyDocker ? { docker: opts.proxyDocker } : {}
|
|
4673
|
+
});
|
|
4647
4674
|
}
|
|
4648
4675
|
} catch (err) {
|
|
4649
4676
|
logger.warn?.(
|
|
@@ -4756,7 +4783,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
|
|
|
4756
4783
|
}
|
|
4757
4784
|
|
|
4758
4785
|
// src/version.ts
|
|
4759
|
-
var CLI_VERSION = true ? "1.11.
|
|
4786
|
+
var CLI_VERSION = true ? "1.11.8" : "dev";
|
|
4760
4787
|
|
|
4761
4788
|
// src/commands/_dispatch.ts
|
|
4762
4789
|
import { consola as consola12 } from "consola";
|
|
@@ -6286,6 +6313,9 @@ async function runRemove(opts) {
|
|
|
6286
6313
|
}
|
|
6287
6314
|
try {
|
|
6288
6315
|
await removeDynamicConfig(opts.name, { monocerosHome: home });
|
|
6316
|
+
await kickProxyReload({
|
|
6317
|
+
...opts.proxyDocker ? { docker: opts.proxyDocker } : {}
|
|
6318
|
+
});
|
|
6289
6319
|
} catch (err) {
|
|
6290
6320
|
logger.warn?.(
|
|
6291
6321
|
`Could not remove Traefik dynamic config for ${opts.name}: ${err instanceof Error ? err.message : String(err)}. Ignored.`
|