diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index eacea5d..e7de1ab 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -69,6 +69,8 @@ jobs: go env -w GOPRIVATE="${{ vars.DOMAIN_OF_GITEA}}" go env -w GOSUMDB=off git config --global url."https://${{ env.GIT_USERNAME }}:${{ env.GIT_PASSWORD }}@${{ vars.DOMAIN_OF_GITEA}}/".insteadOf "https://${{ vars.DOMAIN_OF_GITEA}}/" + go clean -modcache + rm -rf go.sum - name: Build and push docker image run: | diff --git a/deploy/.env b/deploy/.env index 047c458..0fbdb54 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-script_ppanel-network +export DOCKER_NETWORK_NAME=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 8bcaf03..7060440 100644 --- a/etc/ppanel.yaml +++ b/etc/ppanel.yaml @@ -25,15 +25,15 @@ Logger: Rotation: daily FileTimeFormat: 2006-01-02T15:04:05.000Z07:00 MySQL: - Addr: 172.245.180.199:3306 - Username: root - Password: 123456 + Addr: ppanel-db:3306 + Username: ppanel + Password: ppanelpassword Dbname: ppanel Config: charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai MaxIdleConns: 10 MaxOpenConns: 10 SlowThreshold: 1000 Redis: - Host: 172.245.180.199:6379 + Host: redis:6379 Pass: DB: 0