Merge pull request #154 from devsapp/build-runit

fix: build runit

Author: rsonghuster

__tests__/ut/commands/model_test.ts

@@ -146,7 +146,7 @@ describe('Model', () => {
       });
 
       expect(() => new Model(mockInputs)).toThrow(
-        'Command "invalid" not found, Please use "s cli fc3 layer -h" to query how to use the command',
+        'Command "invalid" not found, Please use "s cli fc3 model -h" to query how to use the command',
       );
     });
   });

package-lock.json

@@ -54,6 +54,8 @@
     "temp-dir": "^2.0.0",
     "tty-table": "^4.2.3",
     "uuid": "^9.0.1",
+    "undici": "^5.28.5",
+    "@serverless-devs/docker-image-builder": "^0.0.0-20260518-164317-160dd89efac1",
     "uuid-by-string": "^4.0.0"
   },
   "devDependencies": {
@@ -76,6 +78,9 @@
   "resolutions": {
     "@alicloud/sls20191023": {
       "registry": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/"
+    },
+    "@serverless-devs/docker-image-builder": {
+      "registry": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/"
     }
   }
 }

package.json

@@ -3,7 +3,7 @@ Type: Component
 Name: fc3
 Provider:
   - 阿里云
-Version: 0.1.20
+Version: 0.1.21
 Description: 阿里云函数计算全生命周期管理
 HomePage: https://github.com/devsapp/fc3
 Organization: 阿里云函数计算（FC）

publish.yaml

@@ -8,7 +8,9 @@ Examples:
   $ s build --dockerfile ./code/Dockerfile --context ./code
   $ s build --custom-env "{\\"myenv\\": \\"test\\"}" --custom-args="-i https://pypi.tuna.tsinghua.edu.cn/simple"
   $ s build --command="pip install -t . flask -i https://pypi.tuna.tsinghua.edu.cn/simple"
-  $ s build --script-file my_script.sh`,
+  $ s build --script-file my_script.sh
+  $ s build --cloud-build-config fc3-cloud-build.yaml
+  $ s build --cloud-build-config fc3-cloud-build.yaml --debug-instance`,
     summary: 'Build the dependencies',
     option: [
       ['--publish-layer', '[Optional] Publishing the built artifact as a layer'],
@@ -20,6 +22,14 @@ Examples:
       ],
       ['--command <string>', '[Optional] Using custom commands'],
       ['--script-file <scriptFile>', '[Optional] Using custom shell scripts'],
+      [
+        '--cloud-build-config <buildYaml>',
+        '[Optional] Cloud based build configuration file, default to search for the current directory fc3-cloud-build.yaml.',
+      ],
+      [
+        '--debug-instance',
+        '[Optional] Only for cloud building, start the interactive debugging window after the build is complete.',
+      ],
       [
         '-f, --dockerfile <string>',
         '[Optional] Specify the dockerfile path, Use docker to build the image of the custom container runtime',

src/commands-help/build.ts

@@ -17,6 +17,7 @@ import logs from './logs';
 import session from './session';
 import scaling from './scaling';
 import list from './list';
+import model from './model';
 
 export default {
   deploy,
@@ -38,4 +39,5 @@ export default {
   session,
   scaling,
   list,
+  model,
 };

src/commands-help/index.ts

@@ -1,13 +1,13 @@
 export default {
   help: {
-    description: 'Resource layer operation ',
-    summary: 'Resource layer operation ',
+    description: 'Resource model operation ',
+    summary: 'Resource model operation ',
   },
   subCommands: {
     download: {
       help: {
         description: `Download model`,
-        summary: 'Publish new layer version',
+        summary: 'Download model',
         option: [],
       },
     },

src/commands-help/model.ts

@@ -133,6 +133,10 @@ export default class Fc extends Base {
 
   public async build(inputs: IInputs) {
     await super.handlePreRun(inputs, false);
+    const build = new BuilderFactory(inputs);
+    if (build.findCloudBuildYaml()) {
+      return await build.runit();
+    }
 
     const runtime = _.get(inputs, 'props.runtime');
     if (FC.isCustomContainerRuntime(runtime)) {

src/index.ts

@@ -23,6 +23,7 @@ export interface IProps extends IFunction {
   endpoint?: string;
   supplement?: any;
   annotations?: any;
+  buildDir?: string;
 }
 
 export interface IInputs extends _IInputs {