Merge pull request #16 from devsapp/use-custom-runtime-config

rsonghuster · web-flow · commit 9074d5791136 · 2022-02-22T17:40:09.000+08:00
use custom runtime config replace bootstrap
diff --git a/custom-function/java8/fc-custom-java8-http/publish.yaml b/custom-function/java8/fc-custom-java8-http/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-java8-http
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Java8 HTTP 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/java8/fc-custom-java8-http/src/code/bootstrap b/custom-function/java8/fc-custom-java8-http/src/code/bootstrap
diff --git a/custom-function/java8/fc-custom-java8-http/src/s.yaml b/custom-function/java8/fc-custom-java8-http/src/s.yaml
@@ -40,6 +40,12 @@ services:
         runtime: custom
         codeUri: ./code
         instanceConcurrency: 4
+        customRuntimeConfig:
+          command:
+            - java 
+          args:
+            - '-jar'
+            - 'target/demo.jar'
       triggers:
         - name: httpTrigger
           type: http
diff --git a/custom-function/lua/fc-custom-lua-event/publish.yaml b/custom-function/lua/fc-custom-lua-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-lua-event
 Provider:
   - 阿里云
-Version: 1.1.10
+Version: 1.1.11
 Description: 快速部署一个基于custom runtime 的 Lua Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/lua/fc-custom-lua-event/src/code/bootstrap b/custom-function/lua/fc-custom-lua-event/src/code/bootstrap
diff --git a/custom-function/lua/fc-custom-lua-event/src/s.yaml b/custom-function/lua/fc-custom-lua-event/src/s.yaml
@@ -39,6 +39,14 @@ services:
         timeout: 30
         runtime: custom
         codeUri: ./code
+        customRuntimeConfig:
+          command:
+            - /code/nginx
+          args:
+            - '-p'
+            - '/tmp'
+            - '-c'
+            - '/code/nginx.conf'
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/nodejs10/fc-custom-nodejs10-event/publish.yaml b/custom-function/nodejs10/fc-custom-nodejs10-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-nodejs10-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Node.js 10 Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/nodejs10/fc-custom-nodejs10-event/src/code/bootstrap b/custom-function/nodejs10/fc-custom-nodejs10-event/src/code/bootstrap
diff --git a/custom-function/nodejs10/fc-custom-nodejs10-event/src/s.yaml b/custom-function/nodejs10/fc-custom-nodejs10-event/src/s.yaml
@@ -42,6 +42,10 @@ services:
         instanceConcurrency: 4
         environmentVariables:
           PATH: /code/node-v12.13.0-linux-x64/bin:$PATH
+        customRuntimeConfig:
+          command:
+            - node
+            - server.js
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/nodejs12/fc-custom-nodejs12-event/publish.yaml b/custom-function/nodejs12/fc-custom-nodejs12-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-nodejs12-event
 Provider:
   - 阿里云
-Version: 1.1.10
+Version: 1.1.11
 Description: 快速部署一个基于custom runtime 的 Node.js 12 Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/nodejs12/fc-custom-nodejs12-event/src/code/bootstrap b/custom-function/nodejs12/fc-custom-nodejs12-event/src/code/bootstrap
diff --git a/custom-function/nodejs12/fc-custom-nodejs12-event/src/s.yaml b/custom-function/nodejs12/fc-custom-nodejs12-event/src/s.yaml
@@ -42,8 +42,10 @@ services:
         runtime: custom
         codeUri: ./code
         instanceConcurrency: 4
-        environmentVariables:
-          PATH: /code/node-v12.16.1-linux-x64/bin
+        customRuntimeConfig:
+          command:
+            - /code/node-v12.16.1-linux-x64/bin/node
+            - server.js
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/php74/fc-custom-php74-event/publish.yaml b/custom-function/php74/fc-custom-php74-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-php74-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 PHP7.4 Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/php74/fc-custom-php74-event/src/code/bootstrap b/custom-function/php74/fc-custom-php74-event/src/code/bootstrap
diff --git a/custom-function/php74/fc-custom-php74-event/src/s.yaml b/custom-function/php74/fc-custom-php74-event/src/s.yaml
@@ -40,6 +40,10 @@ services:
         runtime: custom
         codeUri: ./code
         instanceConcurrency: 4
+        customRuntimeConfig:
+          command:
+            - php
+            - server.php
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/php74/fc-custom-php74-http/publish.yaml b/custom-function/php74/fc-custom-php74-http/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-php74-http
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 PHP7.4 HTTP 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/php74/fc-custom-php74-http/src/code/bootstrap b/custom-function/php74/fc-custom-php74-http/src/code/bootstrap
diff --git a/custom-function/php74/fc-custom-php74-http/src/s.yaml b/custom-function/php74/fc-custom-php74-http/src/s.yaml
@@ -40,6 +40,10 @@ services:
         runtime: custom
         codeUri: ./code
         instanceConcurrency: 4
+        customRuntimeConfig:
+          command:
+            - php
+            - server.php
       triggers:
         - name: httpTrigger
           type: http
diff --git a/custom-function/powershell/fc-custom-powershell-event/publish.yaml b/custom-function/powershell/fc-custom-powershell-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-powershell-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Powershell Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/powershell/fc-custom-powershell-event/src/code/bootstrap b/custom-function/powershell/fc-custom-powershell-event/src/code/bootstrap
diff --git a/custom-function/powershell/fc-custom-powershell-event/src/s.yaml b/custom-function/powershell/fc-custom-powershell-event/src/s.yaml
@@ -39,6 +39,10 @@ services:
         memorySize: 512
         runtime: custom
         codeUri: ./code
