diff --git a/deploy/.env b/deploy/.env index 7820b24..c62130d 100644 --- a/deploy/.env +++ b/deploy/.env @@ -19,7 +19,7 @@ export DOCKER_COMPOSE_FILE=deploy/project/docker-compose.yaml # DOCKER VARS export DOCKER_PROJECT_NAME=${PROJECT_NAME}-${SERVICE_NAME} # 项目名称,需要保持全局唯一 -export DOCKER_NETWORK_NAME=ppanel +export DOCKER_NETWORK_NAME=ppanel-script_ppanel-network # API DOCKER DEFINE don't forget modify the service name in docker-compose file export API_PROJECT_BUILD_SUFFIX=api export API_LOG_DIR=/home/logs/${PROJECT_NAME}-${SERVICE_NAME}/${API_PROJECT_BUILD_SUFFIX} diff --git a/etc/ppanel.yaml b/etc/ppanel.yaml index b419d08..61dc3a8 100644 --- a/etc/ppanel.yaml +++ b/etc/ppanel.yaml @@ -25,7 +25,7 @@ Logger: Rotation: daily FileTimeFormat: 2006-01-02T15:04:05.000Z07:00 MySQL: - Addr: localhost:3306 + Addr: mysql_db:3306 Username: root Password: "123456" Dbname: ppanel_admin @@ -34,6 +34,6 @@ MySQL: MaxOpenConns: 10 SlowThreshold: 1000 Redis: - Host: 127.0.0.1:6379 + Host: redis_cache:6379 Pass: "" DB: 0