@geekmidas/cli 10.0.0-alpha.180 → 10.0.0-alpha.182

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.
Files changed (159) hide show
  1. package/dist/{LegacyStateStore-l0hBdv-E.cjs → LegacyStateStore-BRP6O9rR.cjs} +2 -2
  2. package/dist/{LegacyStateStore-l0hBdv-E.cjs.map → LegacyStateStore-BRP6O9rR.cjs.map} +1 -1
  3. package/dist/{LegacyStateStore-B7pQA25B.mjs → LegacyStateStore-CicrAWKh.mjs} +2 -2
  4. package/dist/{LegacyStateStore-B7pQA25B.mjs.map → LegacyStateStore-CicrAWKh.mjs.map} +1 -1
  5. package/dist/{LocalStateStore-DEE0Kc_s.cjs → LocalStateStore-BeEftmvd.cjs} +2 -2
  6. package/dist/{LocalStateStore-DEE0Kc_s.cjs.map → LocalStateStore-BeEftmvd.cjs.map} +1 -1
  7. package/dist/{LocalStateStore-CP0UHL85.mjs → LocalStateStore-n8BSxbT3.mjs} +2 -2
  8. package/dist/{LocalStateStore-CP0UHL85.mjs.map → LocalStateStore-n8BSxbT3.mjs.map} +1 -1
  9. package/dist/{S3StateStore-vmxZWMKh.mjs → S3StateStore-Csz1OtTD.mjs} +4 -4
  10. package/dist/{S3StateStore-vmxZWMKh.mjs.map → S3StateStore-Csz1OtTD.mjs.map} +1 -1
  11. package/dist/{S3StateStore-DE0BNuXc.cjs → S3StateStore-DJHzMqUg.cjs} +4 -4
  12. package/dist/{S3StateStore-DE0BNuXc.cjs.map → S3StateStore-DJHzMqUg.cjs.map} +1 -1
  13. package/dist/{SSMStateStore-DQyXnX2M.mjs → SSMStateStore-BmjXQQwi.mjs} +2 -2
  14. package/dist/{SSMStateStore-DQyXnX2M.mjs.map → SSMStateStore-BmjXQQwi.mjs.map} +1 -1
  15. package/dist/{SSMStateStore-p4hBdTg3.cjs → SSMStateStore-FH5SxNud.cjs} +2 -2
  16. package/dist/{SSMStateStore-p4hBdTg3.cjs.map → SSMStateStore-FH5SxNud.cjs.map} +1 -1
  17. package/dist/{add-DEdpKya-.cjs → add-B0U_pQSW.cjs} +4 -4
  18. package/dist/{add-DEdpKya-.cjs.map → add-B0U_pQSW.cjs.map} +1 -1
  19. package/dist/{add-QBvDmVA-.mjs → add-CI9ffZN7.mjs} +4 -4
  20. package/dist/{add-QBvDmVA-.mjs.map → add-CI9ffZN7.mjs.map} +1 -1
  21. package/dist/{apps-D0LULFmU.mjs → apps-BlwS8CjS.mjs} +3 -3
  22. package/dist/{apps-D0LULFmU.mjs.map → apps-BlwS8CjS.mjs.map} +1 -1
  23. package/dist/{apps-qJ5FPJGQ.cjs → apps-_6kKM67e.cjs} +3 -3
  24. package/dist/{apps-qJ5FPJGQ.cjs.map → apps-_6kKM67e.cjs.map} +1 -1
  25. package/dist/{bundler-BuBCXA0t.cjs → bundler--KfgyGP8.cjs} +6 -6
  26. package/dist/{bundler-BuBCXA0t.cjs.map → bundler--KfgyGP8.cjs.map} +1 -1
  27. package/dist/{bundler-DZKdVVKZ.mjs → bundler-DhIA5K-G.mjs} +6 -6
  28. package/dist/{bundler-DZKdVVKZ.mjs.map → bundler-DhIA5K-G.mjs.map} +1 -1
  29. package/dist/{cli-CgEbT00Q.mjs → cli-CS6ecPI1.mjs} +4 -4
  30. package/dist/{cli-CgEbT00Q.mjs.map → cli-CS6ecPI1.mjs.map} +1 -1
  31. package/dist/{cli-BCGkzaR1.cjs → cli-rfpwJQbd.cjs} +4 -4
  32. package/dist/{cli-BCGkzaR1.cjs.map → cli-rfpwJQbd.cjs.map} +1 -1
  33. package/dist/{compose-C-yjexqX.cjs → compose-BzFV_0Q9.cjs} +4 -4
  34. package/dist/{compose-C-yjexqX.cjs.map → compose-BzFV_0Q9.cjs.map} +1 -1
  35. package/dist/{compose-AO8u4mBI.cjs → compose-CdVh0nqk.cjs} +91 -15
  36. package/dist/compose-CdVh0nqk.cjs.map +1 -0
  37. package/dist/{compose-C23RpAaF.mjs → compose-TWiIQaA5.mjs} +91 -15
  38. package/dist/compose-TWiIQaA5.mjs.map +1 -0
  39. package/dist/{compose-DtfoUChm.mjs → compose-afWlhnJ2.mjs} +4 -4
  40. package/dist/{compose-DtfoUChm.mjs.map → compose-afWlhnJ2.mjs.map} +1 -1
  41. package/dist/{dbTunnel-Bve0zBqT.cjs → dbTunnel-BX6c-a7j.cjs} +6 -6
  42. package/dist/{dbTunnel-Bve0zBqT.cjs.map → dbTunnel-BX6c-a7j.cjs.map} +1 -1
  43. package/dist/{dbTunnel-CnubkLBa.mjs → dbTunnel-C7nukvfw.mjs} +6 -6
  44. package/dist/{dbTunnel-CnubkLBa.mjs.map → dbTunnel-C7nukvfw.mjs.map} +1 -1
  45. package/dist/deploy/public.cjs +10 -10
  46. package/dist/deploy/public.mjs +10 -10
  47. package/dist/{deploy-C2MKxzm9.cjs → deploy-CsA10pJq.cjs} +11 -11
  48. package/dist/{deploy-C2MKxzm9.cjs.map → deploy-CsA10pJq.cjs.map} +1 -1
  49. package/dist/{deploy-Qq41vtpm.mjs → deploy-qacf9be0.mjs} +11 -11
  50. package/dist/{deploy-Qq41vtpm.mjs.map → deploy-qacf9be0.mjs.map} +1 -1
  51. package/dist/{destroy-Bg4IUf_Z.mjs → destroy-DLiq343o.mjs} +7 -7
  52. package/dist/{destroy-Bg4IUf_Z.mjs.map → destroy-DLiq343o.mjs.map} +1 -1
  53. package/dist/{destroy-CCpnHI2v.cjs → destroy-ngZALiav.cjs} +7 -7
  54. package/dist/{destroy-CCpnHI2v.cjs.map → destroy-ngZALiav.cjs.map} +1 -1
  55. package/dist/{dns-BAM8VH1v.mjs → dns-Clnn8_Da.mjs} +3 -3
  56. package/dist/{dns-BAM8VH1v.mjs.map → dns-Clnn8_Da.mjs.map} +1 -1
  57. package/dist/{dns-D_0z9Tm1.cjs → dns-DHyogtOl.cjs} +3 -3
  58. package/dist/{dns-D_0z9Tm1.cjs.map → dns-DHyogtOl.cjs.map} +1 -1
  59. package/dist/{docker-DQoE3Fr7.mjs → docker-8jRkfK5W.mjs} +4 -4
  60. package/dist/{docker-DQoE3Fr7.mjs.map → docker-8jRkfK5W.mjs.map} +1 -1
  61. package/dist/{docker-6EUbKrEl.cjs → docker-CvDjL4Ar.cjs} +4 -4
  62. package/dist/{docker-6EUbKrEl.cjs.map → docker-CvDjL4Ar.cjs.map} +1 -1
  63. package/dist/{dokploy-CU9iuc35.mjs → dokploy-C-uuNLDW.mjs} +2 -2
  64. package/dist/{dokploy-CU9iuc35.mjs.map → dokploy-C-uuNLDW.mjs.map} +1 -1
  65. package/dist/{dokploy-BD8NXy8y.cjs → dokploy-DMkSjuui.cjs} +2 -2
  66. package/dist/{dokploy-BD8NXy8y.cjs.map → dokploy-DMkSjuui.cjs.map} +1 -1
  67. package/dist/{eas-BhTOdQrE.cjs → eas-BoQZarqG.cjs} +2 -2
  68. package/dist/{eas-BhTOdQrE.cjs.map → eas-BoQZarqG.cjs.map} +1 -1
  69. package/dist/{eas-iYyg7Xjy.mjs → eas-DJ72jimW.mjs} +2 -2
  70. package/dist/{eas-iYyg7Xjy.mjs.map → eas-DJ72jimW.mjs.map} +1 -1
  71. package/dist/{encryption-yROMpM67.cjs → encryption-DV_CquCK.cjs} +2 -2
  72. package/dist/{encryption-yROMpM67.cjs.map → encryption-DV_CquCK.cjs.map} +1 -1
  73. package/dist/{encryption-hgmnMZw0.mjs → encryption-kkNdsOGW.mjs} +2 -2
  74. package/dist/{encryption-hgmnMZw0.mjs.map → encryption-kkNdsOGW.mjs.map} +1 -1
  75. package/dist/{engine-B4whsrrE.mjs → engine-Cd3bKbRY.mjs} +8 -8
  76. package/dist/{engine-B4whsrrE.mjs.map → engine-Cd3bKbRY.mjs.map} +1 -1
  77. package/dist/{engine-D0XYdIiE.cjs → engine-CmXDgdiq.cjs} +8 -8
  78. package/dist/{engine-D0XYdIiE.cjs.map → engine-CmXDgdiq.cjs.map} +1 -1
  79. package/dist/{github-D1-_OnGL.cjs → github-C704AJDB.cjs} +6 -6
  80. package/dist/{github-D1-_OnGL.cjs.map → github-C704AJDB.cjs.map} +1 -1
  81. package/dist/{github-CBkZF4PS.mjs → github-CroZXJ4R.mjs} +6 -6
  82. package/dist/{github-CBkZF4PS.mjs.map → github-CroZXJ4R.mjs.map} +1 -1
  83. package/dist/{googlePlay-s9dGfrrb.cjs → googlePlay-BQE1HTmv.cjs} +4 -4
  84. package/dist/{googlePlay-s9dGfrrb.cjs.map → googlePlay-BQE1HTmv.cjs.map} +1 -1
  85. package/dist/{googlePlay-Bwv8TVi8.mjs → googlePlay-Bzxp4zQ3.mjs} +4 -4
  86. package/dist/{googlePlay-Bwv8TVi8.mjs.map → googlePlay-Bzxp4zQ3.mjs.map} +1 -1
  87. package/dist/index.cjs +61 -61
  88. package/dist/index.cjs.map +1 -1
  89. package/dist/index.mjs +61 -61
  90. package/dist/index.mjs.map +1 -1
  91. package/dist/{local-JOnTFJA5.mjs → local-BYjJ4cw5.mjs} +2 -2
  92. package/dist/{local-JOnTFJA5.mjs.map → local-BYjJ4cw5.mjs.map} +1 -1
  93. package/dist/{local-CFnHQgWC.cjs → local-CxTYQed-.cjs} +2 -2
  94. package/dist/{local-CFnHQgWC.cjs.map → local-CxTYQed-.cjs.map} +1 -1
  95. package/dist/{migrate-BtnpQocG.mjs → migrate-CsJrcPmW.mjs} +2 -2
  96. package/dist/{migrate-BtnpQocG.mjs.map → migrate-CsJrcPmW.mjs.map} +1 -1
  97. package/dist/{migrate-CGXrmZyV.cjs → migrate-Cv1Wj_hS.cjs} +4 -4
  98. package/dist/{migrate-CGXrmZyV.cjs.map → migrate-Cv1Wj_hS.cjs.map} +1 -1
  99. package/dist/{migrate-CxWXW-Lw.cjs → migrate-LiP3lxDP.cjs} +2 -2
  100. package/dist/{migrate-CxWXW-Lw.cjs.map → migrate-LiP3lxDP.cjs.map} +1 -1
  101. package/dist/{migrate-fLIgSpPB.mjs → migrate-X9wfAInp.mjs} +4 -4
  102. package/dist/{migrate-fLIgSpPB.mjs.map → migrate-X9wfAInp.mjs.map} +1 -1
  103. package/dist/{notes-ChYPaRLu.cjs → notes-C1yLF-KM.cjs} +2 -2
  104. package/dist/{notes-ChYPaRLu.cjs.map → notes-C1yLF-KM.cjs.map} +1 -1
  105. package/dist/{notes-LATU2vLI.mjs → notes-CbRe1mqV.mjs} +2 -2
  106. package/dist/{notes-LATU2vLI.mjs.map → notes-CbRe1mqV.mjs.map} +1 -1
  107. package/dist/{projectBucket-BIeh2HTj.cjs → projectBucket-Bk2KbOkD.cjs} +2 -2
  108. package/dist/{projectBucket-BIeh2HTj.cjs.map → projectBucket-Bk2KbOkD.cjs.map} +1 -1
  109. package/dist/{projectBucket-D_4zb_oh.mjs → projectBucket-Diqy2tAk.mjs} +2 -2
  110. package/dist/{projectBucket-D_4zb_oh.mjs.map → projectBucket-Diqy2tAk.mjs.map} +1 -1
  111. package/dist/{publish-Dc-1GQp8.cjs → publish-BNNQepSY.cjs} +2 -2
  112. package/dist/{publish-Dc-1GQp8.cjs.map → publish-BNNQepSY.cjs.map} +1 -1
  113. package/dist/{publish-DhzRYhVZ.mjs → publish-Cs09Fa7P.mjs} +2 -2
  114. package/dist/{publish-DhzRYhVZ.mjs.map → publish-Cs09Fa7P.mjs.map} +1 -1
  115. package/dist/{resolve-CJvM2bUx.mjs → resolve-BW8-rZMG.mjs} +4 -4
  116. package/dist/{resolve-CJvM2bUx.mjs.map → resolve-BW8-rZMG.mjs.map} +1 -1
  117. package/dist/{resolve-DyUXmA0z.cjs → resolve-L5P6IrY3.cjs} +4 -4
  118. package/dist/{resolve-DyUXmA0z.cjs.map → resolve-L5P6IrY3.cjs.map} +1 -1
  119. package/dist/{rollback-BO1asWkd.mjs → rollback-CIYpO8Zx.mjs} +5 -5
  120. package/dist/{rollback-BO1asWkd.mjs.map → rollback-CIYpO8Zx.mjs.map} +1 -1
  121. package/dist/{rollback-Op8Tc5N-.cjs → rollback-CIfOaM8X.cjs} +5 -5
  122. package/dist/{rollback-Op8Tc5N-.cjs.map → rollback-CIfOaM8X.cjs.map} +1 -1
  123. package/dist/{s3-BbtwHSod.mjs → s3-BdC1c-oO.mjs} +2 -2
  124. package/dist/{s3-BbtwHSod.mjs.map → s3-BdC1c-oO.mjs.map} +1 -1
  125. package/dist/{s3-CwacPd8J.cjs → s3-D623r4M6.cjs} +2 -2
  126. package/dist/{s3-CwacPd8J.cjs.map → s3-D623r4M6.cjs.map} +1 -1
  127. package/dist/{serverSetup-BFdzPTIT.cjs → serverSetup-Cb6JQ7ak.cjs} +5 -5
  128. package/dist/{serverSetup-BFdzPTIT.cjs.map → serverSetup-Cb6JQ7ak.cjs.map} +1 -1
  129. package/dist/{serverSetup-CSxaZ7ha.mjs → serverSetup-DH_PUrdN.mjs} +5 -5
  130. package/dist/{serverSetup-CSxaZ7ha.mjs.map → serverSetup-DH_PUrdN.mjs.map} +1 -1
  131. package/dist/{sniffer-D3gH7aJT.cjs → sniffer-5cFiLD6z.cjs} +6 -6
  132. package/dist/{sniffer-D3gH7aJT.cjs.map → sniffer-5cFiLD6z.cjs.map} +1 -1
  133. package/dist/{sniffer-CwxpsSez.mjs → sniffer-Bm-W3u1a.mjs} +6 -6
  134. package/dist/{sniffer-CwxpsSez.mjs.map → sniffer-Bm-W3u1a.mjs.map} +1 -1
  135. package/dist/{snsSubscriptions-n3sjbrRM.mjs → snsSubscriptions-DO3vC1GH.mjs} +3 -3
  136. package/dist/{snsSubscriptions-n3sjbrRM.mjs.map → snsSubscriptions-DO3vC1GH.mjs.map} +1 -1
  137. package/dist/{snsSubscriptions-B8tGxND5.cjs → snsSubscriptions-Dw3bd8dx.cjs} +3 -3
  138. package/dist/{snsSubscriptions-B8tGxND5.cjs.map → snsSubscriptions-Dw3bd8dx.cjs.map} +1 -1
  139. package/dist/{sst-Cjocp7gi.cjs → sst-CKlqKTem.cjs} +4 -4
  140. package/dist/{sst-Cjocp7gi.cjs.map → sst-CKlqKTem.cjs.map} +1 -1
  141. package/dist/{sst-DeF0BfDA.mjs → sst-OLcmeSkm.mjs} +4 -4
  142. package/dist/{sst-DeF0BfDA.mjs.map → sst-OLcmeSkm.mjs.map} +1 -1
  143. package/dist/{stack-CyoRqyPt.mjs → stack-B8_fOPGr.mjs} +6 -6
  144. package/dist/{stack-CyoRqyPt.mjs.map → stack-B8_fOPGr.mjs.map} +1 -1
  145. package/dist/{stack-Dr2FSxGm.cjs → stack-DqgW5sRK.cjs} +6 -6
  146. package/dist/{stack-Dr2FSxGm.cjs.map → stack-DqgW5sRK.cjs.map} +1 -1
  147. package/dist/{stage-TAx0Gcq8.mjs → stage-96X0rmps.mjs} +5 -5
  148. package/dist/{stage-TAx0Gcq8.mjs.map → stage-96X0rmps.mjs.map} +1 -1
  149. package/dist/{stage-aTBLKonw.cjs → stage-9zaZLwpP.cjs} +5 -5
  150. package/dist/{stage-aTBLKonw.cjs.map → stage-9zaZLwpP.cjs.map} +1 -1
  151. package/dist/target/public.cjs +1 -1
  152. package/dist/target/public.mjs +1 -1
  153. package/dist/{terminal-DPf137EJ.cjs → terminal-BrPWJ-AN.cjs} +2 -2
  154. package/dist/{terminal-DPf137EJ.cjs.map → terminal-BrPWJ-AN.cjs.map} +1 -1
  155. package/dist/{terminal-Bk4PjXWY.mjs → terminal-Ci8NTLD0.mjs} +2 -2
  156. package/dist/{terminal-Bk4PjXWY.mjs.map → terminal-Ci8NTLD0.mjs.map} +1 -1
  157. package/package.json +16 -16
  158. package/dist/compose-AO8u4mBI.cjs.map +0 -1
  159. package/dist/compose-C23RpAaF.mjs.map +0 -1
