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 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 . . diff --git a/deploy/.env b/deploy/.env index ac0284e..bbf04f1 100644 --- a/deploy/.env +++ b/deploy/.env @@ -8,24 +8,24 @@ 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 -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} # 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/