chore: update repository

jikkai · jikkai · commit 34cb1ef150f9 · 2025-12-06T07:47:20.000Z
diff --git a/charts/collaboration-demo/Chart.yaml b/charts/collaboration-demo/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3 # VERSION
+version: 0.12.4 # VERSION
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/collaboration-demo/values.yaml b/charts/collaboration-demo/values.yaml
@@ -11,7 +11,7 @@ image:
   repository: release/univer-collaboration-lite
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.12.3 # VERSION
+  tag: 0.12.4 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/charts/collaboration-server/Chart.yaml b/charts/collaboration-server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3 # VERSION
+version: 0.12.4 # VERSION
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/collaboration-server/templates/deployment.yaml b/charts/collaboration-server/templates/deployment.yaml
@@ -58,6 +58,8 @@ spec:
               value: {{ tpl .Values.config.univerServer . }}
             - name: URL_OF_SNAPSHOT_SERVICE
               value: {{ tpl .Values.config.snapshotServer . }}
+            - name: URL_OF_HELPER_SERVICE
+              value: {{ tpl .Values.config.helperService . }}
             - name: SAVE_SHEET_SNAPSHOT_INTERVAL
               value: {{ .Values.config.saveSheetSnapshotInterval | quote }}
             - name: SAVE_DOC_SNAPSHOT_INTERVAL
diff --git a/charts/collaboration-server/values.yaml b/charts/collaboration-server/values.yaml
@@ -12,7 +12,7 @@ image:
   repository: release/univer-collaboration
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.12.3 # VERSION
+  tag: 0.12.4 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
@@ -46,6 +46,7 @@ service:
 config:
   univerServer: universer:8000
   snapshotServer: universer:9000
+  helperService: univer-collaboration-helper-server:5006
   saveSheetSnapshotInterval: 50
   saveDocSnapshotInterval: 50
   enableMutationApplyInterceptor: false
diff --git a/charts/univer-ssc/Chart.yaml b/charts/univer-ssc/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3 # VERSION
+version: 0.12.4 # VERSION
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/univer-ssc/values.yaml b/charts/univer-ssc/values.yaml
@@ -9,7 +9,7 @@ image:
   repository: release/univer-collaboration
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.12.3 # VERSION
+  tag: 0.12.4 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/charts/univer-stack/Chart.yaml b/charts/univer-stack/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3 # VERSION
+version: 0.12.4 # VERSION
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -25,13 +25,13 @@ appVersion: "1.16.0"
 
 dependencies:
   - name: universer
-    version: 0.12.3 # VERSION
+    version: 0.12.4 # VERSION
     repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts
   - name: collaboration-server
-    version: 0.12.3 # VERSION
+    version: 0.12.4 # VERSION
     repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts
   - name: collaboration-demo
-    version: 0.12.3 # VERSION
+    version: 0.12.4 # VERSION
     repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts
     condition: collaboration-demo.enabled
   - name: postgresql
@@ -59,7 +59,7 @@ dependencies:
     repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts
     condition: temporal.enabled
   - name: worker
-    version: 0.12.3 # VERSION
+    version: 0.12.4 # VERSION
     repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts
   - name: base
     version: 1.20.1
@@ -95,5 +95,5 @@ dependencies:
       - "istio"
     alias: istio-virtualservicemerge
   - name: univer-ssc
-    version: 0.12.3 # VERSION
+    version: 0.12.4 # VERSION
     repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts
diff --git a/charts/univer-stack/values.yaml b/charts/univer-stack/values.yaml
@@ -96,7 +96,7 @@ worker:
   fullnameOverride: worker-exchange
   image:
     repository: release/worker-exchange
-    tag: 0.12.3 # VERSION
+    tag: 0.12.4 # VERSION
   temporalServer:
     host: temporal-frontend:7233
     namespace: univer
diff --git a/charts/universer/Chart.yaml b/charts/universer/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3 # VERSION
+version: 0.12.4 # VERSION
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/universer/config/config.yml b/charts/universer/config/config.yml
@@ -44,6 +44,9 @@ service:
   apply:
     addr: "{{ tpl .Values.config.apply.host . }}:{{ .Values.config.apply.port }}"
     timeout: 10s
+  collaborationHelper:
+    addr: {{ .Values.config.collaborationHelper.addr }}
+    timeout: 180s
   nodeRuntime:
     addr: {{ .Values.config.nodeRuntime.addr }}
     timeout: 10s
