Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ yarn-error.log*

# Node
frontend/node_modules/
frontend/.next/
frontend/package-lock.json
frontend/tsconfig.tsbuildinfo
node_modules/
.pnpm-store/
.pnpm-lock.yaml
Expand All @@ -38,6 +41,7 @@ build/

# Backend
backend/flower_db.sqlite
model-assets.tmp.*/
uploads/
test/
assets/
Expand Down
16 changes: 8 additions & 8 deletions docker/.env.example → .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ MINIO_REGION=cn-north-1
MINIO_DEFAULT_BUCKET=nexent

# Redis Config
REDIS_URL=redis://redis:6379/0
REDIS_BACKEND_URL=redis://redis:6379/1
REDIS_URL=redis://nexent-redis:6379/0
REDIS_BACKEND_URL=redis://nexent-redis:6379/1

# Model Engine Config
MODEL_ENGINE_ENABLED=false
Expand All @@ -93,14 +93,14 @@ DASHBOARD_PASSWORD=Huawei123

# Supabase db Config
SUPABASE_POSTGRES_PASSWORD=Huawei123
SUPABASE_POSTGRES_HOST=db
SUPABASE_POSTGRES_HOST=nexent-supabase-db
SUPABASE_POSTGRES_DB=supabase
SUPABASE_POSTGRES_PORT=5436

# Supabase Auth Config
SITE_URL=http://localhost:3011
SUPABASE_URL=http://supabase-kong-mini:8000
API_EXTERNAL_URL=http://supabase-kong-mini:8000
SUPABASE_URL=http://nexent-supabase-kong:8000
API_EXTERNAL_URL=http://nexent-supabase-kong:8000
DISABLE_SIGNUP=false
JWT_EXPIRY=3600
DEBUG_JWT_EXPIRE_SECONDS=0
Expand Down Expand Up @@ -176,7 +176,7 @@ MONITORING_TRACE_MAX_CHARS=4000
MONITORING_TRACE_MAX_ITEMS=20
# Service name for identifying traces in observability platforms
OTEL_SERVICE_NAME=nexent-backend
OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
OTEL_EXPORTER_OTLP_ENDPOINT=http://nexent-otel-collector:4318
# Optional signal-specific endpoints. Leave empty unless the backend requires them.
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=
Expand Down Expand Up @@ -222,7 +222,7 @@ WECHAT_OAUTH_APP_SECRET=
# Base URL for OAuth callback (e.g., http://localhost:3000 for local dev)
OAUTH_SSL_VERIFY=true
OAUTH_CA_BUNDLE=
OAUTH_CALLBACK_BASE_URL=http://localhost:3000
OAUTH_CALLBACK_BASE_URL=http://localhost:30000

# Asset owner role (opt-in; default false). Set true to enable ASSET_OWNER.
ENABLE_ASSET_OWNER_ROLE=false
Expand All @@ -231,7 +231,7 @@ ENABLE_ASSET_OWNER_ROLE=false
CAS_ENABLED=false
CAS_SERVER_URL=
CAS_VALIDATE_PATH=/p3/serviceValidate
CAS_CALLBACK_BASE_URL=http://localhost:3000
CAS_CALLBACK_BASE_URL=http://localhost:30000
# Supported values:
# - disabled: disable CAS login entry and automatic CAS redirects.
# - button: show CAS as an optional login entry.
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/auto-build-data-process-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ on:
paths:
- 'backend/**'
- 'sdk/**'
- 'make/data_process/**'
- 'deploy/images/dockerfiles/data-process/**'
- 'deploy/common/**'
- 'deploy/sql/**'
- '.github/workflows/**'
push:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'backend/**'
- 'sdk/**'
- 'make/data_process/**'
- 'deploy/images/dockerfiles/data-process/**'
- 'deploy/common/**'
- 'deploy/sql/**'
- '.github/workflows/**'

jobs:
Expand All @@ -35,7 +39,7 @@ jobs:
rm -rf .git .gitattributes
- name: Build data process image (amd64) and load locally
run: |
docker build --platform linux/amd64 -t nexent/nexent-data-process:dev-amd64 -f make/data_process/Dockerfile .
docker build --platform linux/amd64 -t nexent/nexent-data-process:dev-amd64 -f deploy/images/dockerfiles/data-process/Dockerfile .
build-data-process-arm64:
runs-on: ubuntu-24.04-arm
Expand All @@ -50,4 +54,4 @@ jobs:
rm -rf .git .gitattributes
- name: Build data process image (arm64) and load locally
run: |
docker build --platform linux/arm64 -t nexent/nexent-data-process:dev-arm64 -f make/data_process/Dockerfile .
docker build --platform linux/arm64 -t nexent/nexent-data-process:dev-arm64 -f deploy/images/dockerfiles/data-process/Dockerfile .
12 changes: 8 additions & 4 deletions .github/workflows/auto-build-main-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ on:
paths:
- 'backend/**'
- 'sdk/**'
- 'make/main/**'
- 'deploy/images/dockerfiles/main/**'
- 'deploy/common/**'
- 'deploy/sql/**'
- '.github/workflows/**'
push:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'backend/**'
- 'sdk/**'
- 'make/main/**'
- 'deploy/images/dockerfiles/main/**'
- 'deploy/common/**'
- 'deploy/sql/**'
- '.github/workflows/**'

