Merge branch 'main' into feat-web-websiteHost

labring · Feb 15, 2023 · 7862ba1 · 7862ba1
2 parents b28be0c + b59053b
commit 7862ba1
Show file tree

Hide file tree

Showing 57 changed files with 862 additions and 400 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -16,21 +16,21 @@
 #
 
 name: Bug report
-title: "[Bug] Bug title "
+title: "[bug] bug title "
 description: If something isn't working as expected.
 labels: ["bug"]
 body:
-  # - type: markdown
-  #   attributes:
-  #     value: |
-  #       For better global communication, Please write in English.
-  #       (为了更好的国际化交流，请您使用英语描述您的问题。)
+  - type: markdown
+    attributes:
+      value: |
+        For better global communication, Please write in English.
+        (为了更好的国际化交流，请您使用英语描述您的问题。)
 
-  #       You can use the following translation tool to translate, but please check the translation carefully after translation to avoid misinterpretation:
-  #       (你可以使用以下翻译工具进行翻译，但是翻译完成后请仔细检查译文，以免有错误的理解：）
-  #       - [Google Translate](https://translate.google.com/)
-  #       - [Baidu Translate](https://fanyi.baidu.com/)
-  #       - [YouDao Translate](https://fanyi.baidu.com/)
+        You can use the following translation tool to translate, but please check the translation carefully after translation to avoid misinterpretation:
+        (你可以使用以下翻译工具进行翻译，但是翻译完成后请仔细检查译文，以免有错误的理解：）
+        - [Google Translate](https://translate.google.com/)
+        - [Baidu Translate](https://fanyi.baidu.com/)
+        - [YouDao Translate](https://fanyi.baidu.com/)
 
   - type: checkboxes
     attributes:
@@ -49,50 +49,14 @@ body:
       label: Environment
       description: Describe the environment.
       options:
-        - lafyun.com
+        - preview.laf.run
         - Mac (self-host)
         - Windows (self-host)
         - Linux (self-host)
         - Other (self-host)
     validations:
       required: true
 
-  - type: dropdown
-    attributes:
-      label: CPU Architecture
-      description: Describe the architecture.
-      options:
-        - amd64
-        - arm64
-        - Apple M1 Chip
-        - Others
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Versions
-      description: >
-        Describe the environment versions. 
-
-        For examples:
-          
-          docker version: `docker version`
-
-          docker compose version: `docker-compose version`
-
-          linux version: `uname -a`
-
-          `laf` versions: `docker images | grep lafyun`
-
-      placeholder: >
-        docker version: 
-        docker compose version: 
-        linux version: 
-        `laf` versions:
-    validations:
-      required: true
-
   - type: textarea
     attributes:
       label: What happened
@@ -119,59 +83,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    attributes:
-      label: Debug logs
-      description: >
-        Anything else we need to know?
-
-        **If you encounter a problem of installation, paste the logs in the installation deployment process here.**
-
-        - Provide service status: `docker ps`
-          
-        - Provide system-server logs: `docker logs --tail 1000 -f $(docker ps --format "{{.Names}}" | grep system-server)`
-          
-        - Provide mongodb logs: `docker logs --tail 1000 -f $(docker ps --format "{{.Names}}" | grep mongo)`
-          
-        - Provide gateway-controller logs: `docker logs --tail 1000 -f $(docker ps --format "{{.Names}}" | grep gateway-controller)`
-          
-        - Provide instance-controller logs: `docker logs --tail 1000 -f $(docker ps --format "{{.Names}}" | grep instance-controller)`
-
-      placeholder: >
-        **Provide service status**
-
-        ```logs
-
-        ```
-
-        **Provide system-server logs**
-
-        ```logs
-
-        ```
-
-
-        **Provide mongodb logs**
-
-        ```logs
-
-        ```
-
-
-        Provide gateway-controller logs:
-          
-        ```logs
-
-        ```
-
-        Provide instance-controller logs with command:
-          
-        ```logs
-
-        ```
-    validations:
-      required: false
-
   - type: checkboxes
     attributes:
       label: Are you willing to submit PR?

diff --git a/README.md b/README.md
@@ -20,6 +20,14 @@
 
 > [English](README_en.md) | 中文
 
+## 🖥 在线体验
+
+🎉 [preview.laf.run](http://preview.laf.run) 可在线免费体验 `laf` 云开发应用服务！
+
+开发者可免费在 [preview.laf.run](http://preview.laf.run) 上快速创建自己的应用，免除服务器部署和运维工作，立即拥有应用独立域名及 HTTPS 证书，快速上线应用！
+
+> 请注意，[preview.laf.run](http://preview.laf.run) 仅为 v1.0.0-beta 预览版，数据不定期**删档**，**不适合用于生产环境！**
+
 ## 👀 `laf` 是什么
 
 - laf 是云开发平台，可以快速的开发应用
@@ -143,14 +151,6 @@
 
 > 未来，`lafyun.com` 会上线一个应用市场，汇总收集这些应用，让 `laf` 用户一键即可使用海量应用!
 
-## 🖥 在线体验
-
-🎉 [preview.laf.run](http://preview.laf.run) 可在线免费体验 `laf` 云开发应用服务！
-
-开发者可免费在 [preview.laf.run](http://preview.laf.run) 上快速创建自己的应用，免除服务器部署和运维工作，立即拥有应用独立域名及 HTTPS 证书，快速上线应用！
-
-> 请注意，[preview.laf.run](http://preview.laf.run) 仅为 v1.0.0-beta 预览版，数据不定期**删档**，**不适合用于生产环境！**
-
 ## 🚀 快速开始
 
 [三分钟体验使用 laf 开发一个简单的登陆注册功能](./docs/guide/quick-start/index.md)

diff --git a/deploy/scripts/install-on-linux.sh b/deploy/scripts/install-on-linux.sh
@@ -46,6 +46,8 @@ if [ ! -x "$(command -v sealos)" ]; then
     exit 1
 fi
 
+set -e
+
 # install k8s cluster
 sealos run labring/kubernetes:v1.24.9 labring/flannel:v0.19.0 labring/helm:v3.8.2 --single
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,8 @@ if [ ! -x "$(command -v sealos)" ]; then @@
         exit 1
     fi
+    set -e
     # install k8s cluster
     sealos run labring/kubernetes:v1.24.9 labring/flannel:v0.19.0 labring/helm:v3.8.2 --single
@@ Expand Down @@