作者 yangfu

修改 Dockerfile

1 -FROM 192.168.0.243:5000/mmm/mmmopp:20200226 as builder  
2 -#FROM golang:1.13 as builder 1 +#FROM 192.168.0.243:5000/mmm/mmmopp:20200226 as builder
  2 +FROM golang:1.13 as builder
3 ENV GOPROXY https://goproxy.cn 3 ENV GOPROXY https://goproxy.cn
4 ENV GO111MODULE on 4 ENV GO111MODULE on
5 ENV GOPATH /go 5 ENV GOPATH /go
6 -#RUN git clone http://gitlab.fjmaimaimai.com/mmm-go/gocomm.git /go/src/gocomm \ 6 +RUN git clone http://gitlab.fjmaimaimai.com/mmm-go/gocomm.git /go/src/gocomm \
7 RUN cd /go/src/gocomm \ 7 RUN cd /go/src/gocomm \
8 && git pull 8 && git pull
9 WORKDIR /go/src/opp 9 WORKDIR /go/src/opp
@@ -15,14 +15,14 @@ COPY . . @@ -15,14 +15,14 @@ COPY . .
15 RUN GOOS=linux CGO_ENABLED=0 go build -ldflags="-s -w" -o opp main.go 15 RUN GOOS=linux CGO_ENABLED=0 go build -ldflags="-s -w" -o opp main.go
16 16
17 #FROM alpine:latest 17 #FROM alpine:latest
18 -FROM 192.168.0.243:5000/mmm/mmmopp:20200110  
19 -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \  
20 - && apk add --no-cache tzdata \  
21 - && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \  
22 - && echo "Asia/Shanghai" > /etc/timezone \  
23 - && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache ## 清除缓存  
24 -WORKDIR /root/  
25 -COPY --from=builder /go/src/opp . 18 +#FROM 192.168.0.243:5000/mmm/mmmopp:20200110
  19 +#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
  20 +# && apk add --no-cache tzdata \
  21 +# && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
  22 +# && echo "Asia/Shanghai" > /etc/timezone \
  23 +# && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache ## 清除缓存
  24 +#WORKDIR /root/
  25 +#COPY --from=builder /go/src/opp .
26 26
27 EXPOSE 8080 27 EXPOSE 8080
28 EXPOSE 443 28 EXPOSE 443
@@ -487,7 +487,7 @@ func saveApproveMsgByApproveData(header *protocol.RequestHeader, orm orm.Ormer, @@ -487,7 +487,7 @@ func saveApproveMsgByApproveData(header *protocol.RequestHeader, orm orm.Ormer,
487 code = 3 487 code = 3
488 reason := "" 488 reason := ""
489 if len(approveData.Reason) > 0 { 489 if len(approveData.Reason) > 0 {
490 - reason = fmt.Sprintf(",理由:%v", approveData.Reason) 490 + reason = fmt.Sprintf(",理由:%v\n", approveData.Reason)
491 } 491 }
492 parames = append(parames, reason, selfChecks.String()) 492 parames = append(parames, reason, selfChecks.String())
493 } 493 }