jobs:
Expand All @@ -29,7 +33,7 @@ jobs:
uses: actions/checkout@v4
- name: Build main image (amd64) and load locally
run: |
docker build --platform linux/amd64 -t nexent/nexent:dev-amd64 -f make/main/Dockerfile .
docker build --platform linux/amd64 -t nexent/nexent:dev-amd64 -f deploy/images/dockerfiles/main/Dockerfile .

build-main-arm64:
runs-on: ubuntu-24.04-arm
Expand All @@ -38,4 +42,4 @@ jobs:
uses: actions/checkout@v4
- name: Build main image (arm64) and load locally
run: |
docker build --platform linux/arm64 -t nexent/nexent:dev-arm64 -f make/main/Dockerfile .
docker build --platform linux/arm64 -t nexent/nexent:dev-arm64 -f deploy/images/dockerfiles/main/Dockerfile .
8 changes: 4 additions & 4 deletions .github/workflows/auto-build-mcp-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ on:
paths:
- 'backend/**'
- 'sdk/**'
- 'make/mcp/**'
- 'deploy/images/dockerfiles/mcp/**'
- '.github/workflows/**'
push:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'backend/**'
- 'sdk/**'
- 'make/mcp/**'
- 'deploy/images/dockerfiles/mcp/**'
- '.github/workflows/**'

jobs:
Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v4
- name: Build MCP image (amd64) and load locally
run: |
docker build --platform linux/amd64 -t nexent/nexent-mcp:dev-amd64 -f make/mcp/Dockerfile .
docker build --platform linux/amd64 -t nexent/nexent-mcp:dev-amd64 -f deploy/images/dockerfiles/mcp/Dockerfile .
build-mcp-arm64:
runs-on: ubuntu-24.04-arm
Expand All @@ -38,6 +38,6 @@ jobs:
uses: actions/checkout@v4
- name: Build MCP image (arm64) and load locally
run: |
docker build --platform linux/arm64 -t nexent/nexent-mcp:dev-arm64 -f make/mcp/Dockerfile .
docker build --platform linux/arm64 -t nexent/nexent-mcp:dev-arm64 -f deploy/images/dockerfiles/mcp/Dockerfile .
8 changes: 4 additions & 4 deletions .github/workflows/auto-build-terminal-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:
pull_request:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'make/terminal/**'
- 'deploy/images/dockerfiles/terminal/**'
- '.github/workflows/**'
push:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'make/terminal/**'
- 'deploy/images/dockerfiles/terminal/**'
- '.github/workflows/**'

jobs:
Expand All @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v4
- name: Build terminal image (amd64) and load locally
run: |
docker build --platform linux/amd64 -t nexent/nexent-ubuntu-terminal:dev-amd64 -f make/terminal/Dockerfile .
docker build --platform linux/amd64 -t nexent/nexent-ubuntu-terminal:dev-amd64 -f deploy/images/dockerfiles/terminal/Dockerfile .

build-terminal-arm64:
runs-on: ubuntu-24.04-arm
Expand All @@ -34,4 +34,4 @@ jobs:
uses: actions/checkout@v4
- name: Build terminal image (arm64) and load locally
run: |
docker build --platform linux/arm64 -t nexent/nexent-ubuntu-terminal:dev-arm64 -f make/terminal/Dockerfile .
docker build --platform linux/arm64 -t nexent/nexent-ubuntu-terminal:dev-arm64 -f deploy/images/dockerfiles/terminal/Dockerfile .
8 changes: 4 additions & 4 deletions .github/workflows/auto-build-web-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ on:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'frontend/**'
- 'make/web/**'
- 'deploy/images/dockerfiles/web/**'
- '.github/workflows/**'
push:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'frontend/**'
- 'make/web/**'
- 'deploy/images/dockerfiles/web/**'
- '.github/workflows/**'

jobs:
Expand All @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v4
- name: Build web image (amd64) and load locally
run: |
docker build --platform linux/amd64 -t nexent/nexent-web:dev-amd64 -f make/web/Dockerfile .
docker build --platform linux/amd64 -t nexent/nexent-web:dev-amd64 -f deploy/images/dockerfiles/web/Dockerfile .

build-web-arm64:
runs-on: ubuntu-24.04-arm
Expand All @@ -36,4 +36,4 @@ jobs:
uses: actions/checkout@v4
- name: Build web image (arm64) and load locally
run: |
docker build --platform linux/arm64 -t nexent/nexent-web:dev-arm64 -f make/web/Dockerfile .
docker build --platform linux/arm64 -t nexent/nexent-web:dev-arm64 -f deploy/images/dockerfiles/web/Dockerfile .
16 changes: 16 additions & 0 deletions .github/workflows/auto-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,23 @@ on:
paths:
- 'backend/**'
- 'sdk/**'
- 'deploy/common/**'
- 'deploy/tests/**'
- 'deploy/offline/**'
- 'deploy/docker/**'
- 'deploy/k8s/**'
- 'test/**'
- '.github/workflows/**'
push:
branches: [develop, 'release/**', 'hotfix/**']
paths:
- 'backend/**'
- 'sdk/**'
- 'deploy/common/**'
- 'deploy/tests/**'
- 'deploy/offline/**'
- 'deploy/docker/**'
- 'deploy/k8s/**'
- 'test/**'
- '.github/workflows/**'

Expand All @@ -41,6 +51,12 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Run deployment script tests
run: |
bash deploy/tests/test_common.sh
bash deploy/tests/test_sql_migrations.sh
bash deploy/tests/test_build_offline_package.sh

- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
Loading
Loading