sst 2.21.0 → 2.21.1

package/constructs/Function.d.ts

@@ -510,20 +510,15 @@ export interface JavaProps {
 }
 export interface ContainerProps {
     /**
-     * Configure docker build options
-     *
+     * Specify or override the CMD on the Docker image.
      * @example
      * ```js
      * container: {
-     *   docker: {
-     *     cmd: ["executable", "param1", "param2"]
-     *   }
+     *   cmd: ["index.handler"]
      * }
      * ```
      */
-    docker: {
-        cmd?: string[];
-    };
+    cmd?: string[];
 }
 /**
  * Used to configure additional files to copy into the function bundle

package/constructs/Function.js

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

package/constructs/Job.d.ts

@@ -12,26 +12,32 @@ export interface JobNodeJSProps extends NodeJSProps {
 }
 export interface JobContainerProps {
     /**
-     * Configure docker build options
-     *
+     * Specify or override the CMD on the Docker image.
      * @example
      * ```js
      * container: {
-     *   docker: {
-     *     cmd: ["executable", "param1", "param2"]
-     *   }
+     *   cmd: ["python3", "my_script.py"]
      * }
      * ```
      */
-    docker: {
-        cmd: string[];
-    };
+    cmd: string[];
 }
 export interface JobProps {
+    /**
+     * The runtime environment for the job.
+     * @default "nodejs"
+     * @example
+     * ```js
+     * new Function(stack, "Function", {
+     *   runtime: "container",
+     *   handler: "src/job",
+     * })
+     *```
+     */
     runtime?: "nodejs" | "container";
     /**
-     * Path to the entry point and handler function. Of the format:
-     * `/path/to/file.function`.
+     * For "nodejs" runtime, point to the entry point and handler function.
+     * Of the format: `/path/to/file.function`.
      *
      * @example
      * ```js
@@ -39,6 +45,17 @@ export interface JobProps {
      *   handler: "src/job.handler",
      * })
      *```
+     *
+     * For "container" runtime, point the handler to the directory containing
+     * the Dockerfile.
+     *
+     * @example
+     * ```js
+     * new Job(stack, "MyJob", {
+     *   runtime: "container",
+     *   handler: "src/job", // Dockerfile is at "src/job/Dockerfile"
+     * })
+     *```
      */
     handler: string;
     /**
@@ -281,5 +298,4 @@ export declare class Job extends Construct implements SSTConstruct {
     private normalizeMemorySize;
     private normalizeTimeout;
     private convertJobRuntimeToFunctionRuntime;
-    private convertJobContainerToFunctionContainer;
 }

package/constructs/Job.js

@@ -47,7 +47,6 @@ export class Job extends Construct {
         this.id = id;
         this.props = props;
         const isLiveDevEnabled = app.mode === "dev" && (this.props.enableLiveDev === false ? false : true);
-        // TODO add test
         this.validateContainerProps();
         this.job = this.createCodeBuildJob();
         if (!stack.isActive) {
@@ -169,7 +168,6 @@ export class Job extends Construct {
         const fn = new Function(this, this.node.id, {
             ...this.props,
             runtime: this.convertJobRuntimeToFunctionRuntime(),
-            container: this.convertJobContainerToFunctionContainer(),
             memorySize: 1024,
             timeout: "10 seconds",
             environment: {
@@ -223,7 +221,7 @@ export class Job extends Construct {
                         "phases:",
                         "  build:",
                         "    commands:",
-                        `      - ${container.docker.cmd
+                        `      - ${container.cmd
                             .map((arg) => (arg.includes(" ") ? `"${arg}"` : arg))
                             .join(" ")}`,
                     ].join("\n"),
@@ -379,14 +377,4 @@ export class Job extends Construct {
         const { runtime } = this.props;
         return runtime === "container" ? "container" : "nodejs16.x";
     }
-    convertJobContainerToFunctionContainer() {
-        const { runtime, container } = this.props;
-        if (runtime !== "container")
-            return;
-        return {
-            docker: {
-                cmd: container?.docker.cmd,
-            },
-        };
-    }
 }

package/package.json

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

package/runtime/handlers/container.js

@@ -133,7 +133,9 @@ export const useContainerHandler = Context.memo(async () => {
         containers.set(input.workerID, name);
     }
     function startLambdaWorker(input) {
+        const fn = useFunctions().fromID(input.functionID);
         dockerRun(input, {
+            cmd: fn?.container?.cmd,
             envs: {
                 AWS_LAMBDA_RUNTIME_API: `host.docker.internal:${server.port}/${input.workerID}`,
             },
@@ -147,14 +149,14 @@ export const useContainerHandler = Context.memo(async () => {
         //    - on `sst deploy`, the CodeBuild job is started with `SST_PAYLOAD` env var
         //    - on `sst dev`, set `SST_DEBUG_JOB` env var here
         // 2. Worker exits at the end of the run.
-        const fn = useFunctions().fromID(input.functionID);
         // Fetch request
         const result = await init();
         const awsRequestId = result.headers["lambda-runtime-aws-request-id"];
+        const fn = useFunctions().fromID(input.functionID);
         try {
             dockerRun(input, {
                 entrypoint: "",
-                cmd: fn?.container?.docker.cmd,
+                cmd: fn?.container?.cmd,
                 envs: {
                     SST_PAYLOAD: result.body,
                 },

package/sst.mjs

@@ -5853,9 +5853,11 @@ var init_container = __esm({
         containers.set(input.workerID, name);
       }
       function startLambdaWorker(input) {
+        const fn = useFunctions3().fromID(input.functionID);
         dockerRun(
           input,
           {
+            cmd: fn?.container?.cmd,
             envs: {
               AWS_LAMBDA_RUNTIME_API: `host.docker.internal:${server.port}/${input.workerID}`
             }
@@ -5866,15 +5868,15 @@ var init_container = __esm({
         );
       }
       async function startJobWorker(input) {
-        const fn = useFunctions3().fromID(input.functionID);
         const result = await init();
         const awsRequestId = result.headers["lambda-runtime-aws-request-id"];
+        const fn = useFunctions3().fromID(input.functionID);
         try {
           dockerRun(
             input,
             {
               entrypoint: "",
-              cmd: fn?.container?.docker.cmd,
+              cmd: fn?.container?.cmd,
               envs: {
                 SST_PAYLOAD: result.body
               }