diff --git a/docker-compose.yml b/docker-compose.yml index 9fb68d9..66d4928 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,8 @@ services: DATABASE_PORT: ${DATABASE_PORT:-15432} SECRET_KEY: ${SECRET_KEY:-change-this-secret-key} DEBUG: ${DEBUG:-False} - image: hospital-performance-backend:${DOCKER_TAG:-latest} - container_name: hospital-performance-backend + image: hospital_performance_backend:${DOCKER_TAG:-latest} + container_name: hospital_performance_backend restart: unless-stopped ports: - "${BACKEND_PORT:-8000}:8000" @@ -36,8 +36,8 @@ services: build: context: . dockerfile: Dockerfile.frontend - image: hospital-performance-frontend:${DOCKER_TAG:-latest} - container_name: hospital-performance-frontend + image: hospital_performance_frontend:${DOCKER_TAG:-latest} + container_name: hospital_performance_frontend restart: unless-stopped ports: - "${FRONTEND_PORT:-80}:80" diff --git a/spug/deploy-docker-compose.sh b/spug/deploy-docker-compose.sh index e6523e5..3e6294f 100644 --- a/spug/deploy-docker-compose.sh +++ b/spug/deploy-docker-compose.sh @@ -11,7 +11,7 @@ GIT_BRANCH="${SPUG_GIT_BRANCH:-main}" # Docker 配置 DOCKER_TAG="${DOCKER_TAG:-latest}" -COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-hospital-performance}" +COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-hospital_performance}" # 环境变量 export DATABASE_HOST="${DATABASE_HOST:-192.168.110.252}" diff --git a/spug/deploy-docker.sh b/spug/deploy-docker.sh index 10ec300..43c5a83 100644 --- a/spug/deploy-docker.sh +++ b/spug/deploy-docker.sh @@ -7,10 +7,10 @@ set -e # ==================== 配置参数 ==================== # 项目配置 -PROJECT_NAME="${SPUG_APP_NAME:-hospital-performance}" +PROJECT_NAME="${SPUG_APP_NAME:-hospital_performance}" PROJECT_DIR="${SPUG_DEPLOY_DIR:-/var/www/hospital-performance}" DOCKER_REGISTRY="${DOCKER_REGISTRY:-}" # 可选:私有仓库地址 -DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME:-hospital-performance}" +DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME:-hospital_performance}" DOCKER_TAG="${DOCKER_TAG:-latest}" # Git 配置 @@ -24,10 +24,10 @@ fi GIT_BRANCH="${SPUG_GIT_BRANCH:-main}" # Docker 配置 -DOCKER_NETWORK="${DOCKER_NETWORK:-hospital-network}" +DOCKER_NETWORK="${DOCKER_NETWORK:-hospital_network}" DOCKER_BACKEND_PORT="${DOCKER_BACKEND_PORT:-8000}" DOCKER_FRONTEND_PORT="${DOCKER_FRONTEND_PORT:-80}" -CONTAINER_NAME="${CONTAINER_NAME:-hospital-performance}" +CONTAINER_NAME="${CONTAINER_NAME:-hospital_performance}" # 数据库配置(从环境变量获取) DATABASE_HOST="${DATABASE_HOST:-192.168.110.252}"