diff --git a/charts/universer/values.yaml b/charts/universer/values.yaml
@@ -13,7 +13,7 @@ image:
   repository: release/universer
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.12.3 # VERSION
+  tag: 0.12.4 # VERSION
 
 imagePullSecrets: []
 nameOverride: ""
@@ -127,6 +127,8 @@ config:
   ssc:
     host: univer-ssc
     port: 5005
+  collaborationHelper:
+    addr: univer-collaboration-helper-server:5006
   nodeRuntime:
     addr: http://localhost:14400
   pythonRuntime:
@@ -355,7 +357,7 @@ job:
     registry: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com
     repository: release/universer-sql
     pullPolicy: IfNotPresent
-    tag: "0.0.17"
+    tag: "0.0.18"
 
 istio:
   enabled: false
diff --git a/charts/worker/Chart.yaml b/charts/worker/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.12.3 # VERSION
+version: 0.12.4 # VERSION
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/docker-compose/.env b/docker-compose/.env
@@ -1,11 +1,11 @@
 EDITION=release
 
 # version
-UNIVERSER_VERSION=0.12.3
-COLLABORATION_SERVER_VERSION=0.12.3
-UNIVER_WORKER_EXCHANGE_VERSION=0.12.3
-UNIVER_DEMO_UI_VERSION=0.12.3
-UNIVERSER_SQL_VERSION=0.0.17
+UNIVERSER_VERSION=0.12.4
+COLLABORATION_SERVER_VERSION=0.12.4
+UNIVER_WORKER_EXCHANGE_VERSION=0.12.4
+UNIVER_DEMO_UI_VERSION=0.12.4
+UNIVERSER_SQL_VERSION=0.0.18
 POSTGRES_VERSION=16.1
 MYSQL_VERSION=8.3.0
 RABBITMQ_VERSION=3.12.14-management
@@ -138,3 +138,4 @@ PERMISSION_BASED_EXPORT_ENABLED=true
 # enabled ssc server
 SSC_SERVER_ENABLED=false
 
+UNIVER_RUN_ENGINE=docker
diff --git a/docker-compose/log.sh b/docker-compose/log.sh
@@ -1,16 +1,47 @@
 #!/bin/bash
 
-DOCKER_COMPOSE="docker compose"
-$DOCKER_COMPOSE version &>/dev/null
-if [ $? -ne 0 ]; then
-    DOCKER_COMPOSE="docker-compose"
+UNIVER_RUN_ENGINE=${UNIVER_RUN_ENGINE:-"docker"}
+
+DOCKER=""
+DOCKER_COMPOSE=""
+
+if [ "$UNIVER_RUN_ENGINE" == "podman" ]; then
+    DOCKER="podman"
+    DOCKER_COMPOSE="podman compose"
+
+    docker-compose version &>/dev/null
+    if [ $? -ne 0 ]; then
+        echo "podman need docker-compose."
+        exit 1
+    fi
+
     $DOCKER_COMPOSE version &>/dev/null
     if [ $? -ne 0 ]; then
-        echo "need docker compose."
+        echo "podman compose not installed."
         exit 1
     fi
+else
+    DOCKER="docker"
+    DOCKER_COMPOSE="docker compose"
+
+    $DOCKER info &>/dev/null
+    if [ $? -ne 0 ]; then
+        echo "docker not running."
+        exit 1
+    fi
+
+    $DOCKER_COMPOSE version &>/dev/null
+    if [ $? -ne 0 ]; then
+        DOCKER_COMPOSE="docker-compose"
+        $DOCKER_COMPOSE version &>/dev/null
+        if [ $? -ne 0 ]; then
+            echo "docker compose not installed."
+            exit 1
+        fi
+    fi
 fi
 
+
 minutes=1
 time_period="$minutes minutes"
 hours=6
@@ -417,9 +448,9 @@ function log_container {
     echo "======================================"
 
     if [[ -n "$trace_id" ]]; then
-        docker logs -t --since "$since_time" --until "$until_time" $container 2>&1 | grep "$trace_id" > $error_log_file
+        $DOCKER logs -t --since "$since_time" --until "$until_time" $container 2>&1 | grep "$trace_id" > $error_log_file
     else
-        docker logs -t --since "$since_time" --until "$until_time" $container > $error_log_file 2>&1
+        $DOCKER logs -t --since "$since_time" --until "$until_time" $container > $error_log_file 2>&1
     fi
 
     if _check_log_file_empty "$error_log_file"; then
diff --git a/docker-compose/run.sh b/docker-compose/run.sh
