@wtfalch/foundry 0.36.0 → 0.36.1

package/dist/bootstrap/versions.d.ts

@@ -34,10 +34,16 @@ export declare const DIGESTS: PinnedVersions;
  */
 export declare function pinnedRef(key: keyof PinnedVersions): string;
 /**
- * A declared tag that equals the pinned one gets its digest; any other
- * declared tag (an override) is passed through unchanged.
+ * The two image fields Coolify accepts. Its tag rule has no `@` or `:`, so a
+ * digest goes in the name as `<image>@sha256` and the tag holds the bare
+ * 64-hex digest (Coolify pulls `<name>:<tag>`). A declared tag that equals the
+ * pinned one gets its digest; any other declared tag (an override) is passed
+ * through unchanged.
  */
-export declare function pinnedTagFor(key: keyof PinnedVersions, tag: string): string;
+export declare function coolifyImageFor(key: keyof PinnedVersions, image: string, tag: string): {
+    docker_registry_image_name: string;
+    docker_registry_image_tag: string;
+};
 /**
  * Why an image tag cannot be used, or `null`. #248: generalised out of what
  * was `platform-providers.ts`'s `mailImageTagBlocked`, the one guard

package/dist/bootstrap/versions.js

@@ -41,11 +41,20 @@ export function pinnedRef(key) {
     return `${VERSIONS[key]}@${DIGESTS[key]}`;
 }
 /**
- * A declared tag that equals the pinned one gets its digest; any other
- * declared tag (an override) is passed through unchanged.
+ * The two image fields Coolify accepts. Its tag rule has no `@` or `:`, so a
+ * digest goes in the name as `<image>@sha256` and the tag holds the bare
+ * 64-hex digest (Coolify pulls `<name>:<tag>`). A declared tag that equals the
+ * pinned one gets its digest; any other declared tag (an override) is passed
+ * through unchanged.
  */
