perf(stack): reuse postgres image for storage helper

packages/stack/src/Artifacts.ts

@@ -72,12 +72,12 @@ const definitions: Readonly<Record<ServiceKind, ArtifactDefinition>> = {
   database: definition(
     "postgres",
     "17.6.1.173",
-    "ghcr.io/supabase/cli/postgres:17.6.1.173@sha256:1581c433d71a48a81e356a3ed2d4aa5ecfc8fc0465ea98661da7a88023317dcf",
+    "ghcr.io/supabase/cli/postgres:17.6.1.173@sha256:9d6e542382946cad5eb1f11f1c8108a51297902ee42fe5098358816d3784ba5a",
     "bin/supabase-postgres-start",
     ["bin/supabase-postgres-start", "bin/pg_dump", "bin/pg_dumpall", "bin/pg_prove", "bin/psql"],
     {
       "15.14.1.173":
-        "ghcr.io/supabase/cli/postgres:15.14.1.173@sha256:b7d210fa3bca26568fa20448e3bec092bd4f8da6a5af5029597639d38e7d896e",
+        "ghcr.io/supabase/cli/postgres:15.14.1.173@sha256:3abb20e89700d6211e741148b85c3a052bb290cae3b4f751311442f4a5fe2324",
     },
   ),
   rest: definition("postgrest", "v16.2", "ghcr.io/supabase/cli/postgrest:v16.2", "bin/postgrest"),

packages/stack/src/runtime/Container.ts

@@ -65,6 +65,7 @@ export class ContainerLaunchError extends Data.TaggedError("ContainerLaunchError
 
 export interface ContainerRuntime {
   readonly prepare: (image: string) => Effect.Effect<void, ContainerError>;
+  readonly prepareImage: (image: string) => Effect.Effect<string, ContainerError>;
   readonly launch: (
     spec: ContainerSpec,
   ) => Effect.Effect<ContainerProcess, ContainerError | ContainerLaunchError, Scope.Scope>;
@@ -169,34 +170,42 @@ export const makeContainerRuntime = (options: {
       image: string,
       mirrors: ReadonlyArray<string>,
       primaryError: ContainerError,
-    ): Effect.Effect<void, ContainerError> => {
+    ): Effect.Effect<string, ContainerError> => {
       const [mirror, ...rest] = mirrors;
       if (mirror === undefined) return Effect.fail(primaryError);
       return Effect.gen(function* () {
         if (!(yield* present(mirror))) yield* pull(mirror);
         yield* Ref.update(mirrored, (map) => new Map(map).set(image, mirror));
+        return mirror;
       }).pipe(
         Effect.tap(() => Effect.logInfo(`Pulled image from mirror ${mirror}`)),
         Effect.tapError((cause) => Effect.logWarning(`Image mirror ${mirror} failed`, cause)),
         Effect.catch(() => fromMirror(image, rest, primaryError)),
       );
     };
 
-    const prepare = Effect.fn("Container.prepare")(function* (image: string) {
+    const prepareImage = Effect.fn("Container.prepareImage")(function* (image: string) {
       // A mirror chosen earlier may have been pruned since; launches follow the primary again.
       const usePrimary = Ref.update(mirrored, (map) => {
         if (!map.has(image)) return map;
         const next = new Map(map);
         next.delete(image);
         return next;
       });
-      if (yield* present(image)) return yield* usePrimary;
+      if (yield* present(image)) {
+        yield* usePrimary;
+        return image;
+      }
       const mirrors = options.imageMirrors?.(image) ?? [];
-      yield* pull(image).pipe(
-        Effect.andThen(usePrimary),
+      return yield* pull(image).pipe(
+        Effect.as(image),
+        Effect.tap(() => usePrimary),
         Effect.catch((primaryError) => fromMirror(image, mirrors, primaryError)),
       );
     });
+    const prepare = Effect.fn("Container.prepare")((image: string) =>
+      prepareImage(image).pipe(Effect.asVoid),
+    );
 
     const launch = Effect.fn("Container.launch")(function* (
       spec: ContainerSpec,
@@ -422,5 +431,5 @@ export const makeContainerRuntime = (options: {
         }),
       );
     });
-    return { prepare, launch, launchTool: (spec) => launch(spec, true) };
+    return { prepare, prepareImage, launch, launchTool: (spec) => launch(spec, true) };
   });