sst 2.24.23 → 2.24.25

package/cli/commands/console.js

@@ -15,7 +15,6 @@ export const consoleCommand = async (program) => program.command("console", "Sta
         ]);
         clear();
         printHeader({ console: true, hint: "ready!" });
-        await exit();
     }
     catch (e) {
         await exitWithError(e);

package/constructs/Function.d.ts

@@ -566,6 +566,19 @@ export interface ContainerProps {
      * ```
      */
     file?: string;
+    /**
+     * Build args to pass to the docker build command.
+     * @default No build args
+     * @example
+     * ```js
+     * container: {
+     *   buildArgs: {
+     *     FOO: "bar"
+     *   }
+     * }
+     * ```
+     */
+    buildArgs?: Record<string, string>;
 }
 /**
  * Used to configure additional files to copy into the function bundle

package/constructs/Function.js

@@ -206,6 +206,9 @@ export class Function extends CDKFunction {
                             ...(props.container?.file
                                 ? { file: props.container.file }
                                 : {}),
+                            ...(props.container?.buildArgs
+                                ? { buildArgs: props.container.buildArgs }
+                                : {}),
                             exclude: [".sst"],
                             ignoreMode: IgnoreMode.GLOB,
                         }),

package/constructs/Job.d.ts

@@ -31,6 +31,19 @@ export interface JobContainerProps {
      * ```
      */
     file?: string;
+    /**
+     * Build args to pass to the docker build command.
+     * @default No build args
+     * @example
+     * ```js
+     * container: {
+     *   buildArgs: {
+     *     FOO: "bar"
+     *   }
+     * }
+     * ```
+     */
+    buildArgs?: Record<string, string>;
 }
 export interface JobProps {
     /**

package/constructs/Job.js

@@ -213,6 +213,7 @@ export class Job extends Construct {
                         ? Platform.custom("linux/arm64")
                         : Platform.custom("linux/amd64"),
                     file: container?.file,
+                    buildArgs: container?.buildArgs,
                     exclude: [".sst"],
                     ignoreMode: IgnoreMode.GLOB,
                 });

package/constructs/Service.d.ts

@@ -4,7 +4,7 @@ import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
-import { Cluster, ContainerDefinitionOptions } from "aws-cdk-lib/aws-ecs";
+import { Cluster, ContainerDefinitionOptions, CpuArchitecture, FargateServiceProps } from "aws-cdk-lib/aws-ecs";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { ApplicationTargetGroupProps } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 declare const supportedCpus: {
@@ -30,7 +30,18 @@ export interface ServiceProps {
      */
     file?: string;
     /**
-     * The amount of cpu allocated.
+     * The CPU architecture of the container.
+     * @default "x86_64"
+     * @example
+     * ```js
+     * {
+     *   architecture: "arm64",
+     * }
+     * ```
+     */
+    architecture?: Lowercase<keyof Pick<typeof CpuArchitecture, "ARM64" | "X86_64">>;
+    /**
+     * The amount of CPU allocated.
      * @default "0.25 vCPU"
      * @example
      * ```js
@@ -215,6 +226,23 @@ export interface ServiceProps {
      * ```
      */
     waitForInvalidation?: boolean;
+    build?: {
+        /**
+         * Build args to pass to the docker build command.
+         * @default No build args
+         * @example
+         * ```js
+         * {
+         *   build: {
+         *     buildArgs: {
+         *       FOO: "bar"
+         *     }
+         *   }
+         * }
+         * ```
+         */
+        buildArgs?: Record<string, string>;
+    };
     dev?: {
         /**
          * When running `sst dev, site is not deployed. This is to ensure `sst dev` can start up quickly.
@@ -286,6 +314,20 @@ export interface ServiceProps {
          * ```
          */
         applicationLoadBalancerTargetGroup?: ApplicationTargetGroupProps;
+        /**
+         * Customize the Fargate Service.
+         * @example
+         * ```js
+         * {
+         *   cdk: {
+         *     fargateService: {
+         *       circuitBreaker: { rollback: true }
+         *     }
+         *   }
+         * }
+         * ```
+         */
+        fargateService?: Omit<FargateServiceProps, "cluster" | "taskDefinition">;
         /**
          * Customizing the container definition for the ECS task.
          * @example
@@ -294,14 +336,16 @@ export interface ServiceProps {
          *   cdk: {
          *     container: {
          *       healthCheck: {
-         *         command: ["CMD-SHELL", "curl -f http://localhost/ || exit 1"],
-         *       },
+         *         command: ["CMD-SHELL", "curl -f http://localhost/ || exit 1"]
+         *       }
          *     }
          *   }
          * }
          * ```
          */
-        container?: Omit<ContainerDefinitionOptions, "image">;
+        container?: Omit<ContainerDefinitionOptions, "image"> & {
+            image?: ContainerDefinitionOptions["image"];
+        };
         /**
          * Runs codebuild job in the specified VPC. Note this will only work once deployed.
          *
@@ -322,8 +366,9 @@ export interface ServiceProps {
     };
 }
 type ServiceNormalizedProps = ServiceProps & {
-    path: Exclude<ServiceProps["path"], undefined>;
+    architecture: Exclude<ServiceProps["architecture"], undefined>;
     cpu: Exclude<ServiceProps["cpu"], undefined>;
+    path: Exclude<ServiceProps["path"], undefined>;
     memory: Exclude<ServiceProps["memory"], undefined>;
     port: Exclude<ServiceProps["port"], undefined>;
     logRetention: Exclude<ServiceProps["logRetention"], undefined>;

package/constructs/Service.js

@@ -19,7 +19,7 @@ import { attachPermissionsToRole } from "./util/permission.js";
 import { bindEnvironment, bindPermissions, getParameterPath, getReferencedSecrets, } from "./util/functionBinding.js";
 import { useProject } from "../project.js";
 import { Vpc, } from "aws-cdk-lib/aws-ec2";
-import { AwsLogDriver, Cluster, FargateTaskDefinition, ContainerImage, FargateService, } from "aws-cdk-lib/aws-ecs";
+import { AwsLogDriver, Cluster, ContainerImage, CpuArchitecture, FargateService, FargateTaskDefinition, } from "aws-cdk-lib/aws-ecs";
 import { LogGroup, LogRetention, RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { ApplicationLoadBalancer, } from "aws-cdk-lib/aws-elasticloadbalancingv2";
@@ -153,6 +153,7 @@ export class Service extends Construct {
         this.id = id;
         this.props = {
             path: ".",
+            architecture: props?.architecture || "x86_64",
             cpu: props?.cpu || "0.25 vCPU",
             memory: props?.memory || "0.5 GB",
             port: props?.port || 3000,
@@ -188,16 +189,19 @@ export class Service extends Construct {
         this.attachPermissionsForService(props?.permissions || []);
         Object.entries(props?.environment || {}).map(([key, value]) => this.addEnvironmentForService(key, value));
         useDeferredTasks().add(async () => {
-            if (!app.isRunningSSTTest()) {
+            if (!app.isRunningSSTTest() && !props?.cdk?.container?.image) {
                 Colors.line(`➜  Building the container image for the "${this.node.id}" service...`);
                 // Build app
                 let dockerfile;
+                // case: custom Dockerfile provided
                 if (this.props.file) {
                     dockerfile = this.props.file;
                 }
+                // case: default Dockerfile found
                 else if (await existsAsync(path.join(this.props.path, "Dockerfile"))) {
                     dockerfile = "Dockerfile";
                 }
+                // case: nixpack
                 else {
                     await this.createNixpacksBuilder();
                     dockerfile = await this.runNixpacksBuild();
@@ -384,7 +388,7 @@ export class Service extends Construct {
             }));
     }
     createService(vpc) {
-        const { cpu, memory, port, logRetention, cdk } = this.props;
+        const { architecture, cpu, memory, port, logRetention, cdk } = this.props;
         const app = this.node.root;
         const clusterName = app.logicalPrefixedName(this.node.id);
         const logGroup = new LogRetention(this, "LogRetention", {
@@ -402,6 +406,11 @@ export class Service extends Construct {
             // @ts-ignore
             memoryLimitMiB: supportedMemories[cpu][memory],
             cpu: supportedCpus[cpu],
+            runtimePlatform: {
+                cpuArchitecture: architecture === "arm64"
+                    ? CpuArchitecture.ARM64
+                    : CpuArchitecture.X86_64,
+            },
         });
         const container = taskDefinition.addContainer("Container", {
             logging: new AwsLogDriver({
@@ -415,11 +424,14 @@ export class Service extends Construct {
                 SST_SSM_PREFIX: useProject().config.ssmPrefix,
             },
             ...cdk?.container,
-            image: { bind: () => ({ imageName: "placeholder" }) },
+            image: cdk?.container?.image ?? {
+                bind: () => ({ imageName: "placeholder" }),
+            },
         });
         const service = new FargateService(this, "Service", {
             cluster,
             taskDefinition,
+            ...cdk?.fargateService,
         });
         return { cluster, taskDefinition, container, service };
     }
@@ -595,13 +607,16 @@ export class Service extends Construct {
         return ".nixpacks/Dockerfile";
     }
     async runDockerBuild(dockerfile) {
+        const { path: servicePath, architecture, build } = this.props;
+        const platform = architecture === "arm64" ? "linux/arm64" : "linux/amd64";
         try {
             await execAsync([
                 "docker",
                 "build",
                 `-t sst-build:service-${this.node.id}`,
-                "--platform=linux/amd64",
-                `-f ${path.join(this.props.path, dockerfile)}`,
+                `--platform ${platform}`,
+                `-f ${path.join(servicePath, dockerfile)}`,
+                ...Object.entries(build?.buildArgs || {}).map(([k, v]) => `--build-arg ${k}=${v}`),
                 this.props.path,
             ].join(" "), {
                 env: {
@@ -615,9 +630,11 @@ export class Service extends Construct {
         }
     }
     updateContainerImage(dockerfile, taskDefinition, container) {
-        const image = ContainerImage.fromAsset(this.props.path, {
-            platform: Platform.LINUX_AMD64,
+        const { path: servicePath, architecture, build } = this.props;
+        const image = ContainerImage.fromAsset(servicePath, {
+            platform: architecture === "arm64" ? Platform.LINUX_ARM64 : Platform.LINUX_AMD64,
             file: dockerfile,
+            buildArgs: build?.buildArgs,
             exclude: [".sst"],
             ignoreMode: IgnoreMode.GLOB,
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.24.23",
+  "version": "2.24.25",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/container.js

@@ -58,6 +58,7 @@ export const useContainerHandler = Context.memo(async () => {
                         ...(input.props.container?.file
                             ? [`-f ${input.props.container.file}`]
                             : []),
+                        ...Object.entries(input.props.container?.buildArgs || {}).map(([k, v]) => `--build-arg ${k}=${v}`),
                         `.`,
                     ].join(" "), {
                         cwd: project,
@@ -84,6 +85,7 @@ export const useContainerHandler = Context.memo(async () => {
                         ...(input.props.container?.file
                             ? [`-f ${input.props.container.file}`]
                             : []),
+                        ...Object.entries(input.props.container?.buildArgs || {}).map(([k, v]) => `--build-arg ${k}=${v}`),
                         `--platform ${platform}`,
                         `.`,
                     ].join(" "), {