-export function pinnedTagFor(key, tag) {
-    return tag === VERSIONS[key] ? pinnedRef(key) : tag;
+export function coolifyImageFor(key, image, tag) {
+    if (tag !== VERSIONS[key]) {
+        return { docker_registry_image_name: image, docker_registry_image_tag: tag };
+    }
+    return {
+        docker_registry_image_name: `${image}@sha256`,
+        docker_registry_image_tag: DIGESTS[key].replace(/^sha256:/, ''),
+    };
 }
 /**
  * Tag spellings that resolve to whatever the registry currently has, not a

package/dist/plan/executor.js

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { randomBytes, randomUUID } from 'node:crypto';
 import { URL } from 'node:url';
-import { pinnedTagFor } from '../bootstrap/versions.js';
+import { coolifyImageFor } from '../bootstrap/versions.js';
 import { redactSecrets } from '../calls-sfu-deploy-support.js';
 import { resolveCallsSfuUrls } from '../calls-sfu.js';
 import { APP_ENTRY_KEY, appEntry, filesCollectionEnvName, ownerMailboxRecorded, ownerMailboxes, ownsServices, sharedSecretRef, } from '../org.js';
@@ -3870,8 +3870,7 @@ export class FoundryStepExecutor {
             server_uuid: server.uuid,
             environment_name: environment.name,
             environment_uuid: environment.uuid,
-            docker_registry_image_name: SYNAPSE_IMAGE,
-            docker_registry_image_tag: pinnedTagFor('synapse', synapseTag),
+            ...coolifyImageFor('synapse', SYNAPSE_IMAGE, synapseTag),
             ports_exposes: '8008',
             name: names.synapse,
             description: `Synapse for ${org.slug}'s calls stack (${SYNAPSE_IMAGE}:${synapseTag})`,

package/dist/plan/own-sfu.js

@@ -1,4 +1,4 @@
-import { pinnedTagFor } from '../bootstrap/versions.js';
+import { coolifyImageFor } from '../bootstrap/versions.js';
 import { mintLivekitCredentials } from '../calls-sfu-keys.js';
 import { LIVEKIT_SIGNALLING_PORT, sfuSlotPorts } from '../calls-sfu.js';
 import { ensureCloudflaredConnector } from './cloudflared-connector.js';
@@ -105,8 +105,7 @@ export async function provisionSfuApp(scope, deps, target, input) {
             server_uuid: server.uuid,
             environment_name: environment.name,
             environment_uuid: environment.uuid,
-            docker_registry_image_name: OWN_SFU_IMAGE,
-            docker_registry_image_tag: pinnedTagFor('livekit', input.version),
+            ...coolifyImageFor('livekit', OWN_SFU_IMAGE, input.version),
             ports_exposes: String(LIVEKIT_SIGNALLING_PORT),
             ports_mappings: sfuPortsMappings(input.slot),
             name: target.names.sfuApp,
@@ -122,7 +121,7 @@ export async function provisionSfuApp(scope, deps, target, input) {
     // Set on every run: a declared version or slot reaches an existing app here.
     await coolify.updateApplication(appId, {
         custom_internal_name: target.internal.sfu,
-        docker_registry_image_tag: pinnedTagFor('livekit', input.version),
+        ...coolifyImageFor('livekit', OWN_SFU_IMAGE, input.version),
         ports_exposes: String(LIVEKIT_SIGNALLING_PORT),
         ports_mappings: sfuPortsMappings(input.slot),
         ...healthCheckSettings('/', LIVEKIT_SIGNALLING_PORT),

package/dist/plan/platform-providers.js

@@ -1,7 +1,7 @@
 import { createHash, createPrivateKey, generateKeyPairSync, randomBytes, randomUUID, sign, } from 'node:crypto';
 import { isIPv4 } from 'node:net';
 import { applyObjects, openInstance, platformMailSettingsObjects } from '@wtfalch/email/postmaster';
-import { VERSIONS, floatingTagBlocked, pinnedRef, pinnedTagFor } from '../bootstrap/versions.js';
+import { VERSIONS, coolifyImageFor, floatingTagBlocked, pinnedRef } from '../bootstrap/versions.js';
 import { redactSecrets } from '../calls-sfu-deploy-support.js';
 import { ownerMailboxes } from '../org.js';
 import { BOULE_BRIDGE_SECRET_ENV, BOULE_PEER_PASSWORD_ENV, BOULE_PEER_ROLE, bouleHostnameFor, } from './boule.js';
@@ -2539,8 +2539,7 @@ export async function provisionMailServer(scope, deps, target, input) {
             server_uuid: server.uuid,
             environment_name: environment.name,
             environment_uuid: environment.uuid,
-            docker_registry_image_name: STALWART_IMAGE,
-            docker_registry_image_tag: pinnedTagFor('stalwart', imageTag),
+            ...coolifyImageFor('stalwart', STALWART_IMAGE, imageTag),
             ports_exposes: STALWART_PORTS_EXPOSES,
             ...(hostPorts ? { ports_mappings: hostPorts } : {}),
             name: target.names.mailApp,
@@ -2560,7 +2559,7 @@ export async function provisionMailServer(scope, deps, target, input) {
     // `'ready'` probe below. Stalwart's own readiness route and HTTP port.
     await deps.coolify.updateApplication(appId, {
         custom_internal_name: target.internal.mail,
-        docker_registry_image_tag: pinnedTagFor('stalwart', imageTag),
+        ...coolifyImageFor('stalwart', STALWART_IMAGE, imageTag),
         ...healthCheckSettings(STALWART_READY_PATH, Number(STALWART_HTTP_PORT)),
         // Only a platform that uses the shared relay, or one that did, changes a published port.
         ...(portsChanged ? { ports_mappings: hostPorts } : {}),
@@ -7263,8 +7262,7 @@ async function provisionPlatformHc(context, deps) {
             server_uuid: server.uuid,
             environment_name: environment.name,
             environment_uuid: environment.uuid,
-            docker_registry_image_name: HC_IMAGE,
-            docker_registry_image_tag: pinnedTagFor('hc', gitRef),
+            ...coolifyImageFor('hc', HC_IMAGE, gitRef),
             ports_exposes: HC_PORT,
             name: PLATFORM_HC_APP_NAME,
             description: `Healthchecks for the platform's own heartbeats (#540, ${HC_IMAGE}:${gitRef})`,
@@ -7277,7 +7275,7 @@ async function provisionPlatformHc(context, deps) {
     // own rule. The image tag too, so a declared release change reaches the app.
     await deps.coolify.updateApplication(appId, {
         custom_internal_name: HC_INTERNAL_NAME,
-        docker_registry_image_tag: pinnedTagFor('hc', gitRef),
+        ...coolifyImageFor('hc', HC_IMAGE, gitRef),
         ...healthCheckSettings(HC_HEALTH_CHECK_PATH, Number(HC_PORT)),
     });
     // ---- env, parsed off the database's own owner credentials -----------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wtfalch/foundry",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Foundry's SDK: the declared org's types, the plan and apply contracts, and the state store's interface.",
   "repository": {
     "type": "git",