@@ -1,18 +1,19 @@
1
1
  import { t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mjs";
2
2
  import { t as GkmError } from "./errors-C9uIyIDt.mjs";
3
- import { M as toEmbeddableSecrets, Y as imageRef, at as runOutput, d as createComposeState, et as stageTag, h as recordRelease, it as run, k as initStageSecrets, n as findRootDomain, r as normalizeDnsConfig } from "./dns-BAM8VH1v.mjs";
3
+ import { M as toEmbeddableSecrets, Y as imageRef, at as runOutput, d as createComposeState, et as stageTag, h as recordRelease, it as run, k as initStageSecrets, n as findRootDomain, r as normalizeDnsConfig } from "./dns-Clnn8_Da.mjs";
4
4
  import { B as LOGS_PORT, Dt as ComposeTlsFileMissing, Ft as SERVER_IPV4_KEY, L as resolveStageTelemetry, Rt as isReservedStageKey } from "./workspace-DJjhfAGf.mjs";
5
- import { A as imageLayout, K as nextPrerenderManifest, L as findBuildRoot, St as envFor, Tt as stageEnv, at as BACKUPS_SERVICE, b as bucketClient, ct as backupsRoleStatements, d as backendsOf, dt as applyBuckets, f as constructGlobs, ft as applyLifecycles, ht as applyPostgres, k as fromBuildRoot, l as workerEnvKeys, mt as applyPolicies, pt as applyNotifications, t as appEnvKeys, v as LEGACY_LOCAL_LOGIN, x as pgClient, y as ensurePostgresLogin, yt as postgresStatements } from "./apps-D0LULFmU.mjs";
5
+ import { A as imageLayout, K as nextPrerenderManifest, L as findBuildRoot, St as envFor, Tt as stageEnv, at as BACKUPS_SERVICE, b as bucketClient, ct as backupsRoleStatements, d as backendsOf, dt as applyBuckets, f as constructGlobs, ft as applyLifecycles, ht as applyPostgres, k as fromBuildRoot, l as workerEnvKeys, mt as applyPolicies, pt as applyNotifications, t as appEnvKeys, v as LEGACY_LOCAL_LOGIN, x as pgClient, y as ensurePostgresLogin, yt as postgresStatements } from "./apps-BlwS8CjS.mjs";
6
6
  import { t as defineTarget } from "./define-BfrNaY82.mjs";
7
- import { E as withRedisPassword, R as usesTelemetry, _t as LogsPortTaken, gt as LOGS_SERVICE, m as loadLocalCredentials, ut as primaryPortKey, vt as logsAccess, w as runsRedis, wt as withLogsLogin, x as REDIS_SERVICE, y as withGeneratedSecrets } from "./compose-DtfoUChm.mjs";
7
+ import { E as withRedisPassword, R as usesTelemetry, _t as LogsPortTaken, gt as LOGS_SERVICE, m as loadLocalCredentials, ut as primaryPortKey, vt as logsAccess, w as runsRedis, wt as withLogsLogin, x as REDIS_SERVICE, y as withGeneratedSecrets } from "./compose-afWlhnJ2.mjs";
8
8
  import { o as installedFrom } from "./drivers-BQRb3KsL.mjs";
9
9
  import { i as discover } from "./discover-Dfmn6HQ7.mjs";
10
- import { a as composeProject, d as stackDir, i as LOOPBACK_SERVICES, l as envFile, m as withLogsPort, n as LOGS_PORT_ENV, o as composeStack, p as withCaddyConfigs, r as LOG_ROTATION, t as EDGE_PORT_ENV, u as replicaNames } from "./stack-CyoRqyPt.mjs";
11
- import { a as ensureDockerignore } from "./docker-DQoE3Fr7.mjs";
12
- import { a as provisionedTopics, c as subscriptionResource, f as isLocalHost, g as serverAddressHint, h as requiredServerAddress, i as confirmPendingSubscriptions, l as topicConnection, n as SUBSCRIPTION_TYPE, o as recordedPushSubscriptions, s as subscriptionKey, t as PushSubscriptionsUnconfirmed, u as HostNotPointingAtServer, v as stackHosts, x as systemLookup, y as stageDns } from "./snsSubscriptions-n3sjbrRM.mjs";
10
+ import { a as composeProject, d as stackDir, i as LOOPBACK_SERVICES, l as envFile, m as withLogsPort, n as LOGS_PORT_ENV, o as composeStack, p as withCaddyConfigs, r as LOG_ROTATION, t as EDGE_PORT_ENV, u as replicaNames } from "./stack-B8_fOPGr.mjs";
11
+ import { a as ensureDockerignore } from "./docker-8jRkfK5W.mjs";
12
+ import { a as provisionedTopics, c as subscriptionResource, f as isLocalHost, g as serverAddressHint, h as requiredServerAddress, i as confirmPendingSubscriptions, l as topicConnection, n as SUBSCRIPTION_TYPE, o as recordedPushSubscriptions, s as subscriptionKey, t as PushSubscriptionsUnconfirmed, u as HostNotPointingAtServer, v as stackHosts, x as systemLookup, y as stageDns } from "./snsSubscriptions-DO3vC1GH.mjs";
13
13
  import { d as dnsResources, f as forgetDnsResource, i as currentActor, n as reportDatabaseRuns, p as recordDnsChanges, r as reportPlannedSeeds, s as DeployJournal, t as DeploySeedsFailed, u as dnsResourceKey } from "./seeds-Ccn0Ru2T.mjs";
14
14
  import { f as plannedSeeds, o as SeedFailed, p as seedDatabases, u as migrateDatabases } from "./databases-CV22HzrI.mjs";
15
15
  import { dirname, join, relative } from "node:path";
16
+ import { composeLiteral } from "@geekmidas/edge";
16
17
  import { existsSync } from "node:fs";
17
18
  import { chmod, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
18
19
  import { hostname, userInfo } from "node:os";
@@ -431,6 +432,33 @@ const dockerCompose = {
431
432
  });
432
433
  if (started.code !== 0) throw new ContainersNotStarted(ids, started.stderr);
433
434
  },
