sst 2.22.7 → 2.22.9

package/constructs/EdgeFunction.d.ts

@@ -1,6 +1,6 @@
 import { Construct, IConstruct } from "constructs";
 import { Role } from "aws-cdk-lib/aws-iam";
-import { IVersion } from "aws-cdk-lib/aws-lambda";
+import { IVersion, IFunction as CdkIFunction } from "aws-cdk-lib/aws-lambda";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps } from "./Function.js";
 import { Size } from "./util/size.js";
@@ -21,7 +21,8 @@ export interface EdgeFunctionProps {
 export declare class EdgeFunction extends Construct {
     role: Role;
     functionArn: string;
-    private function;
+    function: CdkIFunction;
+    private functionCR;
     private assetReplacer;
     private assetReplacerPolicy;
     private scope;

package/constructs/EdgeFunction.js

@@ -24,6 +24,7 @@ export class EdgeFunction extends Construct {
     role;
     functionArn;
     function;
+    functionCR;
     assetReplacer;
     assetReplacerPolicy;
     scope;
@@ -57,7 +58,11 @@ export class EdgeFunction extends Construct {
         const { fn, fnArn } = this.createFunctionInUsEast1(assetBucket, assetKey, lambdaBucket);
         const { versionId } = this.createVersionInUsEast1(fn, fnArn);
         fn.node.addDependency(assetReplacer);
-        this.function = fn;
+        this.function = CdkFunction.fromFunctionAttributes(this.scope, "ICdkFunction", {
+            functionArn: fnArn,
+            role: this.role,
+        });
+        this.functionCR = fn;
         this.functionArn = fnArn;
         this.versionId = versionId;
         this.assetReplacer = assetReplacer;
@@ -343,7 +348,7 @@ export class EdgeFunction extends Construct {
         return { fn, fnArn: fn.getAttString("FunctionArn") };
     }
     updateFunctionInUsEast1(assetBucket, assetKey) {
-        const cfnLambda = this.function.node.defaultChild;
+        const cfnLambda = this.functionCR.node.defaultChild;
         cfnLambda.addPropertyOverride("FunctionParams.Code", {
             S3Bucket: assetBucket,
             S3Key: assetKey,

package/constructs/Function.d.ts

@@ -554,6 +554,16 @@ export interface ContainerProps {
      * ```
      */
     cmd?: string[];
+    /**
+     * Name of the Dockerfile.
+     * @example
+     * ```js
+     * container: {
+     *   file: "path/to/Dockerfile.prod"
+     * }
+     * ```
+     */
+    file?: string;
 }
 /**
  * Used to configure additional files to copy into the function bundle

package/constructs/Function.js

@@ -198,6 +198,9 @@ export class Function extends CDKFunction {
                                 ? { platform: Platform.custom(architecture.dockerPlatform) }
                                 : {}),
                             ...(props.container?.cmd ? { cmd: props.container.cmd } : {}),
+                            ...(props.container?.file
+                                ? { file: props.container.file }
+                                : {}),
                         }),
                         handler: CDKHandler.FROM_IMAGE,
                         runtime: CDKRuntime.FROM_IMAGE,

package/constructs/Job.d.ts

@@ -21,6 +21,16 @@ export interface JobContainerProps {
      * ```
      */
     cmd: string[];
+    /**
+     * Name of the Dockerfile.
+     * @example
+     * ```js
+     * container: {
+     *   file: "path/to/Dockerfile.prod"
+     * }
+     * ```
+     */
+    file?: string;
 }
 export interface JobProps {
     /**

package/constructs/Job.js

@@ -209,6 +209,7 @@ export class Job extends Construct {
                     platform: architecture === "arm_64"
                         ? Platform.custom("linux/arm64")
                         : Platform.custom("linux/amd64"),
+                    file: container?.file,
                 });
                 image.repository?.grantPull(this.job.role);
                 const project = this.job.node.defaultChild;

package/constructs/SsrSite.d.ts

@@ -273,7 +273,6 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected doNotDeploy: boolean;
     protected buildConfig: SsrBuildConfig;
     protected deferredTaskCallbacks: (() => void)[];
-    private serverLambdaCdkFunctionForEdge?;
     protected serverLambdaForEdge?: EdgeFunction;
     protected serverLambdaForRegional?: SsrFunction;
     private serverLambdaForDev?;
@@ -297,7 +296,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
      * The internally created CDK resources.
      */
     get cdk(): {
-        function: ICdkFunction | SsrFunction | undefined;
+        function: ICdkFunction | undefined;
         bucket: Bucket;
         distribution: Distribution;
         hostedZone: IHostedZone | undefined;

package/constructs/SsrSite.js

@@ -48,7 +48,6 @@ export class SsrSite extends Construct {
     doNotDeploy;
     buildConfig;
     deferredTaskCallbacks = [];
-    serverLambdaCdkFunctionForEdge;
     serverLambdaForEdge;
     serverLambdaForRegional;
     serverLambdaForDev;
@@ -89,10 +88,6 @@ export class SsrSite extends Construct {
         // Create Server functions
         if (this.props.edge) {
             this.serverLambdaForEdge = this.createFunctionForEdge();
-            this.serverLambdaCdkFunctionForEdge = CdkFunction.fromFunctionAttributes(this, "IEdgeFunction", {
-                functionArn: this.serverLambdaForEdge.functionArn,
-                role: this.serverLambdaForEdge.role,
-            });
         }
         else {
             this.serverLambdaForRegional = this.createFunctionForRegional();
@@ -168,7 +163,8 @@ export class SsrSite extends Construct {
         if (this.doNotDeploy)
             return;
         return {
-            function: this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional,
+            function: this.serverLambdaForEdge?.function ||
+                this.serverLambdaForRegional?.function,
             bucket: this.bucket,
             distribution: this.distribution,
             hostedZone: this.hostedZone,
@@ -188,7 +184,7 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
-        const server = this.serverLambdaCdkFunctionForEdge ||
+        const server = this.serverLambdaForEdge ||
             this.serverLambdaForRegional ||
             this.serverLambdaForDev;
         attachPermissionsToRole(server?.role, permissions);
@@ -206,7 +202,7 @@ export class SsrSite extends Construct {
                 edge: this.props.edge,
                 server: (this.serverLambdaForDev ||
                     this.serverLambdaForRegional ||
-                    this.serverLambdaCdkFunctionForEdge)?.functionArn,
+                    this.serverLambdaForEdge)?.functionArn,
                 secrets: (this.props.bind || [])
                     .filter((c) => c instanceof Secret)
                     .map((c) => c.name),
@@ -480,12 +476,12 @@ export class SsrSite extends Construct {
         return ssrFn;
     }
     grantServerS3Permissions() {
-        const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
+        const server = this.serverLambdaForEdge || this.serverLambdaForRegional;
         this.bucket.grantReadWrite(server.role);
     }
     grantServerCloudFrontPermissions() {
         const stack = Stack.of(this);
-        const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
+        const server = this.serverLambdaForEdge || this.serverLambdaForRegional;
         const policy = new Policy(this, "ServerFunctionInvalidatorPolicy", {
             statements: [
                 new PolicyStatement({

package/package.json

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

package/runtime/handlers/container.js

@@ -52,7 +52,14 @@ export const useContainerHandler = Context.memo(async () => {
             sources.set(input.functionID, project);
             if (input.mode === "start") {
                 try {
-                    const result = await execAsync(`docker build -t sst-dev:${input.functionID} .`, {
+                    const result = await execAsync([
+                        `docker build`,
+                        `-t sst-dev:${input.functionID}`,
+                        ...(input.props.container?.file
+                            ? [`-f ${input.props.container.file}`]
+                            : []),
+                        `.`,
+                    ].join(" "), {
                         cwd: project,
                         env: {
                             ...process.env,
@@ -74,6 +81,9 @@ export const useContainerHandler = Context.memo(async () => {
                     await execAsync([
                         `docker build`,
                         `-t sst-build:${input.functionID}`,
+                        ...(input.props.container?.file
+                            ? [`-f ${input.props.container.file}`]
+                            : []),
                         `--platform ${platform}`,
                         `.`,
                     ].join(" "), {

package/sst.mjs

@@ -4929,7 +4929,12 @@ var init_container = __esm({
           if (input.mode === "start") {
             try {
               const result = await execAsync(
-                `docker build -t sst-dev:${input.functionID} .`,
+                [
+                  `docker build`,
+                  `-t sst-dev:${input.functionID}`,
+                  ...input.props.container?.file ? [`-f ${input.props.container.file}`] : [],
+                  `.`
+                ].join(" "),
                 {
                   cwd: project,
                   env: {
@@ -4951,6 +4956,7 @@ var init_container = __esm({
                 [
                   `docker build`,
                   `-t sst-build:${input.functionID}`,
+                  ...input.props.container?.file ? [`-f ${input.props.container.file}`] : [],
                   `--platform ${platform}`,
                   `.`
                 ].join(" "),