@alchemy.run/docker 2.0.0-beta.85 → 2.0.0-beta.86

package/src/Container.ts

@@ -235,9 +235,24 @@ export interface Container extends Resource<
     devices?: Container.DeviceMapping[];
   },
   never,
-  Providers
+  Providers,
+  ContainerLookup
 > {}
 
+/**
+ * Props for {@link Container.lookup}: find a container this stack
+ * doesn't manage by its name.
+ */
+export interface ContainerLookup {
+  /** Container name. */
+  name: string;
+  /**
+   * Docker context the engine is reached through.
+   * @default the current context
+   */
+  context?: string;
+}
+
 /**
  * A Docker container managed through the active Docker context.
  *
@@ -436,6 +451,16 @@ export interface Container extends Resource<
  * });
  * ```
  *
+ * ### Looking up an existing container
+ * `Container.lookup` references a container Alchemy doesn't manage (created with
+ * the Docker CLI, Compose or another stack). It is read during plan/deploy,
+ * never created, updated or removed.
+ *
+ * **Example:** Reference an existing container
+ * ```typescript
+ * const db = Docker.Container.lookup({ name: "postgres" });
+ * ```
+ *
  * @resource
  * @product Container
  */
@@ -562,6 +587,11 @@ export const ContainerProvider = () =>
 
       return Container.Provider.of({
         list: () => Effect.succeed([]),
+        lookup: Effect.fn(function* ({ name, context }) {
+          const info = yield* inspect(name, context);
+          return info ? toContainerAttributes(info, info.Config.Image) : undefined;
+        }),
+
         read: Effect.fn(function* ({ id, instanceId, olds, output }) {
           const context = dockerContextName(olds.context);
           const name = yield* dockerPhysicalName(id, olds, instanceId);

package/src/Context.ts

@@ -41,9 +41,19 @@ export interface Context extends Resource<
     docker?: string;
   },
   never,
-  Providers
+  Providers,
+  ContextLookup
 > {}
 
+/**
+ * Props for {@link Context.lookup}: find a Docker context this
+ * stack doesn't manage by its name.
+ */
+export interface ContextLookup {
+  /** Context name. */
+  name: string;
+}
+
 /**
  * A named Docker CLI context — a pointer to a Docker engine (local socket,
  * SSH host, or TCP endpoint) that other Docker resources deploy through.
@@ -89,6 +99,17 @@ export interface Context extends Resource<
  * });
  * ```
  *
+ * ### Looking up an existing context
+ * `Context.lookup` references a context Alchemy doesn't manage (created with
+ * the Docker CLI, Compose or another stack). It is read during plan/deploy,
+ * never created, updated or removed.
+ *
+ * **Example:** Deploy to an existing context
+ * ```typescript
+ * const remote = Docker.Context.lookup({ name: "prod-host" });
+ * const api = yield* Docker.Container("Api", { image: "nginx:alpine", context: remote });
+ * ```
+ *
  * @resource
  * @product Context
  */
@@ -107,6 +128,11 @@ export const ContextProvider = () =>
 
       return Context.Provider.of({
         list: () => Effect.succeed([]),
+        lookup: Effect.fn(function* ({ name }) {
+          const live = yield* inspect(name);
+          return live ? toContextAttributes(live) : undefined;
+        }),
+
         read: Effect.fn(function* ({ id, instanceId, olds, output }) {
           const name = yield* dockerPhysicalName(id, olds, instanceId);
           const live = yield* inspect(name);

package/src/Docker.ts

@@ -271,7 +271,26 @@ export class Docker extends Context.Service<
       readonly create: (options: {
         name: string;
         driver: string;
+        /** Whether the network is isolated from external connectivity. */
+        internal?: boolean;
+        /** Whether standalone containers may attach to the network. */
+        attachable?: boolean;
+        /** Explicitly enable or disable IPv4 address allocation. */
+        ipv4?: boolean;
         ipv6?: boolean;
+        /** Network driver options, passed as repeated `--opt` arguments. */
+        opt?: Record<string, string>;
+        /** Network IP Address Management settings. */
+        ipam?: {
+          driver?: string;
+          options?: Record<string, string>;
+          config?: Array<{
+            subnet: string;
+            gateway?: string;
+            ipRange?: string;
+            auxAddresses?: Record<string, string>;
+          }>;
+        };
         label?: Record<string, string>;
         context?: string;
       }) => Effect.Effect<CommandOutput, PlatformError>;
@@ -555,7 +574,21 @@ export declare namespace Docker {
     Created: string;
     Scope: string;
     Driver: string;
+    Internal?: boolean;
+    Attachable?: boolean;
+    EnableIPv4?: boolean;
     EnableIPv6: boolean;
+    Options?: Record<string, string> | null;
+    IPAM?: {
+      Driver?: string;
+      Options?: Record<string, string> | null;
+      Config?: Array<{
+        Subnet: string;
+        Gateway?: string;
+        IPRange?: string;
+        AuxiliaryAddresses?: Record<string, string> | null;
+      }> | null;
+    };
     Labels: Record<string, string> | null;
   }
 }
@@ -1000,13 +1033,34 @@ const makeDocker = (options: DockerOptions) =>
         remove: (name, force) => run(["context", "rm", ...(force ? ["-f"] : []), name]),
       },
       network: {
-        create: ({ name, driver, ipv6, label, context }) =>
+        create: ({ name, driver, internal, attachable, ipv4, ipv6, opt, ipam, label, context }) =>
           run([
             ...formatArgs({ context }),
             "network",
             "create",
+            ...formatArgs({
+              driver,
+              internal,
+              attachable,
+              ipv6,
+              opt,
+              "ipam-driver": ipam?.driver,
+              "ipam-opt": ipam?.options,
+              label,
+            }),
+            // Docker's boolean --ipv4=false needs an equals sign; the generic
+            // CLI formatter intentionally skips false values elsewhere.
+            ...(ipv4 === undefined ? [] : [`--ipv4=` + String(ipv4)]),
+            ...(ipam?.config ?? []).flatMap(({ subnet, gateway, ipRange, auxAddresses }) => [
+              "--subnet",
+              subnet,
+              ...(gateway === undefined ? [] : ["--gateway", gateway]),
+              ...(ipRange === undefined ? [] : ["--ip-range", ipRange]),
+              ...Object.entries(auxAddresses ?? {})
+                .sort(([a], [b]) => a.localeCompare(b))
+                .flatMap(([key, value]) => ["--aux-address", key + "=" + value]),
+            ]),
             name,
-            ...formatArgs({ driver, ipv6, label }),
           ]),
         connect: ({ network, container, alias, context }) =>
           run([

package/src/Dockerfile.ts

@@ -20,7 +20,6 @@
  * const worker = yield* AWS.ECS.Task(
  *   "Transcoder",
  *   {
- *     cluster,
  *     main: import.meta.url,
  *     dockerfile: Dockerfile.inline`
  *       FROM oven/bun:1
@@ -38,7 +37,6 @@
  * const trainer = yield* AWS.ECS.Task(
  *   "Trainer",
  *   {
- *     cluster,
  *     main: import.meta.url,
  *     dockerfile: Dockerfile.inline`
  *       FROM ${base.imageUri}