From fba0f78b25798c80025ebb6b483c43a4fe6717c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=96=B9=E6=88=90?= Date: Fri, 17 Oct 2025 01:14:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?ci(workflow):=20=E7=A7=BB=E9=99=A4=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=AD=A5=E9=AA=A4=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/docker.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 97a85d9..d2446d1 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -84,9 +84,6 @@ jobs: - name: Build and push docker image run: | source ${{gitea.WORKSPACE}}/deploy/.env - go clean -modcache - go mod tidy - make build-linux make docker make publish-docker make docker-run From 8ed2fdf710bb054c6dd0f5e60814ee55fdf3ecb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=96=B9=E6=88=90?= Date: Fri, 17 Oct 2025 01:16:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?build(Dockerfile):=20=E4=BC=98=E5=8C=96Go?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=B8=8B=E8=BD=BD=E5=B9=B6=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加Go环境变量配置和代理设置，并实现依赖下载的重试机制以提高构建可靠性 --- Dockerfile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b8a7b87..2593009 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,22 @@ RUN apk add --no-cache git ca-certificates tzdata # Copy go mod files COPY go.mod go.sum ./ -# Download dependencies -RUN go mod download +# Set Go environment variables and proxy +ENV GO111MODULE=on \ + CGO_ENABLED=0 \ + GOOS=linux \ + GOARCH=amd64 \ + GOPROXY=https://goproxy.cn,https://goproxy.io,direct \ + GOSUMDB=sum.golang.google.cn + +# Download dependencies with retry mechanism +RUN go mod download || \ + (echo "Retrying with different proxy..." && \ + go env -w GOPROXY=https://goproxy.io,https://mirrors.aliyun.com/goproxy/,direct && \ + go mod download) || \ + (echo "Final retry with direct mode..." && \ + go env -w GOPROXY=direct && \ + go mod download) # Copy source code COPY . . From 09ae29e6ee2e0c79140edb8b60fcc6b0e125841b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=96=B9=E6=88=90?= Date: Fri, 17 Oct 2025 01:19:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore(deploy):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=B8=BA?= =?UTF-8?q?mini-chat=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将项目名称、服务名称和域名从ddbs-service更新为mini-chat，以匹配新的服务配置 --- deploy/.env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/.env b/deploy/.env index ac0284e..4192d09 100644 --- a/deploy/.env +++ b/deploy/.env @@ -8,14 +8,14 @@ export DOCKER_COMPOSE_FILE=deploy/project/docker-compose.yaml export APIDOC_DOCKER_COMPOSE_FILE=deploy/project/swagger.yaml export ALIYUN_URL=registry.cn-shanghai.aliyuncs.com export ALI_NAMESPACE=1024studiobyzzx # 阿里云镜像仓库 命名空间 -export PROJECT_NAME=ddbs-service # 用于docker-compose文件中的项目名称 -export SERVICE_NAME=ddbs # swagger json文件名称 -export DOMAIN=ddbs.1024tool.vip +export PROJECT_NAME=mini-chat # 用于docker-compose文件中的项目名称 +export SERVICE_NAME=mini-chat # swagger json文件名称 +export DOMAIN=mini-chat.1024tool.vip export BACKEND_PREFIX=mms # nginx反向代理apidoc的前缀 # DOCKER VARS export DOCKER_PROJECT_NAME=${PROJECT_NAME}-${SERVICE_NAME} # 项目名称，需要保持全局唯一 export DOC_DOCKER_PROJECT_NAME=${PROJECT_NAME}-${SERVICE_NAME} # 接口文档容器项目名称，需要保持全局唯一 -export DOCKER_NETWORK_NAME=ddbs +export DOCKER_NETWORK_NAME=${PROJECT_NAME}-${SERVICE_NAME} # 项目网络名称，需要保持全局唯一 # API DOCKER DEFINE don't forget modify the service name in docker-compose file export API_PROJECT_BUILD_SUFFIX=api From d67119a160bd0ddcfb8eb3333955a01ebe4269a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=96=B9=E6=88=90?= Date: Fri, 17 Oct 2025 01:34:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore(deploy):=20=E6=9B=B4=E6=96=B0API?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=8F=A3=E9=85=8D=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?9991?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/.env b/deploy/.env index 4192d09..17c3767 100644 --- a/deploy/.env +++ b/deploy/.env @@ -19,8 +19,8 @@ export DOCKER_NETWORK_NAME=${PROJECT_NAME}-${SERVICE_NAME} # 项目网络名称 # API DOCKER DEFINE don't forget modify the service name in docker-compose file export API_PROJECT_BUILD_SUFFIX=api -export API_EXTERNAL_PORT=9998 -export API_INNTER_PORT=9998 +export API_EXTERNAL_PORT=9991 +export API_INNTER_PORT=9991 export API_LOG_DIR=/home/logs/${PROJECT_NAME}-${SERVICE_NAME}/${API_PROJECT_BUILD_SUFFIX} # APIDOC DOCKER DEFINE don't forget add swagger json file to api docker file export SWAGGER_INVOKE_URL=${DOMAIN}/${BACKEND_PREFIX}-${API_PROJECT_BUILD_SUFFIX} From 66205e54eea07a3e6cea30a102e6bb73f2045a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=96=B9=E6=88=90?= Date: Fri, 17 Oct 2025 01:42:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(deploy):=20=E6=9B=B4=E6=96=B0apidoc?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=BB=8E?= =?UTF-8?q?50002=E5=88=B09992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/.env b/deploy/.env index 17c3767..bbf04f1 100644 --- a/deploy/.env +++ b/deploy/.env @@ -25,7 +25,7 @@ export API_LOG_DIR=/home/logs/${PROJECT_NAME}-${SERVICE_NAME}/${API_PROJECT_BUIL # APIDOC DOCKER DEFINE don't forget add swagger json file to api docker file export SWAGGER_INVOKE_URL=${DOMAIN}/${BACKEND_PREFIX}-${API_PROJECT_BUILD_SUFFIX} # export APIDOC_MOUNT_PATH=/install/apidocs/${PROJECT_NAME}-${SERVICE_NAME} # must create a directory in host machine,it will mount to docker container -export APIDOC_PORT_DEFINE=50002 +export APIDOC_PORT_DEFINE=9992 export APIDOC_BUILD_SUFFIX=apidoc export SWAGGER_FILE_NAME=${SERVICE_NAME}.json #参照api desc中定义的service名称 export HOST_APIDOC_DIRCTORY=/install/cicd_env_files/