fix: isolate backend compose project
This commit is contained in:
1 parent
ac0d3856f0
commit
78d06d0ba0
3 files changed
+43
-5
No files matched your search
@@ -42,14 +42,12 @@ docker compose --env-file compose/.env \
|
|||||||
compose/.env \
|
compose/.env \
|
||||||
/srv/ai-soulmate/sources/ai-soulmate-server
|
/srv/ai-soulmate/sources/ai-soulmate-server
|
||||||
|
|
||||||
docker compose --env-file compose/.env \
|
./scripts/start-backend.sh compose/.env
|
||||||
-f compose/docker-compose.backend.yml \
|
|
||||||
up -d
|
|
||||||
|
|
||||||
./scripts/verify-backend.sh compose/.env
|
./scripts/verify-backend.sh compose/.env
|
||||||
```
|
```
|
||||||
|
|
||||||
构建脚本拒绝错误分支、受跟踪源码改动以及与源码提交不一致的镜像标签。后端验证会检查 HTTP 健康状态,以及容器到 PostgreSQL、Redis 和 MinIO Bucket 的实际连接。
|
构建脚本拒绝错误分支、受跟踪源码改动以及与源码提交不一致的镜像标签。启动和验证脚本显式使用独立的 Compose 项目名,防止基础设施被误判为后端的孤立容器。后端验证会检查 HTTP 健康状态,以及容器到 PostgreSQL、Redis 和 MinIO Bucket 的实际连接。
|
||||||
|
|
||||||
## 当前网络边界
|
## 当前网络边界
|
||||||
|
|
||||||
|
|||||||
Executable
+30
@@ -0,0 +1,30 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
env_file="${1:-compose/.env}"
|
||||||
|
compose_file="${BACKEND_COMPOSE_FILE:-compose/docker-compose.backend.yml}"
|
||||||
|
|
||||||
|
if [[ ! -r "$env_file" ]]; then
|
||||||
|
printf 'Environment file not found: %s\n' "$env_file" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
env_value() {
|
||||||
|
sed -n "s/^${1}=//p" "$env_file" | head -n 1
|
||||||
|
}
|
||||||
|
|
||||||
|
project_name="$(env_value BACKEND_COMPOSE_PROJECT_NAME)"
|
||||||
|
if [[ -z "$project_name" || "$project_name" == "$(env_value COMPOSE_PROJECT_NAME)" ]]; then
|
||||||
|
printf 'BACKEND_COMPOSE_PROJECT_NAME must be set and differ from the infrastructure project.\n' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
compose_command=(
|
||||||
|
docker compose
|
||||||
|
--project-name "$project_name"
|
||||||
|
--env-file "$env_file"
|
||||||
|
-f "$compose_file"
|
||||||
|
)
|
||||||
|
"${compose_command[@]}" config --quiet
|
||||||
|
"${compose_command[@]}" up -d
|
||||||
|
"${compose_command[@]}" ps --all
|
||||||
@@ -22,7 +22,17 @@ env_value() {
|
|||||||
backend_bind_address="$(env_value BACKEND_BIND_ADDRESS)"
|
backend_bind_address="$(env_value BACKEND_BIND_ADDRESS)"
|
||||||
backend_host_port="$(env_value BACKEND_HOST_PORT)"
|
backend_host_port="$(env_value BACKEND_HOST_PORT)"
|
||||||
oss_public_endpoint="$(env_value OSS_PUBLIC_ENDPOINT)"
|
oss_public_endpoint="$(env_value OSS_PUBLIC_ENDPOINT)"
|
||||||
compose_command=(docker compose --env-file "$env_file" -f "$compose_file")
|
project_name="$(env_value BACKEND_COMPOSE_PROJECT_NAME)"
|
||||||
|
if [[ -z "$project_name" || "$project_name" == "$(env_value COMPOSE_PROJECT_NAME)" ]]; then
|
||||||
|
printf 'BACKEND_COMPOSE_PROJECT_NAME must be set and differ from the infrastructure project.\n' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
compose_command=(
|
||||||
|
docker compose
|
||||||
|
--project-name "$project_name"
|
||||||
|
--env-file "$env_file"
|
||||||
|
-f "$compose_file"
|
||||||
|
)
|
||||||
|
|
||||||
"${compose_command[@]}" config --quiet
|
"${compose_command[@]}" config --quiet
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user