diff --git a/.github/workflows/all-in-one.yml b/.github/workflows/all-in-one.yml index e525cd4..9b60bd4 100644 --- a/.github/workflows/all-in-one.yml +++ b/.github/workflows/all-in-one.yml @@ -1,6 +1,9 @@ name: ☀️ AllInOne on: + push: + tags: + - 'v*.*.*' workflow_dispatch: diff --git a/.github/workflows/sync-to-oss.yml b/.github/workflows/sync-to-oss.yml index b36e5fe..2eaa405 100644 --- a/.github/workflows/sync-to-oss.yml +++ b/.github/workflows/sync-to-oss.yml @@ -1,12 +1,11 @@ name: 🔄 Sync to OSS on: + push: + tags: + - 'v*.*.*' workflow_dispatch: inputs: - branch: - description: 'git branch(if not set, will use action trigger branch)' - required: false - default: '' sync-docker: description: 'can sync docker-compose.zip' required: false @@ -21,15 +20,9 @@ jobs: name: Sync to OSS runs-on: ubuntu-latest steps: - - name: manual Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.event.inputs.branch }} - if: ${{ github.event.inputs.branch != '' }} - name: default Checkout uses: actions/checkout@v4 - if: ${{ github.event.inputs.branch == '' }} - name: zip docker-compose.zip run: | diff --git a/charts/collaboration-demo/Chart.yaml b/charts/collaboration-demo/Chart.yaml index e2b90f2..d111b6e 100644 --- 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.1.2 +version: 0.1.3 # 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 index 35f11cc..ec257c7 100644 --- a/charts/collaboration-demo/values.yaml +++ b/charts/collaboration-demo/values.yaml @@ -11,7 +11,7 @@ image: repository: release/univer-collaboration-demo pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "5e4ede0" + tag: 0.3.0 # VERSION imagePullSecrets: [] nameOverride: "" diff --git a/charts/collaboration-server/Chart.yaml b/charts/collaboration-server/Chart.yaml index 40514fa..2a6bcd9 100644 --- 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.1.2 +version: 0.1.3 # 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/values.yaml b/charts/collaboration-server/values.yaml index 0df0f9a..e3ffee9 100644 --- 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.3.0 # VERSION + tag: 0.4.0 # VERSION imagePullSecrets: [] nameOverride: "" diff --git a/charts/univer-stack/Chart.lock b/charts/univer-stack/Chart.lock index 2a61ad4..fb359bb 100644 --- a/charts/univer-stack/Chart.lock +++ b/charts/univer-stack/Chart.lock @@ -1,13 +1,13 @@ dependencies: - name: universer repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - version: 0.1.4 + version: 0.1.5 - name: collaboration-server repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - version: 0.1.2 + version: 0.1.3 - name: collaboration-demo repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - version: 0.1.2 + version: 0.1.3 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts version: 13.4.3 @@ -28,7 +28,7 @@ dependencies: version: 0.33.0 - name: worker repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - version: 0.1.1 + version: 0.1.2 - name: base repository: https://istio-release.storage.googleapis.com/charts version: 1.20.1 @@ -44,5 +44,5 @@ dependencies: - name: virtualservicemerge repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts version: 0.1.0 -digest: sha256:e8e8484ab3f3fbcede6949bf41f35d4fedb213a3ad10766d075e55095694cbdf -generated: "2024-09-02T14:56:40.273657197+08:00" +digest: sha256:6c21e63d60add9a1550e9e9409f47d2f09eecc16b8b0dd57d959866b063a33fb +generated: "2024-10-14T15:11:26.860805384+08:00" diff --git a/charts/univer-stack/Chart.yaml b/charts/univer-stack/Chart.yaml index 6d01380..7328863 100644 --- 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.1.3 +version: 0.1.4 # 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.1.4 + version: 0.1.5 repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - name: collaboration-server - version: 0.1.2 + version: 0.1.3 repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - name: collaboration-demo - version: 0.1.2 + version: 0.1.3 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.1.1 + version: 0.1.2 repository: oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts - name: base version: 1.20.1 diff --git a/charts/univer-stack/values.mysql.yaml b/charts/univer-stack/values.mysql.yaml index a3bed46..7aadfda 100644 --- a/charts/univer-stack/values.mysql.yaml +++ b/charts/univer-stack/values.mysql.yaml @@ -11,8 +11,8 @@ univerStack: securityContext: {} temporalJob: image: - registry: docker.io - repository: temporalio/admin-tools + registry: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com + repository: release/temporal-admin-tools tag: "1.22.4" pullPolicy: IfNotPresent backoffLimit: 100 @@ -115,6 +115,12 @@ mysql: auth: rootPassword: mysql createDatabase: false + password: mysql + image: + registry: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com + repository: release/mysql + tag: "8.0.36-debian-11-r2" + pullPolicy: IfNotPresent commonAnnotations: "helm.sh/hook": pre-install "helm.sh/hook-weight": "-1" diff --git a/charts/univer-stack/values.yaml b/charts/univer-stack/values.yaml index cd6cc24..bcdcde6 100644 --- a/charts/univer-stack/values.yaml +++ b/charts/univer-stack/values.yaml @@ -95,7 +95,7 @@ collaboration-demo: worker: image: repository: release/worker-exchange - tag: 0.3.0 # VERSION + tag: 0.4.0 # VERSION temporalServer: host: temporal-frontend:7233 namespace: univer @@ -115,8 +115,8 @@ postgresql: tag: 16.1 pullPolicy: IfNotPresent commonAnnotations: - "helm.sh/hook": pre-install - "helm.sh/hook-weight": "-1" + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-weight": "-100" metrics: enabled: true image: diff --git a/charts/universer/Chart.yaml b/charts/universer/Chart.yaml index 8c9a706..8d454d5 100644 --- 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.1.4 +version: 0.1.5 # 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/values.yaml b/charts/universer/values.yaml index 854c9ee..b668882 100644 --- a/charts/universer/values.yaml +++ b/charts/universer/values.yaml @@ -12,7 +12,7 @@ image: repository: release/universer pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: 0.3.0 # VERSION + tag: 0.4.0 # VERSION imagePullSecrets: [] nameOverride: "" @@ -165,6 +165,7 @@ config: enabled: false defaultShareScope: "" defaultShareRole: "" + enableObjInherit: false admin: userIDs: [] apiLimit: @@ -244,7 +245,7 @@ job: registry: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com repository: release/universer-sql pullPolicy: IfNotPresent - tag: "0.0.11" + tag: "0.0.12" istio: enabled: false diff --git a/charts/worker/Chart.yaml b/charts/worker/Chart.yaml index 51834fb..fccc63d 100644 --- 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.1.1 +version: 0.1.2 # 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 index 2e2aa64..7259f5e 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -1,11 +1,11 @@ EDITION=release # version -UNIVERSER_VERSION=0.3.0 -COLLABORATION_SERVER_VERSION=0.3.0 -UNIVER_WORKER_EXCHANGE_VERSION=0.3.0 -UNIVER_DEMO_UI_VERSION=latest -UNIVERSER_SQL_VERSION=0.0.11 +UNIVERSER_VERSION=0.4.0 +COLLABORATION_SERVER_VERSION=0.4.0 +UNIVER_WORKER_EXCHANGE_VERSION=0.4.0 +UNIVER_DEMO_UI_VERSION=0.4.0 +UNIVERSER_SQL_VERSION=0.0.12 POSTGRES_VERSION=16.1 MYSQL_VERSION=8.3.0 RABBITMQ_VERSION=3-management @@ -89,6 +89,9 @@ HOST_NGINX_PORT=8000 HOST_MINIO_PORT=19000 HOST_GRAFANA_PORT=13000 +# docker network subnet +DOCKER_NETWORK_SUBNET=172.30.0.0/16 + # If you want to enable observability, uncomment the following line # COMPOSE_PROFILES=observability @@ -105,6 +108,7 @@ AUTH_OIDC_CALLBACK_URL= AUTH_PERMISSION_ENABLED=false AUTH_PERMISSION_DEFAULT_SHARE_SCOPE= AUTH_PERMISSION_DEFAULT_SHARE_ROLE= +AUTH_PERMISSION_ENABLE_OBJ_INHERIT=false # usip about USIP_ENBALED=false diff --git a/docker-compose/configs/config.yaml.template b/docker-compose/configs/config.yaml.template index c5608b7..8523301 100644 --- a/docker-compose/configs/config.yaml.template +++ b/docker-compose/configs/config.yaml.template @@ -70,6 +70,7 @@ auth: enabled: ${AUTH_PERMISSION_ENABLED} defaultShareScope: "${AUTH_PERMISSION_DEFAULT_SHARE_SCOPE}" defaultShareRole: "${AUTH_PERMISSION_DEFAULT_SHARE_ROLE}" + enableObjInherit: ${AUTH_PERMISSION_ENABLE_OBJ_INHERIT} apiLimit: method: tokens: 600 diff --git a/docker-compose/docker-compose.db.yaml b/docker-compose/docker-compose.db.yaml index aafab74..c0be9bc 100644 --- a/docker-compose/docker-compose.db.yaml +++ b/docker-compose/docker-compose.db.yaml @@ -6,7 +6,7 @@ services: - 8000 - 9000 environment: - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,univer-temporal,collaboration-server,univer-minio + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-temporal,collaboration-server,univer-minio - SERVICE_NAME=Universer - SERVICE_VERSION=${UNIVERSER_VERSION} volumes: @@ -39,7 +39,7 @@ services: - USERNAME=${DATABASE_USERNAME} - PASSWORD=${DATABASE_PASSWORD} - DATABASE=${DATABASE_DBNAME} - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,${DATABASE_HOST} + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},${DATABASE_HOST} networks: - univer labels: @@ -67,7 +67,8 @@ services: - URL_OF_SNAPSHOT_SERVICE=universer:9000 - SAVE_SHEET_SNAPSHOT_INTERVAL=50 - SAVE_DOC_SNAPSHOT_INTERVAL=50 - - no_proxy=127.0.0.1,localhost,172.30.0.0/16,universer + - ENABLE_MUTATION_APPLY_INTERCEPTOR=true + - no_proxy=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},universer expose: - 5002 networks: @@ -133,7 +134,7 @@ services: - POSTGRES_USER=postgres - POSTGRES_PWD=postgres - TEMPORAL_CLI_SHOW_STACKS=1 - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16 + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET} volumes: - ./temporal/dynamicconfig:/etc/temporal/config/dynamicconfig expose: @@ -171,7 +172,7 @@ services: container_name: univer-worker-exchange image: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/worker-exchange:${UNIVER_WORKER_EXCHANGE_VERSION} environment: - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,univer-temporal,univer-minio,universer + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-temporal,univer-minio,universer - TEMPORAL_SERVER=${TEMPORAL_HOST}:${TEMPORAL_PORT} - TEMPORAL_NAMESPACE=${TEMPORAL_NAMESPACE} - SERVICE_NAME=exchange-worker @@ -202,7 +203,7 @@ networks: driver: bridge ipam: config: - - subnet: 172.30.0.0/16 + - subnet: ${DOCKER_NETWORK_SUBNET} volumes: postgres-data: diff --git a/docker-compose/docker-compose.mysql.yaml b/docker-compose/docker-compose.mysql.yaml index 2c721a5..133bd36 100644 --- a/docker-compose/docker-compose.mysql.yaml +++ b/docker-compose/docker-compose.mysql.yaml @@ -6,7 +6,7 @@ services: - 8000 - 9000 environment: - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,univer-temporal,collaboration-server,univer-minio + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-temporal,collaboration-server,univer-minio - SERVICE_NAME=Universer - SERVICE_VERSION=${UNIVERSER_VERSION} volumes: @@ -41,7 +41,7 @@ services: - USERNAME=${DATABASE_USERNAME} - PASSWORD=${DATABASE_PASSWORD} - DATABASE=${DATABASE_DBNAME} - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,${DATABASE_HOST} + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},${DATABASE_HOST} networks: - univer depends_on: @@ -72,7 +72,8 @@ services: - URL_OF_SNAPSHOT_SERVICE=universer:9000 - SAVE_SHEET_SNAPSHOT_INTERVAL=50 - SAVE_DOC_SNAPSHOT_INTERVAL=50 - - no_proxy=127.0.0.1,localhost,172.30.0.0/16,universer + - ENABLE_MUTATION_APPLY_INTERCEPTOR=true + - no_proxy=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},universer expose: - 5002 networks: @@ -136,7 +137,7 @@ services: - MYSQL_USER=${DATABASE_USERNAME} - MYSQL_PWD=${DATABASE_PASSWORD} - TEMPORAL_CLI_SHOW_STACKS=1 - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16 + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET} volumes: - ./temporal/dynamicconfig:/etc/temporal/config/dynamicconfig expose: @@ -174,7 +175,7 @@ services: container_name: univer-worker-exchange image: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/worker-exchange:${UNIVER_WORKER_EXCHANGE_VERSION} environment: - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,univer-temporal,univer-minio,universer + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-temporal,univer-minio,universer - TEMPORAL_SERVER=${TEMPORAL_HOST}:${TEMPORAL_PORT} - TEMPORAL_NAMESPACE=${TEMPORAL_NAMESPACE} - SERVICE_NAME=exchange-worker @@ -205,7 +206,7 @@ networks: driver: bridge ipam: config: - - subnet: 172.30.0.0/16 + - subnet: ${DOCKER_NETWORK_SUBNET} volumes: mysql-data: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 2d4481b..f58bda0 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -6,7 +6,7 @@ services: - 8000 - 9000 environment: - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,univer-temporal,collaboration-server,univer-minio + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-temporal,collaboration-server,univer-minio - SERVICE_NAME=Universer - SERVICE_VERSION=${UNIVERSER_VERSION} volumes: @@ -42,7 +42,7 @@ services: - USERNAME=${DATABASE_USERNAME} - PASSWORD=${DATABASE_PASSWORD} - DATABASE=${DATABASE_DBNAME} - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,${DATABASE_HOST} + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},${DATABASE_HOST} networks: - univer depends_on: @@ -73,7 +73,8 @@ services: - URL_OF_SNAPSHOT_SERVICE=universer:9000 - SAVE_SHEET_SNAPSHOT_INTERVAL=50 - SAVE_DOC_SNAPSHOT_INTERVAL=50 - - no_proxy=127.0.0.1,localhost,172.30.0.0/16,universer + - ENABLE_MUTATION_APPLY_INTERCEPTOR=true + - no_proxy=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},universer expose: - 5002 - 9090 @@ -141,7 +142,7 @@ services: - POSTGRES_USER=${DATABASE_USERNAME} - POSTGRES_PWD=${DATABASE_PASSWORD} - TEMPORAL_CLI_SHOW_STACKS=1 - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16 + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET} volumes: - ./temporal/dynamicconfig:/etc/temporal/config/dynamicconfig - ./logs/temporal:/logs @@ -180,7 +181,7 @@ services: container_name: univer-worker-exchange image: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/worker-exchange:${UNIVER_WORKER_EXCHANGE_VERSION} environment: - - NO_PROXY=127.0.0.1,localhost,172.30.0.0/16,univer-temporal,univer-minio,universer + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-temporal,univer-minio,universer - TEMPORAL_SERVER=${TEMPORAL_HOST}:${TEMPORAL_PORT} - TEMPORAL_NAMESPACE=${TEMPORAL_NAMESPACE} - SERVICE_NAME=exchange-worker @@ -199,7 +200,7 @@ services: expose: - 3100 environment: - - NO_PROXY=127.0.0.1,localhost,172.32.0.0/16 + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET} command: -config.file=/etc/loki/config.yaml networks: - univer @@ -219,7 +220,7 @@ services: - ./loki/promtail:/etc/promtail:ro - /var/run/docker.sock:/var/run/docker.sock environment: - - NO_PROXY=127.0.0.1,localhost,172.32.0.0/16,univer-loki + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-loki command: -config.file=/etc/promtail/config.yml networks: - univer @@ -235,7 +236,7 @@ services: - GF_PATHS_PROVISIONING=/etc/grafana/provisioning - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME} - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} - - NO_PROXY=127.0.0.1,localhost,172.32.0.0/16,univer-loki,univer-prometheus + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET},univer-loki,univer-prometheus entrypoint: - sh - -euc @@ -286,7 +287,7 @@ services: expose: - 9090 environment: - - NO_PROXY=127.0.0.1,localhost,172.32.0.0/16 + - NO_PROXY=127.0.0.1,localhost,${DOCKER_NETWORK_SUBNET} networks: - univer volumes: @@ -358,7 +359,7 @@ networks: driver: bridge ipam: config: - - subnet: 172.30.0.0/16 + - subnet: ${DOCKER_NETWORK_SUBNET} volumes: postgres-data: diff --git a/docker-compose/run.sh b/docker-compose/run.sh index 2403fc6..17c3266 100644 --- a/docker-compose/run.sh +++ b/docker-compose/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -RELEASE_TIME="1704067201" # RELEASE_TIME +RELEASE_TIME="1729167923" # RELEASE_TIME PLATFORM=$(uname) SED="sed -i"