diff --git a/Makefile b/Makefile index d3c7e57..f753010 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ publish-docker: # Publish docker image | 发布 docker 镜像 docker-run: # Publish docker image | 发布 docker 镜像 docker rm -f ${API_CONTAINER_NAME} @echo "pwd: $(pwd)" - docker-compose -p ${DOCKER_PROJECT_NAME} -f ${DOCKER_COMPOSE_FILE} up -d + docker compose -p ${DOCKER_PROJECT_NAME} -f ${DOCKER_COMPOSE_FILE} up -d @echo "docker run successfully" diff --git a/deploy/project/docker-compose.yaml b/deploy/project/docker-compose.yaml index 5ed9759..ae3a60a 100644 --- a/deploy/project/docker-compose.yaml +++ b/deploy/project/docker-compose.yaml @@ -8,6 +8,8 @@ services: - ${API_EXTERNAL_PORT}:${API_INNER_PORT} volumes: - ${API_LOG_DIR}:/app/logs + environment: + - TZ=Asia/Shanghai networks: default: diff --git a/etc/ppanel.yaml b/etc/ppanel.yaml index c87acf4..cb4004a 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:3306 Username: root Password: 123456 Dbname: ppanel @@ -34,6 +34,6 @@ MySQL: MaxOpenConns: 10 SlowThreshold: 1000 Redis: - Host: localhost:6379 + Host: redis:6379 Pass: DB: 0