Skip to content
Draft

v6.2 #84

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions compose/.env-release
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ REDIS_PASSWORD=
# shared secret for secure communication
JWT_PRIVATE_KEY=

SECRET_KEY=
11 changes: 2 additions & 9 deletions compose/seatable-ai-standalone.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
services:
seatable-ai:
image: ${SEATABLE_AI_IMAGE:-seatable/seatable-ai:6.1.8}
image: ${SEATABLE_AI_IMAGE:-seatable/seatable-ai:6.2.9-testing}
restart: unless-stopped
container_name: seatable-ai
volumes:
- ${SEATABLE_AI_VOLUME:-/opt/seatable-ai/}:/shared
- /opt/seatable-server:/shared
ports:
- "8888:8888"
environment:
Expand All @@ -22,14 +22,7 @@ services:
- SEATABLE_SERVER_URL=${SEATABLE_SERVER_URL:?Variable is not set or empty}
- INNER_DTABLE_SERVER_URL=${INNER_DTABLE_SERVER_URL:?Variable is not set or empty}
- INNER_DTABLE_DB_URL=${INNER_DTABLE_DB_URL:?Variable is not set or empty}
- SEATABLE_AI_LLM_TYPE=${SEATABLE_AI_LLM_TYPE:?Variable is not set or empty}
- SEATABLE_AI_LLM_URL=${SEATABLE_AI_LLM_URL:-}
- SEATABLE_AI_LLM_KEY=${SEATABLE_AI_LLM_KEY:-}
- SEATABLE_AI_LLM_MODEL=${SEATABLE_AI_LLM_MODEL:?Variable is not set or empty}
- SEATABLE_AI_LLM_TIMEOUT=${SEATABLE_AI_LLM_TIMEOUT:-180}
- ENABLE_SEARCH=${ENABLE_SEARCH:-false}
- SEASEARCH_SERVER_URL=${SEASEARCH_SERVER_URL:-}
- SEASEARCH_TOKEN=${SEASEARCH_TOKEN:-}
healthcheck:
test: ["CMD-SHELL", "curl --fail http://localhost:8888 || exit 1"]
interval: 20s
Expand Down
11 changes: 2 additions & 9 deletions compose/seatable-ai.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
services:
seatable-ai:
image: ${SEATABLE_AI_IMAGE:-seatable/seatable-ai:6.1.8}
image: ${SEATABLE_AI_IMAGE:-seatable/seatable-ai:6.2.9-testing}
restart: unless-stopped
container_name: seatable-ai
volumes:
- ${SEATABLE_AI_VOLUME:-/opt/seatable-ai/}:/shared
- /opt/seatable-server:/shared
environment:
- TIME_ZONE=${TIME_ZONE}
- SEATABLE_MYSQL_DB_HOST=${MARIADB_HOST:-mariadb}
Expand All @@ -20,14 +20,7 @@ services:
- SEATABLE_SERVER_URL=${SEATABLE_SERVER_URL:-http://seatable-server}
- INNER_DTABLE_SERVER_URL=${INNER_DTABLE_SERVER_URL:-http://seatable-server:5000}
- INNER_DTABLE_DB_URL=${INNER_DTABLE_DB_URL:-http://seatable-server:7777}
- SEATABLE_AI_LLM_TYPE=${SEATABLE_AI_LLM_TYPE:?Variable is not set or empty}
- SEATABLE_AI_LLM_URL=${SEATABLE_AI_LLM_URL:-}
- SEATABLE_AI_LLM_KEY=${SEATABLE_AI_LLM_KEY:-}
- SEATABLE_AI_LLM_MODEL=${SEATABLE_AI_LLM_MODEL:?Variable is not set or empty}
- SEATABLE_AI_LLM_TIMEOUT=${SEATABLE_AI_LLM_TIMEOUT:-180}
- ENABLE_SEARCH=${ENABLE_SEARCH:-false}
- SEASEARCH_SERVER_URL=${SEASEARCH_SERVER_URL:-}
- SEASEARCH_TOKEN=${SEASEARCH_TOKEN:-}
depends_on:
- mariadb
- redis
Expand Down
45 changes: 45 additions & 0 deletions compose/seatable-html-server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
services:
seatable-html-server:
image: ${APP_SERVER_IMAGE:-seatable/custom-app-server:6.2.10-testing}
restart: unless-stopped
container_name: seatable-html-server
volumes:
- /opt/seatable-server:/shared
environment:
- TZ=${TIME_ZONE:?Variable is not set or empty}
- SEATABLE_MYSQL_DB_HOST=${MARIADB_HOST:-mariadb}
- SEATABLE_MYSQL_DB_PORT=${MARIADB_PORT:-3306}
- SEATABLE_MYSQL_DB_USER=root
- SEATABLE_MYSQL_DB_PASSWORD=${MARIADB_PASSWORD:?Variable is not set or empty}
- SEATABLE_MYSQL_DB_DTABLE_DB_NAME=${SEATABLE_MYSQL_DB_DTABLE_DB_NAME:-dtable_db}
- SEATABLE_MYSQL_DB_SEAFILE_DB_NAME=${SEATABLE_MYSQL_DB_SEAFILE_DB_NAME:-seafile_db}
- SEATABLE_MYSQL_DB_CCNET_DB_NAME=${SEATABLE_MYSQL_DB_CCNET_DB_NAME:-ccnet_db}
- CACHE_PROVIDER=${CACHE_PROVIDER:-redis}
- REDIS_HOST=${REDIS_HOST:-redis}
- REDIS_PORT=${REDIS_PORT:-6379}
- REDIS_PASSWORD=${REDIS_PASSWORD:-}
- JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty}
- INNER_DTABLE_SERVER_URL=${INNER_DTABLE_SERVER_URL:-http://seatable-server:5000}
- INNER_DTABLE_DB_URL=${INNER_DTABLE_DB_URL:-http://seatable-server:7777}
- DTABLE_WEB_SERVICE_URL=${SEATABLE_SERVER_PROTOCOL:-https}://${SEATABLE_SERVER_HOSTNAME:?Variable is not set or empty}
- NON_ROOT=${NON_ROOT:-false}
- SEATABLE_LOG_TO_STDOUT=${LOG_TO_STDOUT:-false}
depends_on:
mariadb:
condition: service_healthy
redis:
condition: service_healthy
networks:
- frontend-net
- backend-seatable-net
healthcheck:
test: ["CMD-SHELL", "curl -f http://127.0.0.1:8088/ping || exit 1"]
interval: 30s
timeout: 10s
retries: 3
start_period: 10s
labels:
caddy: ${SEATABLE_SERVER_PROTOCOL:-https}://${SEATABLE_SERVER_HOSTNAME}
caddy.route: /app-server/*
caddy.route.handle_path: /app-server/*
caddy.route.handle_path.reverse_proxy: "{{upstreams 8088}}"
1 change: 1 addition & 0 deletions compose/seatable-s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ services:
seatable-server:
environment:
- STORAGE_TYPE=s3
- S3_AVATAR_BUCKET=${S3_AVATAR_BUCKET:?Variable is not set or empty}
- S3_STORAGE_BUCKET=${S3_STORAGE_BUCKET:?Variable is not set or empty}
- S3_COMMIT_BUCKET=${S3_COMMIT_BUCKET:?Variable is not set or empty}
- S3_FS_BUCKET=${S3_FS_BUCKET:?Variable is not set or empty}
Expand Down
5 changes: 3 additions & 2 deletions compose/seatable-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ services:
- REDIS_PORT=${REDIS_PORT:-6379}
- REDIS_PASSWORD=${REDIS_PASSWORD:?Variable is not set or empty}
- JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty}
- SECRET_KEY=${SECRET_KEY:?Variable is not set or empty}
- SEATABLE_SERVER_HOSTNAME=${SEATABLE_SERVER_HOSTNAME:?Variable is not set or empty}
- SEATABLE_SERVER_PROTOCOL=${SEATABLE_SERVER_PROTOCOL:-https}
- SEATABLE_ADMIN_EMAIL=${SEATABLE_ADMIN_EMAIL:?Variable is not set or empty}
Expand All @@ -48,9 +49,9 @@ services:
- SEATABLE_TEMPLATE_TABLE_NAME=${SEATABLE_TEMPLATE_TABLE_NAME:-}
- SEATABLE_ENABLE_CREATE_BASE_FROM_TEMPLATE=${SEATABLE_ENABLE_CREATE_BASE_FROM_TEMPLATE:-}
- SEATABLE_HELP_LINK=${SEATABLE_HELP_LINK:-https://help.seatable.com}
- SEATABLE_LOG_LEVEL=${SEATABLE_LOG_LEVEL:-INFO}
- LOG_LEVEL=${LOG_LEVEL:-INFO}
- ENABLE_SEATABLE_AI=${ENABLE_SEATABLE_AI:-false}
- SEATABLE_AI_SERVER_URL=${SEATABLE_AI_SERVER_URL:-http://seatable-ai:8888}
- INNER_SEATABLE_AI_SERVER_URL=${INNER_SEATABLE_AI_SERVER_URL:-http://seatable-ai:8888}
labels:
caddy_0: ${SEATABLE_SERVER_PROTOCOL:-https}://${SEATABLE_SERVER_HOSTNAME:?Variable is not set or empty}
caddy_0.reverse_proxy: "{{upstreams 80}}"
Expand Down