+        customRuntimeConfig:
+          command:
+            - pwsh 
+            - SimpleHttpServer.ps1
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/python37/fc-custom-python37-event/publish.yaml b/custom-function/python37/fc-custom-python37-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-python37-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Python3.7 Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/python37/fc-custom-python37-event/src/code/bootstrap b/custom-function/python37/fc-custom-python37-event/src/code/bootstrap
diff --git a/custom-function/python37/fc-custom-python37-event/src/s.yaml b/custom-function/python37/fc-custom-python37-event/src/s.yaml
@@ -40,6 +40,13 @@ services:
         runtime: custom
         codeUri: ./code
         instanceConcurrency: 4
+        customRuntimeConfig:
+          command:
+            - gunicorn 
+          args:
+            - '-c'
+            - 'gunicorn_conf.py'
+            - 'server:app'
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/python37/fc-custom-python37-http/publish.yaml b/custom-function/python37/fc-custom-python37-http/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-python37-http
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Python3.7 HTTP 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/python37/fc-custom-python37-http/src/code/bootstrap b/custom-function/python37/fc-custom-python37-http/src/code/bootstrap
diff --git a/custom-function/python37/fc-custom-python37-http/src/s.yaml b/custom-function/python37/fc-custom-python37-http/src/s.yaml
@@ -40,6 +40,13 @@ services:
         runtime: custom
         codeUri: ./code
         instanceConcurrency: 4
+        customRuntimeConfig:
+          command:
+            - gunicorn 
+          args:
+            - '-c'
+            - 'gunicorn_conf.py'
+            - 'server:app'
       triggers:
         - name: http_t
           type: http
diff --git a/custom-function/ruby/fc-custom-ruby-event/publish.yaml b/custom-function/ruby/fc-custom-ruby-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-ruby-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Ruby Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/ruby/fc-custom-ruby-event/src/code/bootstrap b/custom-function/ruby/fc-custom-ruby-event/src/code/bootstrap
diff --git a/custom-function/ruby/fc-custom-ruby-event/src/s.yaml b/custom-function/ruby/fc-custom-ruby-event/src/s.yaml
@@ -40,6 +40,10 @@ services:
         environmentVariables:
           PATH: /usr/local/ruby/bin
         codeUri: ./code
+        customRuntimeConfig:
+          command:
+            - ruby 
+            - server.rb
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/custom-function/rust/fc-custom-rust-event/publish.yaml b/custom-function/rust/fc-custom-rust-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-rust-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 RUST Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/rust/fc-custom-rust-event/src/s.yaml b/custom-function/rust/fc-custom-rust-event/src/s.yaml
@@ -30,6 +30,9 @@ services:
 #      post-deploy: # 在deploy之后运行
 #        - run: s versions   # 要运行的命令行
 #          path: ./ # 命令行运行的路径
+    props:
+      region: ${vars.region}
+      service: ${vars.service}
       function:
         name: rustEventFunc
         timeout: 30
diff --git a/custom-function/typescript/fc-custom-typescript-event/publish.yaml b/custom-function/typescript/fc-custom-typescript-event/publish.yaml
@@ -2,7 +2,7 @@ Type: Application
 Name: fc-custom-typescript-event
 Provider:
   - 阿里云
-Version: 1.1.9
+Version: 1.1.10
 Description: 快速部署一个基于custom runtime 的 Typescript Event 类型的 Hello World 到阿里云函数计算
 HomePage: https://github.com/devsapp/start-fc
 Tags:
diff --git a/custom-function/typescript/fc-custom-typescript-event/src/code/bootstrap b/custom-function/typescript/fc-custom-typescript-event/src/code/bootstrap
diff --git a/custom-function/typescript/fc-custom-typescript-event/src/s.yaml b/custom-function/typescript/fc-custom-typescript-event/src/s.yaml
@@ -39,6 +39,10 @@ services:
         runtime: custom
         codeUri: ./code
         timeout: 30
+        customRuntimeConfig:
+          command:
+            - /code/node_modules/ts-node/dist/bin.js 
+            - server.ts
 #  next-function: # 第二个函数的案例，仅供参考
 #    # 如果在当前项目下执行 s deploy，会同时部署模块：
 #    #   helloworld：服务hello-world-service，函数cpp-event-function
diff --git a/update.list b/update.list
@@ -1,2 +1,12 @@
-event-function/fc-event-java8
-http-function/fc-http-java8
+custom-function/rust/fc-custom-rust-event
+custom-function/rust/fc-custom-java8-http
+custom-function/rust/fc-custom-lua-event
+custom-function/nodejs10/fc-custom-nodejs10-event
+custom-function/nodejs12/fc-custom-nodejs12-event
+custom-function/php74/fc-custom-php74-event
+custom-function/php74/fc-custom-php74-http
+custom-function/powershell/fc-custom-powershell-event
+custom-function/python37/fc-custom-python37-event
+custom-function/python37/fc-custom-python37-http
+custom-function/ruby/fc-custom-ruby-event
+custom-function/typescript/fc-custom-typescript-event
