@geekmidas/cli 10.0.0-alpha.180 → 10.0.0-alpha.181
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/{LegacyStateStore-l0hBdv-E.cjs → LegacyStateStore-DvufVJjQ.cjs} +2 -2
- package/dist/{LegacyStateStore-l0hBdv-E.cjs.map → LegacyStateStore-DvufVJjQ.cjs.map} +1 -1
- package/dist/{LegacyStateStore-B7pQA25B.mjs → LegacyStateStore-p-_Z8ucw.mjs} +2 -2
- package/dist/{LegacyStateStore-B7pQA25B.mjs.map → LegacyStateStore-p-_Z8ucw.mjs.map} +1 -1
- package/dist/{LocalStateStore-CP0UHL85.mjs → LocalStateStore-BKAi5XsN.mjs} +2 -2
- package/dist/{LocalStateStore-CP0UHL85.mjs.map → LocalStateStore-BKAi5XsN.mjs.map} +1 -1
- package/dist/{LocalStateStore-DEE0Kc_s.cjs → LocalStateStore-DLDD6udB.cjs} +2 -2
- package/dist/{LocalStateStore-DEE0Kc_s.cjs.map → LocalStateStore-DLDD6udB.cjs.map} +1 -1
- package/dist/{S3StateStore-vmxZWMKh.mjs → S3StateStore-C8thID2w.mjs} +4 -4
- package/dist/{S3StateStore-vmxZWMKh.mjs.map → S3StateStore-C8thID2w.mjs.map} +1 -1
- package/dist/{S3StateStore-DE0BNuXc.cjs → S3StateStore-J3FztlVC.cjs} +4 -4
- package/dist/{S3StateStore-DE0BNuXc.cjs.map → S3StateStore-J3FztlVC.cjs.map} +1 -1
- package/dist/{SSMStateStore-DQyXnX2M.mjs → SSMStateStore-0TQsme40.mjs} +2 -2
- package/dist/{SSMStateStore-DQyXnX2M.mjs.map → SSMStateStore-0TQsme40.mjs.map} +1 -1
- package/dist/{SSMStateStore-p4hBdTg3.cjs → SSMStateStore-DhkkSF1D.cjs} +2 -2
- package/dist/{SSMStateStore-p4hBdTg3.cjs.map → SSMStateStore-DhkkSF1D.cjs.map} +1 -1
- package/dist/{add-QBvDmVA-.mjs → add-DWCzdPLz.mjs} +4 -4
- package/dist/{add-QBvDmVA-.mjs.map → add-DWCzdPLz.mjs.map} +1 -1
- package/dist/{add-DEdpKya-.cjs → add-gs34ewLG.cjs} +4 -4
- package/dist/{add-DEdpKya-.cjs.map → add-gs34ewLG.cjs.map} +1 -1
- package/dist/{apps-qJ5FPJGQ.cjs → apps-C27qrbEe.cjs} +3 -3
- package/dist/{apps-qJ5FPJGQ.cjs.map → apps-C27qrbEe.cjs.map} +1 -1
- package/dist/{apps-D0LULFmU.mjs → apps-D2oTQasd.mjs} +3 -3
- package/dist/{apps-D0LULFmU.mjs.map → apps-D2oTQasd.mjs.map} +1 -1
- package/dist/{bundler-DZKdVVKZ.mjs → bundler-CbT4y4H_.mjs} +6 -6
- package/dist/{bundler-DZKdVVKZ.mjs.map → bundler-CbT4y4H_.mjs.map} +1 -1
- package/dist/{bundler-BuBCXA0t.cjs → bundler-DGeOugof.cjs} +6 -6
- package/dist/{bundler-BuBCXA0t.cjs.map → bundler-DGeOugof.cjs.map} +1 -1
- package/dist/{cli-BCGkzaR1.cjs → cli-C-jUNT69.cjs} +4 -4
- package/dist/{cli-BCGkzaR1.cjs.map → cli-C-jUNT69.cjs.map} +1 -1
- package/dist/{cli-CgEbT00Q.mjs → cli-DKEJryS7.mjs} +4 -4
- package/dist/{cli-CgEbT00Q.mjs.map → cli-DKEJryS7.mjs.map} +1 -1
- package/dist/{compose-DtfoUChm.mjs → compose-BpnSP2x7.mjs} +4 -4
- package/dist/{compose-DtfoUChm.mjs.map → compose-BpnSP2x7.mjs.map} +1 -1
- package/dist/{compose-C-yjexqX.cjs → compose-DJAaJEqL.cjs} +4 -4
- package/dist/{compose-C-yjexqX.cjs.map → compose-DJAaJEqL.cjs.map} +1 -1
- package/dist/{compose-AO8u4mBI.cjs → compose-DmtR2f0l.cjs} +76 -14
- package/dist/compose-DmtR2f0l.cjs.map +1 -0
- package/dist/{compose-C23RpAaF.mjs → compose-Glqs13is.mjs} +76 -14
- package/dist/compose-Glqs13is.mjs.map +1 -0
- package/dist/{dbTunnel-Bve0zBqT.cjs → dbTunnel-DUudiQWj.cjs} +6 -6
- package/dist/{dbTunnel-Bve0zBqT.cjs.map → dbTunnel-DUudiQWj.cjs.map} +1 -1
- package/dist/{dbTunnel-CnubkLBa.mjs → dbTunnel-KgbAh2v1.mjs} +6 -6
- package/dist/{dbTunnel-CnubkLBa.mjs.map → dbTunnel-KgbAh2v1.mjs.map} +1 -1
- package/dist/deploy/public.cjs +10 -10
- package/dist/deploy/public.mjs +10 -10
- package/dist/{deploy-Qq41vtpm.mjs → deploy-UkAiPzTp.mjs} +11 -11
- package/dist/{deploy-Qq41vtpm.mjs.map → deploy-UkAiPzTp.mjs.map} +1 -1
- package/dist/{deploy-C2MKxzm9.cjs → deploy-ycRCutW9.cjs} +11 -11
- package/dist/{deploy-C2MKxzm9.cjs.map → deploy-ycRCutW9.cjs.map} +1 -1
- package/dist/{destroy-Bg4IUf_Z.mjs → destroy-Cq5Un0kf.mjs} +7 -7
- package/dist/{destroy-Bg4IUf_Z.mjs.map → destroy-Cq5Un0kf.mjs.map} +1 -1
- package/dist/{destroy-CCpnHI2v.cjs → destroy-DzRzQcAR.cjs} +7 -7
- package/dist/{destroy-CCpnHI2v.cjs.map → destroy-DzRzQcAR.cjs.map} +1 -1
- package/dist/{dns-D_0z9Tm1.cjs → dns-7zc-Mc9k.cjs} +3 -3
- package/dist/{dns-D_0z9Tm1.cjs.map → dns-7zc-Mc9k.cjs.map} +1 -1
- package/dist/{dns-BAM8VH1v.mjs → dns-dl7WUWmB.mjs} +3 -3
- package/dist/{dns-BAM8VH1v.mjs.map → dns-dl7WUWmB.mjs.map} +1 -1
- package/dist/{docker-6EUbKrEl.cjs → docker-BDqp9Pfn.cjs} +4 -4
- package/dist/{docker-6EUbKrEl.cjs.map → docker-BDqp9Pfn.cjs.map} +1 -1
- package/dist/{docker-DQoE3Fr7.mjs → docker-MjMWQSEN.mjs} +4 -4
- package/dist/{docker-DQoE3Fr7.mjs.map → docker-MjMWQSEN.mjs.map} +1 -1
- package/dist/{dokploy-CU9iuc35.mjs → dokploy-B0xtYCzY.mjs} +2 -2
- package/dist/{dokploy-CU9iuc35.mjs.map → dokploy-B0xtYCzY.mjs.map} +1 -1
- package/dist/{dokploy-BD8NXy8y.cjs → dokploy-D-pBRnSV.cjs} +2 -2
- package/dist/{dokploy-BD8NXy8y.cjs.map → dokploy-D-pBRnSV.cjs.map} +1 -1
- package/dist/{eas-iYyg7Xjy.mjs → eas-9danFNrJ.mjs} +2 -2
- package/dist/{eas-iYyg7Xjy.mjs.map → eas-9danFNrJ.mjs.map} +1 -1
- package/dist/{eas-BhTOdQrE.cjs → eas-BJRA27vb.cjs} +2 -2
- package/dist/{eas-BhTOdQrE.cjs.map → eas-BJRA27vb.cjs.map} +1 -1
- package/dist/{encryption-yROMpM67.cjs → encryption-0IiNCA3O.cjs} +2 -2
- package/dist/{encryption-yROMpM67.cjs.map → encryption-0IiNCA3O.cjs.map} +1 -1
- package/dist/{encryption-hgmnMZw0.mjs → encryption-ZDhvgGvu.mjs} +2 -2
- package/dist/{encryption-hgmnMZw0.mjs.map → encryption-ZDhvgGvu.mjs.map} +1 -1
- package/dist/{engine-B4whsrrE.mjs → engine-Csnr6XDu.mjs} +8 -8
- package/dist/{engine-B4whsrrE.mjs.map → engine-Csnr6XDu.mjs.map} +1 -1
- package/dist/{engine-D0XYdIiE.cjs → engine-DpjIgsGn.cjs} +8 -8
- package/dist/{engine-D0XYdIiE.cjs.map → engine-DpjIgsGn.cjs.map} +1 -1
- package/dist/{github-CBkZF4PS.mjs → github-Dej8EWxH.mjs} +6 -6
- package/dist/{github-CBkZF4PS.mjs.map → github-Dej8EWxH.mjs.map} +1 -1
- package/dist/{github-D1-_OnGL.cjs → github-HHxVur1m.cjs} +6 -6
- package/dist/{github-D1-_OnGL.cjs.map → github-HHxVur1m.cjs.map} +1 -1
- package/dist/{googlePlay-Bwv8TVi8.mjs → googlePlay-DNrD-67X.mjs} +4 -4
- package/dist/{googlePlay-Bwv8TVi8.mjs.map → googlePlay-DNrD-67X.mjs.map} +1 -1
- package/dist/{googlePlay-s9dGfrrb.cjs → googlePlay-NK1zgJJm.cjs} +4 -4
- package/dist/{googlePlay-s9dGfrrb.cjs.map → googlePlay-NK1zgJJm.cjs.map} +1 -1
- package/dist/index.cjs +61 -61
- package/dist/index.cjs.map +1 -1
- package/dist/index.mjs +61 -61
- package/dist/index.mjs.map +1 -1
- package/dist/{local-CFnHQgWC.cjs → local-BW_VIsx0.cjs} +2 -2
- package/dist/{local-CFnHQgWC.cjs.map → local-BW_VIsx0.cjs.map} +1 -1
- package/dist/{local-JOnTFJA5.mjs → local-CVp-4wDb.mjs} +2 -2
- package/dist/{local-JOnTFJA5.mjs.map → local-CVp-4wDb.mjs.map} +1 -1
- package/dist/{migrate-CGXrmZyV.cjs → migrate-B8fq5egU.cjs} +4 -4
- package/dist/{migrate-CGXrmZyV.cjs.map → migrate-B8fq5egU.cjs.map} +1 -1
- package/dist/{migrate-BtnpQocG.mjs → migrate-C8yCZ5P3.mjs} +2 -2
- package/dist/{migrate-BtnpQocG.mjs.map → migrate-C8yCZ5P3.mjs.map} +1 -1
- package/dist/{migrate-fLIgSpPB.mjs → migrate-CkSq2f7k.mjs} +4 -4
- package/dist/{migrate-fLIgSpPB.mjs.map → migrate-CkSq2f7k.mjs.map} +1 -1
- package/dist/{migrate-CxWXW-Lw.cjs → migrate-FOc2erAl.cjs} +2 -2
- package/dist/{migrate-CxWXW-Lw.cjs.map → migrate-FOc2erAl.cjs.map} +1 -1
- package/dist/{notes-ChYPaRLu.cjs → notes--JQyDHim.cjs} +2 -2
- package/dist/{notes-ChYPaRLu.cjs.map → notes--JQyDHim.cjs.map} +1 -1
- package/dist/{notes-LATU2vLI.mjs → notes-DXl9qERh.mjs} +2 -2
- package/dist/{notes-LATU2vLI.mjs.map → notes-DXl9qERh.mjs.map} +1 -1
- package/dist/{projectBucket-BIeh2HTj.cjs → projectBucket-CGpcWqyY.cjs} +2 -2
- package/dist/{projectBucket-BIeh2HTj.cjs.map → projectBucket-CGpcWqyY.cjs.map} +1 -1
- package/dist/{projectBucket-D_4zb_oh.mjs → projectBucket-TigJy25c.mjs} +2 -2
- package/dist/{projectBucket-D_4zb_oh.mjs.map → projectBucket-TigJy25c.mjs.map} +1 -1
- package/dist/{publish-DhzRYhVZ.mjs → publish-BPfW3DWi.mjs} +2 -2
- package/dist/{publish-DhzRYhVZ.mjs.map → publish-BPfW3DWi.mjs.map} +1 -1
- package/dist/{publish-Dc-1GQp8.cjs → publish-D4pC6_G0.cjs} +2 -2
- package/dist/{publish-Dc-1GQp8.cjs.map → publish-D4pC6_G0.cjs.map} +1 -1
- package/dist/{resolve-DyUXmA0z.cjs → resolve-BmBR1vBr.cjs} +4 -4
- package/dist/{resolve-DyUXmA0z.cjs.map → resolve-BmBR1vBr.cjs.map} +1 -1
- package/dist/{resolve-CJvM2bUx.mjs → resolve-DA1kORng.mjs} +4 -4
- package/dist/{resolve-CJvM2bUx.mjs.map → resolve-DA1kORng.mjs.map} +1 -1
- package/dist/{rollback-BO1asWkd.mjs → rollback-DlgQDX8m.mjs} +5 -5
- package/dist/{rollback-BO1asWkd.mjs.map → rollback-DlgQDX8m.mjs.map} +1 -1
- package/dist/{rollback-Op8Tc5N-.cjs → rollback-tsy4pyEp.cjs} +5 -5
- package/dist/{rollback-Op8Tc5N-.cjs.map → rollback-tsy4pyEp.cjs.map} +1 -1
- package/dist/{s3-CwacPd8J.cjs → s3-BLEF-PQU.cjs} +2 -2
- package/dist/{s3-CwacPd8J.cjs.map → s3-BLEF-PQU.cjs.map} +1 -1
- package/dist/{s3-BbtwHSod.mjs → s3-DVYiOqWs.mjs} +2 -2
- package/dist/{s3-BbtwHSod.mjs.map → s3-DVYiOqWs.mjs.map} +1 -1
- package/dist/{serverSetup-BFdzPTIT.cjs → serverSetup-B_O65wLb.cjs} +5 -5
- package/dist/{serverSetup-BFdzPTIT.cjs.map → serverSetup-B_O65wLb.cjs.map} +1 -1
- package/dist/{serverSetup-CSxaZ7ha.mjs → serverSetup-Dsy8drIb.mjs} +5 -5
- package/dist/{serverSetup-CSxaZ7ha.mjs.map → serverSetup-Dsy8drIb.mjs.map} +1 -1
- package/dist/{sniffer-D3gH7aJT.cjs → sniffer-Ckx4cr-o.cjs} +6 -6
- package/dist/{sniffer-D3gH7aJT.cjs.map → sniffer-Ckx4cr-o.cjs.map} +1 -1
- package/dist/{sniffer-CwxpsSez.mjs → sniffer-fBefNUuJ.mjs} +6 -6
- package/dist/{sniffer-CwxpsSez.mjs.map → sniffer-fBefNUuJ.mjs.map} +1 -1
- package/dist/{snsSubscriptions-n3sjbrRM.mjs → snsSubscriptions-BJ0LErGk.mjs} +3 -3
- package/dist/{snsSubscriptions-n3sjbrRM.mjs.map → snsSubscriptions-BJ0LErGk.mjs.map} +1 -1
- package/dist/{snsSubscriptions-B8tGxND5.cjs → snsSubscriptions-ChbFp-QP.cjs} +3 -3
- package/dist/{snsSubscriptions-B8tGxND5.cjs.map → snsSubscriptions-ChbFp-QP.cjs.map} +1 -1
- package/dist/{sst-Cjocp7gi.cjs → sst-BnuPeGyy.cjs} +4 -4
- package/dist/{sst-Cjocp7gi.cjs.map → sst-BnuPeGyy.cjs.map} +1 -1
- package/dist/{sst-DeF0BfDA.mjs → sst-Y7H_zaEZ.mjs} +4 -4
- package/dist/{sst-DeF0BfDA.mjs.map → sst-Y7H_zaEZ.mjs.map} +1 -1
- package/dist/{stack-Dr2FSxGm.cjs → stack-BAipv5Js.cjs} +6 -6
- package/dist/{stack-Dr2FSxGm.cjs.map → stack-BAipv5Js.cjs.map} +1 -1
- package/dist/{stack-CyoRqyPt.mjs → stack-BHrGbsGA.mjs} +6 -6
- package/dist/{stack-CyoRqyPt.mjs.map → stack-BHrGbsGA.mjs.map} +1 -1
- package/dist/{stage-TAx0Gcq8.mjs → stage-BSZ9890H.mjs} +5 -5
- package/dist/{stage-TAx0Gcq8.mjs.map → stage-BSZ9890H.mjs.map} +1 -1
- package/dist/{stage-aTBLKonw.cjs → stage-D7vBtLXL.cjs} +5 -5
- package/dist/{stage-aTBLKonw.cjs.map → stage-D7vBtLXL.cjs.map} +1 -1
- package/dist/target/public.cjs +1 -1
- package/dist/target/public.mjs +1 -1
- package/dist/{terminal-DPf137EJ.cjs → terminal-B7G-FtkD.cjs} +2 -2
- package/dist/{terminal-DPf137EJ.cjs.map → terminal-B7G-FtkD.cjs.map} +1 -1
- package/dist/{terminal-Bk4PjXWY.mjs → terminal-lp8RwHdX.mjs} +2 -2
- package/dist/{terminal-Bk4PjXWY.mjs.map → terminal-lp8RwHdX.mjs.map} +1 -1
- package/package.json +16 -16
- package/dist/compose-AO8u4mBI.cjs.map +0 -1
- package/dist/compose-C23RpAaF.mjs.map +0 -1
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
const require_rolldown_runtime = require("./rolldown-runtime-C0BPl7ul.cjs");
|
|
2
2
|
const require_errors = require("./errors-D1x8duqI.cjs");
|
|
3
|
-
const require_dns = require("./dns-
|
|
3
|
+
const require_dns = require("./dns-7zc-Mc9k.cjs");
|
|
4
4
|
const require_workspace = require("./workspace-wTLnc1Ef.cjs");
|
|
5
|
-
const require_apps = require("./apps-
|
|
5
|
+
const require_apps = require("./apps-C27qrbEe.cjs");
|
|
6
6
|
const require_define = require("./define-zKgLY65H.cjs");
|
|
7
|
-
const require_compose = require("./compose-
|
|
7
|
+
const require_compose = require("./compose-DJAaJEqL.cjs");
|
|
8
8
|
const require_drivers = require("./drivers-DP7__dJX.cjs");
|
|
9
9
|
const require_discover = require("./discover-OXczlq08.cjs");
|
|
10
|
-
const require_stack = require("./stack-
|
|
11
|
-
const require_docker = require("./docker-
|
|
12
|
-
const require_snsSubscriptions = require("./snsSubscriptions-
|
|
10
|
+
const require_stack = require("./stack-BAipv5Js.cjs");
|
|
11
|
+
const require_docker = require("./docker-BDqp9Pfn.cjs");
|
|
12
|
+
const require_snsSubscriptions = require("./snsSubscriptions-ChbFp-QP.cjs");
|
|
13
13
|
const require_seeds = require("./seeds-Bc3niNVb.cjs");
|
|
14
14
|
const require_databases = require("./databases-DwYYH2mX.cjs");
|
|
15
15
|
let node_path = require("node:path");
|
|
@@ -431,6 +431,33 @@ const dockerCompose = {
|
|
|
431
431
|
});
|
|
432
432
|
if (started.code !== 0) throw new ContainersNotStarted(ids, started.stderr);
|
|
433
433
|
},
|
|
434
|
+
async remove(engine, project, service) {
|
|
435
|
+
const env = engineEnv(engine);
|
|
436
|
+
const options = env ? { env } : {};
|
|
437
|
+
const listed = await capture("docker", [
|
|
438
|
+
"ps",
|
|
439
|
+
"--all",
|
|
440
|
+
"--filter",
|
|
441
|
+
`label=com.docker.compose.project=${project}`,
|
|
442
|
+
"--filter",
|
|
443
|
+
`label=com.docker.compose.service=${service}`,
|
|
444
|
+
"--format",
|
|
445
|
+
"{{.ID}}"
|
|
446
|
+
], options);
|
|
447
|
+
if (listed.code !== 0) throw new DockerUnreachable(engine.host ?? "this machine", listed.stderr);
|
|
448
|
+
const ids = listed.stdout.split("\n").filter(Boolean);
|
|
449
|
+
if (ids.length === 0) return [];
|
|
450
|
+
const removed = await capture("docker", [
|
|
451
|
+
"rm",
|
|
452
|
+
"--force",
|
|
453
|
+
...ids
|
|
454
|
+
], {
|
|
455
|
+
...options,
|
|
456
|
+
timeoutMs: 12e4
|
|
457
|
+
});
|
|
458
|
+
if (removed.code !== 0) throw new ContainersNotRemoved(project, service, ids, removed.stderr);
|
|
459
|
+
return ids;
|
|
460
|
+
},
|
|
434
461
|
runOnce(engine, options) {
|
|
435
462
|
return dockerExit([
|
|
436
463
|
"run",
|
|
@@ -517,6 +544,21 @@ var ContainersNotStarted = class extends require_errors.GkmError {
|
|
|
517
544
|
this.name = "ContainersNotStarted";
|
|
518
545
|
}
|
|
519
546
|
};
|
|
547
|
+
/** `docker rm` failed for a service's containers. */
|
|
548
|
+
var ContainersNotRemoved = class extends require_errors.GkmError {
|
|
549
|
+
project;
|
|
550
|
+
service;
|
|
551
|
+
ids;
|
|
552
|
+
output;
|
|
553
|
+
constructor(project, service, ids, output) {
|
|
554
|
+
super(`Could not remove ${project}'s ${service} containers ${ids.join(", ")} (docker said: ${output.trim() || "nothing"}). Remove them on the stage's server with \`docker rm --force ${ids.join(" ")}\`, and deploy again.`);
|
|
555
|
+
this.project = project;
|
|
556
|
+
this.service = service;
|
|
557
|
+
this.ids = ids;
|
|
558
|
+
this.output = output;
|
|
559
|
+
this.name = "ContainersNotRemoved";
|
|
560
|
+
}
|
|
561
|
+
};
|
|
520
562
|
/** `docker network create` failed. */
|
|
521
563
|
var NetworkCreateFailed = class extends require_errors.GkmError {
|
|
522
564
|
network;
|
|
@@ -760,10 +802,11 @@ var EdgeWriteFailed = class extends require_errors.GkmError {
|
|
|
760
802
|
/**
|
|
761
803
|
* Something other than the proxy a stack is set to holds the edge's ports.
|
|
762
804
|
*
|
|
763
|
-
* With `proxy: 'traefik'`,
|
|
764
|
-
* the
|
|
765
|
-
* edge, or another stack's Caddy. Refused before
|
|
766
|
-
* stack is never left half on one proxy and half
|
|
805
|
+
* With `proxy: 'traefik'`, any container but the shared edge and the stack's
|
|
806
|
+
* own Caddy, which the deploy moves (see {@link assertEdgePorts}); with
|
|
807
|
+
* `proxy: 'caddy'`, the shared edge, or another stack's Caddy. Refused before
|
|
808
|
+
* anything is started, so the stack is never left half on one proxy and half
|
|
809
|
+
* on the other.
|
|
767
810
|
*/
|
|
768
811
|
var ComposeProxyClash = class extends require_errors.GkmError {
|
|
769
812
|
project;
|
|
@@ -772,7 +815,7 @@ var ComposeProxyClash = class extends require_errors.GkmError {
|
|
|
772
815
|
holder;
|
|
773
816
|
constructor(project, proxy, port, holder) {
|
|
774
817
|
const by = holder.project ? `${holder.container} (compose project ${holder.project})` : holder.container;
|
|
775
|
-
const fix = proxy === "traefik" ?
|
|
818
|
+
const fix = proxy === "traefik" ? `The shared edge needs ports 80 and 443. Stop ${holder.container}${holder.project ? ` (docker compose -p ${holder.project} down, or its own gkm compose --down)` : ""}, or move the edge with GKM_COMPOSE_HTTPS_PORT/GKM_COMPOSE_HTTP_PORT.` : holder.project === _geekmidas_edge_proxy_traefik.EDGE_PROJECT ? `That is the server's shared Traefik edge, which other stacks register with. Set deploy.compose.proxy to 'traefik' for this stage so the stack registers with it too, or stop the edge once nothing uses it (docker compose -p ${_geekmidas_edge_proxy_traefik.EDGE_PROJECT} down).` : `Stop ${holder.container}, or publish this stack's Caddy elsewhere with GKM_COMPOSE_HTTPS_PORT/GKM_COMPOSE_HTTP_PORT.`;
|
|
776
819
|
super(`${project} is set to proxy: '${proxy}', and port ${port} is held by ${by}. ${fix}`);
|
|
777
820
|
this.project = project;
|
|
778
821
|
this.proxy = proxy;
|
|
@@ -784,10 +827,25 @@ var ComposeProxyClash = class extends require_errors.GkmError {
|
|
|
784
827
|
/**
|
|
785
828
|
* Refuse a stack whose edge ports are held by anything but its own proxy:
|
|
786
829
|
* the shared edge for `'traefik'`, the stack's own Caddy for `'caddy'`.
|
|
830
|
+
*
|
|
831
|
+
* One holder is not refused: with `'traefik'`, the stack's own Caddy, still
|
|
832
|
+
* running from before the stage was switched. It is this stack's to move and
|
|
833
|
+
* no other's, so it is returned for the deploy to remove just before the edge
|
|
834
|
+
* takes the ports — the moment's downtime the switch costs. Undefined when
|
|
835
|
+
* there is nothing to move.
|
|
787
836
|
*/
|
|
788
837
|
async function assertEdgePorts(docker, options) {
|
|
789
838
|
const { project, proxy, ports } = options;
|
|
790
|
-
|
|
839
|
+
const ownCaddy = (holder) => holder.project === project && holder.service === "caddy";
|
|
840
|
+
let move;
|
|
841
|
+
for (const port of [ports.https, ports.http]) for (const holder of await docker.publishers(options.engine, port)) {
|
|
842
|
+
if (proxy === "traefik" && ownCaddy(holder)) {
|
|
843
|
+
move = holder;
|
|
844
|
+
continue;
|
|
845
|
+
}
|
|
846
|
+
if (!(proxy === "traefik" ? holder.project === _geekmidas_edge_proxy_traefik.EDGE_PROJECT : ownCaddy(holder))) throw new ComposeProxyClash(project, proxy, port, holder);
|
|
847
|
+
}
|
|
848
|
+
return move;
|
|
791
849
|
}
|
|
792
850
|
/**
|
|
793
851
|
* Write a file into the edge's running container whole or not at all: a
|
|
@@ -2424,7 +2482,7 @@ async function provisionCompose(ctx, run, deps) {
|
|
|
2424
2482
|
ctx.logger.info(`🔑 Generated for "${ctx.stage}" (${ctx.secrets.store}): ${run.generated.join(", ")}`);
|
|
2425
2483
|
}
|
|
2426
2484
|
const ports = edgePorts(deps.env);
|
|
2427
|
-
await assertEdgePorts(deps.docker, {
|
|
2485
|
+
const ownCaddy = await assertEdgePorts(deps.docker, {
|
|
2428
2486
|
project: run.stack.project,
|
|
2429
2487
|
proxy: run.stack.proxy,
|
|
2430
2488
|
ports,
|
|
@@ -2435,6 +2493,10 @@ async function provisionCompose(ctx, run, deps) {
|
|
|
2435
2493
|
run.files = await writeStack(ctx.cwd, run.dir, stack);
|
|
2436
2494
|
printPlan(ctx, run);
|
|
2437
2495
|
if (stack.proxy === "traefik") {
|
|
2496
|
+
if (ownCaddy) {
|
|
2497
|
+
ctx.logger.warn(`\n↪ Moving ${stack.project} from its own Caddy to the shared edge: removing ${ownCaddy.container}. Its hosts are offline until the edge is up and the stack is registered with it.`);
|
|
2498
|
+
await deps.docker.remove(ref, stack.project, "caddy");
|
|
2499
|
+
}
|
|
2438
2500
|
ctx.logger.info(`\n🌐 Starting the shared edge (${_geekmidas_edge_proxy_traefik.EDGE_PROJECT})…`);
|
|
2439
2501
|
run.files.push(...await ensureEdge(deps.docker, {
|
|
2440
2502
|
file: edgeFile(run),
|
|
@@ -3499,4 +3561,4 @@ Object.defineProperty(exports, "stackOverrideFile", {
|
|
|
3499
3561
|
}
|
|
3500
3562
|
});
|
|
3501
3563
|
|
|
3502
|
-
//# sourceMappingURL=compose-
|
|
3564
|
+
//# sourceMappingURL=compose-DmtR2f0l.cjs.map
|