fix bug

Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 1ef360be0c89fdf57fe54497296380fbe068cb95

.gitignore

@@ -27,5 +27,4 @@ buf.lock
 configs/tenanter.yaml
 
 log/
-/go_build_gitlink_org_cn_JCCE_PCM
 /cache/

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:
+all-build: pcm-core-rpc pcm-core-api
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ac adaptor/PCM-HPC/PCM-AC/rpc/hpcac.go
 
-pcm-kubenative-rpc:
+.PHONY: pcm-core-rpc pcm-core-api
-	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

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 add --no-cache ca-certificates tzdata && \
-  apk upgrade && \
+    update-ca-certificates && \
-  apk add --no-cache ca-certificates && update-ca-certificates && \
-  apk add --update tzdata && \
     rm -rf /var/cache/apk/*
 
-COPY --from=builder /app/pcm-coordinator-api .
+COPY --from=builder /app/pcm-coordinator-api /app/
-COPY api/etc/pcm.yaml .
+COPY --from=builder /app/api/etc/pcm.yaml /app/
 
 ENV TZ=Asia/Shanghai
 
 EXPOSE 8999
 
-ENTRYPOINT ./pcm-coordinator-api -f pcm.yaml
+ENTRYPOINT ["./pcm-coordinator-api", "-f", "pcm.yaml"]

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

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 add --no-cache ca-certificates tzdata && \
-  apk upgrade && \
+    update-ca-certificates && \
-  apk add --no-cache ca-certificates && update-ca-certificates && \
-  apk add --update tzdata && \
     rm -rf /var/cache/apk/*
 
-COPY --from=builder /app/pcm-coordinator-rpc .
+COPY --from=builder /app/pcm-coordinator-api /app/
-COPY rpc/etc/pcmcore.yaml .
+COPY --from=builder /app/api/etc/pcm.yaml /app/
 
 ENV TZ=Asia/Shanghai