diff --git a/Makefile b/Makefile index 85d4d0262..d93aea93f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PNPM ?= pnpm TAURI_DEV_PORT ?= 1420 -.PHONY: help install docs-install check-tauri-dev-port dev dev-fast dev-web dev-backend build package docs docs-build check test cargo-check-fast cargo-test-fast db db-list db-verify db-down db-reset db-check db-completion +.PHONY: help install docs-install check-tauri-dev-port dev dev-fast dev-web dev-backend build package clean docs docs-build check test cargo-check-fast cargo-test-fast db db-list db-verify db-down db-reset db-check db-completion export DB export DB_VERSION @@ -30,6 +30,7 @@ help: @printf ' %-23s %s\n' 'make dev-backend' 'Start the web backend development server' @printf ' %-23s %s\n' 'make build' 'Run type checks and build the desktop frontend' @printf ' %-23s %s\n' 'make package' 'Build the desktop app package' + @printf ' %-23s %s\n' 'make clean' 'Remove local Rust build artifacts and caches' @printf '%s\n' '' @printf '%s\n' 'Docs:' @printf ' %-23s %s\n' 'make docs' 'Start the documentation site development server' @@ -88,6 +89,9 @@ build: node_modules/.modules.yaml package: node_modules/.modules.yaml $(PNPM) tauri build +clean: + cargo clean + docs: docs/node_modules/.modules.yaml cd docs && ./node_modules/.bin/next dev --hostname 127.0.0.1 diff --git a/deploy/database/clickhouse/24.8/compose.yaml b/deploy/database/clickhouse/24.8/compose.yaml index 40c7b2782..b60ff25e4 100644 --- a/deploy/database/clickhouse/24.8/compose.yaml +++ b/deploy/database/clickhouse/24.8/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/clickhouse-server:24.8.14.39 container_name: dbx-clickhouse-24.8 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-8124}:8123" environment: diff --git a/deploy/database/etcd/3.7/compose.yaml b/deploy/database/etcd/3.7/compose.yaml index 0b3247d29..d69c47313 100644 --- a/deploy/database/etcd/3.7/compose.yaml +++ b/deploy/database/etcd/3.7/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/etcd:v3.7.0 container_name: dbx-etcd-3.7 + restart: always command: - /usr/local/bin/etcd - --name=s1 diff --git a/deploy/database/kafka/4.3/compose.yaml b/deploy/database/kafka/4.3/compose.yaml index 0964abea5..4e0f5c95d 100644 --- a/deploy/database/kafka/4.3/compose.yaml +++ b/deploy/database/kafka/4.3/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/kafka:4.3.1 container_name: dbx-kafka-4.3 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-9093}:9092" environment: diff --git a/deploy/database/mariadb/10.11/compose.yaml b/deploy/database/mariadb/10.11/compose.yaml index 539e3d866..7c9086b16 100644 --- a/deploy/database/mariadb/10.11/compose.yaml +++ b/deploy/database/mariadb/10.11/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/mariadb:10.11.11 container_name: dbx-mariadb-10.11 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-3307}:3306" environment: diff --git a/deploy/database/mongodb/5.0/compose.yaml b/deploy/database/mongodb/5.0/compose.yaml index 61f6c6e64..62fdc4f81 100644 --- a/deploy/database/mongodb/5.0/compose.yaml +++ b/deploy/database/mongodb/5.0/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/mongo:5.0.5 container_name: dbx-mongodb-5.0 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-27018}:27017" environment: diff --git a/deploy/database/mongodb/8.2/compose.yaml b/deploy/database/mongodb/8.2/compose.yaml index e257523b9..f0189ac3e 100644 --- a/deploy/database/mongodb/8.2/compose.yaml +++ b/deploy/database/mongodb/8.2/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/mongo:8.2.3-noble container_name: dbx-mongodb-8.2 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-27018}:27017" environment: diff --git a/deploy/database/mysql/5.7/compose.yaml b/deploy/database/mysql/5.7/compose.yaml index b931107c7..de3356b42 100644 --- a/deploy/database/mysql/5.7/compose.yaml +++ b/deploy/database/mysql/5.7/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/mysql:5.7.44 container_name: dbx-mysql-5.7 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-3307}:3306" environment: diff --git a/deploy/database/mysql/8.4/compose.yaml b/deploy/database/mysql/8.4/compose.yaml index 1693c1124..f56d08dbe 100644 --- a/deploy/database/mysql/8.4/compose.yaml +++ b/deploy/database/mysql/8.4/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/mysql:8.4.6 container_name: dbx-mysql-8.4 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-3307}:3306" environment: diff --git a/deploy/database/nacos/2.5/compose.yaml b/deploy/database/nacos/2.5/compose.yaml index 57fa7dfb4..15334cb12 100644 --- a/deploy/database/nacos/2.5/compose.yaml +++ b/deploy/database/nacos/2.5/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/nacos-server:v2.5.2 container_name: dbx-nacos-2.5 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-8849}:8848" - "${DB_BIND_ADDRESS:-127.0.0.1}:${NACOS_GRPC_PORT:-9849}:9848" diff --git a/deploy/database/nacos/3.2/compose.yaml b/deploy/database/nacos/3.2/compose.yaml index 7a7235a75..ebca1c218 100644 --- a/deploy/database/nacos/3.2/compose.yaml +++ b/deploy/database/nacos/3.2/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/nacos-server:v3.2.2 container_name: dbx-nacos-3.2 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${NACOS_CONSOLE_PORT:-8010}:8080" - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-8849}:8848" diff --git a/deploy/database/postgresql/14.23/compose.yaml b/deploy/database/postgresql/14.23/compose.yaml index d0a4a57d8..ab2aeb61f 100644 --- a/deploy/database/postgresql/14.23/compose.yaml +++ b/deploy/database/postgresql/14.23/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/postgres:14.23 container_name: dbx-postgresql-14.23 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-5433}:5432" environment: diff --git a/deploy/database/postgresql/17.4/compose.yaml b/deploy/database/postgresql/17.4/compose.yaml index fc2d149c0..f10187f77 100644 --- a/deploy/database/postgresql/17.4/compose.yaml +++ b/deploy/database/postgresql/17.4/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/postgres:17.4 container_name: dbx-postgresql-17.4 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-5433}:5432" environment: diff --git a/deploy/database/pulsar/4.2/compose.yaml b/deploy/database/pulsar/4.2/compose.yaml index 0d95f3e0c..bacf412d5 100644 --- a/deploy/database/pulsar/4.2/compose.yaml +++ b/deploy/database/pulsar/4.2/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/pulsar:4.2.3 container_name: dbx-pulsar-4.2 + restart: always command: ["bin/pulsar", "standalone", "--advertised-address", "localhost"] ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-6651}:6650" diff --git a/deploy/database/qdrant/1.8/compose.yaml b/deploy/database/qdrant/1.8/compose.yaml index 88131c2f9..ce8436d91 100644 --- a/deploy/database/qdrant/1.8/compose.yaml +++ b/deploy/database/qdrant/1.8/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/qdrant:v1.8.3 container_name: dbx-qdrant-1.8 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-6334}:6333" - "${DB_BIND_ADDRESS:-127.0.0.1}:${QDRANT_GRPC_PORT:-6335}:6334" diff --git a/deploy/database/redis/3.0.7/compose.yaml b/deploy/database/redis/3.0.7/compose.yaml index c7f51070d..e1aee938f 100644 --- a/deploy/database/redis/3.0.7/compose.yaml +++ b/deploy/database/redis/3.0.7/compose.yaml @@ -3,6 +3,7 @@ services: image: docker.cnb.cool/znb/images/redis:3.0.7-alpine platform: linux/amd64 container_name: dbx-redis-3.0.7 + restart: always command: ["redis-server", "--appendonly", "yes", "--requirepass", "${DB_PASSWORD:-123456}"] environment: # Keep the password in container env so CMD-SHELL can quote it safely. diff --git a/deploy/database/redis/7.4/compose.yaml b/deploy/database/redis/7.4/compose.yaml index 2a1515216..545f94c60 100644 --- a/deploy/database/redis/7.4/compose.yaml +++ b/deploy/database/redis/7.4/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/redis:7.4.9-alpine container_name: dbx-redis-7.4 + restart: always command: ["redis-server", "--appendonly", "yes", "--requirepass", "${DB_PASSWORD:-123456}"] environment: # Keep the password in container env so CMD-SHELL can quote it safely. diff --git a/deploy/database/zookeeper/3.9/compose.yaml b/deploy/database/zookeeper/3.9/compose.yaml index ba8df7ebd..e60eb960d 100644 --- a/deploy/database/zookeeper/3.9/compose.yaml +++ b/deploy/database/zookeeper/3.9/compose.yaml @@ -2,6 +2,7 @@ services: database: image: docker.cnb.cool/znb/images/zookeeper:3.9.5 container_name: dbx-zookeeper-3.9 + restart: always ports: - "${DB_BIND_ADDRESS:-127.0.0.1}:${DB_PORT:-2182}:2181" volumes: