merge from main

common/types.go

@@ -166,7 +166,7 @@ func init() {
 			break
 		}
 	}
-	if cont != nil && len(cont) != 0 {
+	if len(cont) != 0 {
 		dtmimp.Logf("cont is: \n%s", string(cont))
 		err := yaml.Unmarshal(cont, &DtmConfig)
 		dtmimp.FatalIfError(err)

helper/Dockerfile-release

@@ -1,13 +1,13 @@
 FROM golang:1.16.6-alpine3.14 as builder
 WORKDIR /app/dtm
-RUN go env -w GO111MODULE=on
 # RUN go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct
 EXPOSE 8080
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux go build app/main.go
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" app/main.go
+RUN apk add upx && upx main
 
 FROM alpine:3.14 as runner
 COPY --from=builder /app/dtm/main /app/dtm/
 ENV IS_DOCKER=1
 WORKDIR /app/dtm
-CMD ["/app/dtm/main", "dtmsvr"]
+CMD ["/app/dtm/main", "dtmsvr"]