diff --git a/.gitignore b/.gitignore index 47d6e36c..94eaa49f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,4 @@ buf.lock configs/tenanter.yaml log/ -/go_build_gitlink_org_cn_JCCE_PCM /cache/ diff --git a/Makefile b/Makefile index bbbb7e0c..1d87b2d5 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,9 @@ pcm-core-api: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-api adaptor/PCM-CORE/api/pcm.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-api api/pcm.go pcm-core-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-rpc adaptor/PCM-CORE/rpc/pcmcore.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-rpc rpc/pcmcore.go -pcm-ac-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ac adaptor/PCM-HPC/PCM-AC/rpc/hpcac.go +all-build: pcm-core-rpc pcm-core-api -pcm-kubenative-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-kubenative adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/pcmkubenative.go - -pcm-modelarts-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-modelarts adaptor/PCM-AI/PCM-MODELARTS/rpc/pcmmodelarts.go - -pcm-ceph-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ceph adaptor/PCM-STORAGE/PCM-CEPH/rpc/pcmceph.go - -all-build: pcm-core-rpc pcm-core-api pcm-ac-rpc pcm-kubenative-rpc pcm-modelarts-rpc pcm-ceph-rpc - -.PHONY: pcm-core-rpc pcm-core-api pcm-ac-rpc pcm-kubenative-rpc pcm-modelarts-rpc pcm-ceph-rpc \ No newline at end of file +.PHONY: pcm-core-rpc pcm-core-api \ No newline at end of file diff --git a/api/Dockerfile b/api/Dockerfile index 11153a75..a4372ef0 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,40 +1,29 @@ FROM golang:1.21.2-alpine3.18 AS builder -LABEL stage=gobuilder - -ENV CGO_ENABLED 0 -ENV GOARCH amd64 -ENV GOPROXY https://goproxy.cn,direct - -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update --no-cache && apk add --no-cache tzdata - WORKDIR /app -ADD go.mod . -ADD go.sum . -RUN go mod download COPY . . -COPY api/etc/ /app/ + +RUN go env -w GO111MODULE=on \ +&& go env -w GOPROXY=https://goproxy.cn,direct \ +&& go env -w CGO_ENABLED=0 \ +&& go mod download RUN go build -o pcm-coordinator-api /app/api/pcm.go +FROM alpine:3.18 -FROM alpine:3.16.2 WORKDIR /app - #修改alpine源为上海交通大学 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update && \ - apk upgrade && \ - apk add --no-cache ca-certificates && update-ca-certificates && \ - apk add --update tzdata && \ - rm -rf /var/cache/apk/* + apk add --no-cache ca-certificates tzdata && \ + update-ca-certificates && \ + rm -rf /var/cache/apk/* -COPY --from=builder /app/pcm-coordinator-api . -COPY api/etc/pcm.yaml . +COPY --from=builder /app/pcm-coordinator-api /app/ +COPY --from=builder /app/api/etc/pcm.yaml /app/ ENV TZ=Asia/Shanghai EXPOSE 8999 -ENTRYPOINT ./pcm-coordinator-api -f pcm.yaml \ No newline at end of file +ENTRYPOINT ["./pcm-coordinator-api", "-f", "pcm.yaml"] \ No newline at end of file diff --git a/api/internal/logic/core/pushtaskinfologic.go b/api/internal/logic/core/pushtaskinfologic.go index ff5a102f..63169a86 100644 --- a/api/internal/logic/core/pushtaskinfologic.go +++ b/api/internal/logic/core/pushtaskinfologic.go @@ -106,7 +106,7 @@ func syncTask(gorm *gorm.DB, noticeInfo clientCore.NoticeInfo) { if tx.Error != nil { logx.Error(tx.Error) } - + allStatus = strings.ToUpper(allStatus) for pcmStatus, ProviderStatus := range clientCore.StatusMapping { for _, originalStatus := range ProviderStatus { // if Failed type status appears in subTask then update mainTask to Failed diff --git a/rpc/Dockerfile b/rpc/Dockerfile index 9c211753..fb0fb43a 100644 --- a/rpc/Dockerfile +++ b/rpc/Dockerfile @@ -1,37 +1,27 @@ FROM golang:1.21.2-alpine3.18 AS builder -LABEL stage=gobuilder - -ENV CGO_ENABLED 0 -ENV GOARCH amd64 -ENV GOPROXY https://goproxy.cn,direct - -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update --no-cache && apk add --no-cache tzdata - WORKDIR /app -ADD go.mod . -ADD go.sum . -RUN go mod download COPY . . -COPY rpc/etc/ /app/ + +RUN go env -w GO111MODULE=on \ +&& go env -w GOPROXY=https://goproxy.cn,direct \ +&& go env -w CGO_ENABLED=0 \ +&& go mod download RUN go build -o pcm-coordinator-rpc /app/rpc/pcmcore.go -FROM alpine:3.16.2 +FROM alpine:3.18 + WORKDIR /app - #修改alpine源为上海交通大学 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update && \ - apk upgrade && \ - apk add --no-cache ca-certificates && update-ca-certificates && \ - apk add --update tzdata && \ - rm -rf /var/cache/apk/* + apk add --no-cache ca-certificates tzdata && \ + update-ca-certificates && \ + rm -rf /var/cache/apk/* -COPY --from=builder /app/pcm-coordinator-rpc . -COPY rpc/etc/pcmcore.yaml . +COPY --from=builder /app/pcm-coordinator-api /app/ +COPY --from=builder /app/api/etc/pcm.yaml /app/ ENV TZ=Asia/Shanghai