@awsless/awsless 0.0.341 → 0.0.343

package/dist/bin.js

@@ -2006,7 +2006,6 @@ import { Asset, aws as aws2 } from "@awsless/formation";
 import { generateFileHash } from "@awsless/ts-file-cache";
 import deepmerge from "deepmerge";
 import { dirname as dirname6 } from "path";
-import { exec } from "promisify-child-process";
 
 // src/build/index.ts
 import { mkdir as mkdir2, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
@@ -2196,6 +2195,31 @@ var zipFiles = (files) => {
 
 // src/feature/function/util.ts
 import { hashElement } from "folder-hash";
+
+// src/feature/function/build/container/build.ts
+import { exec } from "promisify-child-process";
+var buildDockerImage = async (opts) => {
+  const platform = opts.architecture === "arm64" ? "linux/arm64" : "linux/amd64";
+  await exec(`docker image rm ${opts.name}:latest`);
+  const buildResponse = await exec(`docker buildx build --platform ${platform} -t ${opts.name}:latest .`, {
+    cwd: opts.cwd
+  });
+  if (buildResponse.code !== 0) {
+    throw new Error(`Docker build failed: ${buildResponse.stderr}`);
+  }
+  const response = await exec(`docker image inspect ${opts.name}:latest`);
+  if (response.code !== 0) {
+    throw new Error(`Docker image inspect failed: ${response.stderr}`);
+  }
+  const data = JSON.parse(response.stdout);
+  const image = data[0];
+  return {
+    id: image.Id,
+    size: image.Size
+  };
+};
+
+// src/feature/function/util.ts
 var createLambdaFunction = (group, ctx, ns, id, local2) => {
   let name;
   if ("stack" in ctx) {
@@ -2216,21 +2240,21 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
   let code;
   if (props.runtime === "container") {
     ctx.registerBuild("function", name, async (build3) => {
-      const basePath2 = dirname6(props.file);
-      const version = await hashElement(basePath2, {
+      const cwd = dirname6(props.file);
+      const version = await hashElement(cwd, {
         files: {
           exclude: ["stack.json"]
         }
       });
       return build3(version.hash + props.architecture, async (write) => {
-        const platform = props.architecture === "arm64" ? "linux/arm64" : "linux/amd64";
-        await exec(`docker buildx build --platform ${platform} -t ${name} .`, {
-          cwd: basePath2
+        const image2 = await buildDockerImage({
+          name,
+          cwd,
+          architecture: props.architecture
         });
-        await write("PLATFORM", platform);
-        await write("HASH", version.hash);
+        await write("HASH", image2.id);
         return {
-          size: "unknown"
+          size: formatByteSize(image2.size)
         };
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.341",
+  "version": "0.0.343",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,15 +28,15 @@
     }
   },
   "peerDependencies": {
-    "@awsless/redis": "^0.0.12",
+    "@awsless/iot": "^0.0.2",
     "@awsless/lambda": "^0.0.26",
     "@awsless/open-search": "^0.0.15",
+    "@awsless/redis": "^0.0.12",
     "@awsless/s3": "^0.0.18",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/ssm": "^0.0.7",
-    "@awsless/iot": "^0.0.2",
     "@awsless/validate": "^0.0.15",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
@@ -89,6 +89,7 @@
     "jszip": "^3.10.1",
     "mime-types": "^2.1.35",
     "minimist": "^1.2.8",
+    "node-docker-api": "^1.1.22",
     "parse-imports": "^1.1.2",
     "parse-static-imports": "^1.1.0",
     "pretty-hrtime": "^1.0.3",
@@ -107,12 +108,12 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/code": "^0.0.10",
-    "@awsless/duration": "^0.0.1",
-    "@awsless/formation": "^0.0.53",
     "@awsless/graphql": "^0.0.9",
-    "@awsless/validate": "^0.0.15",
     "@awsless/ts-file-cache": "^0.0.1",
-    "@awsless/size": "^0.0.1"
+    "@awsless/validate": "^0.0.15",
+    "@awsless/size": "^0.0.1",
+    "@awsless/duration": "^0.0.1",
+    "@awsless/formation": "^0.0.53"
   },
   "scripts": {
     "test": "pnpm code test",