435
+ async remove(engine, project, service) {
436
+ const env = engineEnv(engine);
437
+ const options = env ? { env } : {};
438
+ const listed = await capture("docker", [
439
+ "ps",
440
+ "--all",
441
+ "--filter",
442
+ `label=com.docker.compose.project=${project}`,
443
+ "--filter",
444
+ `label=com.docker.compose.service=${service}`,
445
+ "--format",
446
+ "{{.ID}}"
447
+ ], options);
448
+ if (listed.code !== 0) throw new DockerUnreachable(engine.host ?? "this machine", listed.stderr);
449
+ const ids = listed.stdout.split("\n").filter(Boolean);
450
+ if (ids.length === 0) return [];
451
+ const removed = await capture("docker", [
452
+ "rm",
453
+ "--force",
454
+ ...ids
455
+ ], {
456
+ ...options,
457
+ timeoutMs: 12e4
458
+ });
459
+ if (removed.code !== 0) throw new ContainersNotRemoved(project, service, ids, removed.stderr);
460
+ return ids;
461
+ },
434
462
  runOnce(engine, options) {
435
463
  return dockerExit([
436
464
  "run",
@@ -517,6 +545,21 @@ var ContainersNotStarted = class extends GkmError {
517
545
  this.name = "ContainersNotStarted";
518
546
  }
519
547
  };
548
+ /** `docker rm` failed for a service's containers. */
549
+ var ContainersNotRemoved = class extends GkmError {
550
+ project;
551
+ service;
552
+ ids;
553
+ output;
554
+ constructor(project, service, ids, output) {
555
+ 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.`);
556
+ this.project = project;
557
+ this.service = service;
558
+ this.ids = ids;
559
+ this.output = output;
560
+ this.name = "ContainersNotRemoved";
561
+ }
562
+ };
520
563
  /** `docker network create` failed. */
521
564
  var NetworkCreateFailed = class extends GkmError {
522
565
  network;
@@ -760,10 +803,11 @@ var EdgeWriteFailed = class extends GkmError {
760
803
  /**
761
804
  * Something other than the proxy a stack is set to holds the edge's ports.
762
805
  *
763
- * With `proxy: 'traefik'`, the stack's own Caddy — still running from before
764
- * the switch — or any other container; with `proxy: 'caddy'`, the shared
765
- * edge, or another stack's Caddy. Refused before anything is started, so the
766
- * stack is never left half on one proxy and half on the other.
806
+ * With `proxy: 'traefik'`, any container but the shared edge and the stack's
807
+ * own Caddy, which the deploy moves (see {@link assertEdgePorts}); with
808
+ * `proxy: 'caddy'`, the shared edge, or another stack's Caddy. Refused before
809
+ * anything is started, so the stack is never left half on one proxy and half
810
+ * on the other.
767
811
  */
768
812
  var ComposeProxyClash = class extends GkmError {
769
813
  project;
@@ -772,7 +816,7 @@ var ComposeProxyClash = class extends GkmError {
772
816
  holder;
773
817
  constructor(project, proxy, port, holder) {
774
818
  const by = holder.project ? `${holder.container} (compose project ${holder.project})` : holder.container;
775
- const fix = proxy === "traefik" ? holder.project === project && holder.service === "caddy" ? `That is this stack's own Caddy, from before it was switched to proxy: 'traefik'. Move it once: stop it (docker compose -p ${project} stop caddy), then run gkm compose again — the shared edge takes 80/443 and the stack registers with it.` : `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 === 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 ${EDGE_PROJECT} down).` : `Stop ${holder.container}, or publish this stack's Caddy elsewhere with GKM_COMPOSE_HTTPS_PORT/GKM_COMPOSE_HTTP_PORT.`;
819
+ 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 === 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 ${EDGE_PROJECT} down).` : `Stop ${holder.container}, or publish this stack's Caddy elsewhere with GKM_COMPOSE_HTTPS_PORT/GKM_COMPOSE_HTTP_PORT.`;
776
820
  super(`${project} is set to proxy: '${proxy}', and port ${port} is held by ${by}. ${fix}`);
777
821
  this.project = project;
778
822
  this.proxy = proxy;
@@ -784,10 +828,25 @@ var ComposeProxyClash = class extends GkmError {
784
828
  /**
785
829
  * Refuse a stack whose edge ports are held by anything but its own proxy:
786
830
  * the shared edge for `'traefik'`, the stack's own Caddy for `'caddy'`.
831
+ *
832
+ * One holder is not refused: with `'traefik'`, the stack's own Caddy, still
833
+ * running from before the stage was switched. It is this stack's to move and
834
+ * no other's, so it is returned for the deploy to remove just before the edge
835
+ * takes the ports — the moment's downtime the switch costs. Undefined when
836
+ * there is nothing to move.
787
837
  */
788
838
  async function assertEdgePorts(docker, options) {
789
839
  const { project, proxy, ports } = options;
790
- for (const port of [ports.https, ports.http]) for (const holder of await docker.publishers(options.engine, port)) if (!(proxy === "traefik" ? holder.project === EDGE_PROJECT : holder.project === project && holder.service === "caddy")) throw new ComposeProxyClash(project, proxy, port, holder);
840
+ const ownCaddy = (holder) => holder.project === project && holder.service === "caddy";
841
+ let move;
842
+ for (const port of [ports.https, ports.http]) for (const holder of await docker.publishers(options.engine, port)) {
843
+ if (proxy === "traefik" && ownCaddy(holder)) {
844
+ move = holder;
845
+ continue;
846
+ }
847
+ if (!(proxy === "traefik" ? holder.project === EDGE_PROJECT : ownCaddy(holder))) throw new ComposeProxyClash(project, proxy, port, holder);
848
+ }
849
+ return move;
791
850
  }
792
851
  /**
793
852
  * Write a file into the edge's running container whole or not at all: a
@@ -2424,7 +2483,7 @@ async function provisionCompose(ctx, run, deps) {
2424
2483
  ctx.logger.info(`🔑 Generated for "${ctx.stage}" (${ctx.secrets.store}): ${run.generated.join(", ")}`);
2425
2484
  }
2426
2485
  const ports = edgePorts(deps.env);
2427
- await assertEdgePorts(deps.docker, {
2486
+ const ownCaddy = await assertEdgePorts(deps.docker, {
2428
2487
  project: run.stack.project,
2429
2488
  proxy: run.stack.proxy,
2430
2489
  ports,
@@ -2435,6 +2494,10 @@ async function provisionCompose(ctx, run, deps) {
2435
2494
  run.files = await writeStack(ctx.cwd, run.dir, stack);
2436
2495
  printPlan(ctx, run);
2437
2496
  if (stack.proxy === "traefik") {
2497
+ if (ownCaddy) {
2498
+ 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.`);
2499
+ await deps.docker.remove(ref, stack.project, "caddy");
2500
+ }
2438
2501
  ctx.logger.info(`\n🌐 Starting the shared edge (${EDGE_PROJECT})…`);
2439
2502
  run.files.push(...await ensureEdge(deps.docker, {
2440
2503
  file: edgeFile(run),
@@ -3288,11 +3351,24 @@ function composeYaml(stack, compose) {
3288
3351
  #
3289
3352
  # gkm compose${stage} start or update it
3290
3353
  # gkm compose${stage} --down stop it
3291
- ${stringify(compose, {
3354
+ ${stringify(composeLiterals(compose), {
3292
3355
  lineWidth: 0,
3293
3356
  aliasDuplicateObjects: false
3294
3357
  })}`;
3295
3358
  }
3359
+ /**
3360
+ * The stack with each inline config's content escaped for compose, which
3361
+ * would otherwise read every `$` in it — a bcrypt hash's in the Caddyfile — as
3362
+ * a variable. Done here, where the file is written, so no inline file escapes
3363
+ * it: the stack itself holds each file as the container is to read it.
3364
+ */
3365
+ function composeLiterals(compose) {
3366
+ if (!compose.configs) return compose;
3367
+ return {
3368
+ ...compose,
3369
+ configs: Object.fromEntries(Object.entries(compose.configs).map(([name, { content }]) => [name, { content: composeLiteral(content) }]))
3370
+ };
3371
+ }
3296
3372
  function printPlan(ctx, run) {
3297
3373
  const { stack, mode, files } = run;
3298
3374
  ctx.logger.info(`\n🧱 ${stack.project} — stage ${stack.stage}`);
@@ -3386,4 +3462,4 @@ function composeTarget(options = {}) {
3386
3462
  //#endregion
3387
3463
  export { ContainersNotStopped as _, edgePorts as a, parseDigests as c, removeEdgeRoutes as d, composeServer as f, ContainersNotStarted as g, sshTarget as h, ComposePushNeedsBuild as i, pinnedRef as l, sshAccess as m, compose_exports as n, stackOverrideFile as o, dockerHost as p, ComposePinNeedsPull as r, deployedStackSecrets as s, composeTarget as t, edgeRef as u, dockerCompose as v, projectNetwork as y };
3388
3464
 
3389
- //# sourceMappingURL=compose-C23RpAaF.mjs.map
3465
+ //# sourceMappingURL=compose-TWiIQaA5.mjs.map