opensource/dtm
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minimal image seems ok

Browse Source
This commit is contained in:
yedf2 2021-08-05 14:55:38 +08:00
parent 9f32a0adc7
commit aefc414c63
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aux/Dockerfile-release
View File

@ -1,12 +1,13 @@
FROM golang as builder
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 GOARCH=amd64 go build -ldflags "-s -w" app/main.go
RUN CGO_ENABLED=0 GOOS=linux go build app/main.go
FROM scratch as runner
COPY --from=builder /app/dtm/main /app/dtm/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"]

5
common/types.go
View File

@ -140,7 +140,7 @@ func init() {
"password": os.Getenv("DB_PASSWORD"),
}
cont := []byte{}
for d := MustGetwd(); d != ""; d = filepath.Dir(d) {
for d := MustGetwd(); d != "" && d != "/"; d = filepath.Dir(d) {
cont1, err := ioutil.ReadFile(d + "/conf.yml")
if err != nil {
cont1, err = ioutil.ReadFile(d + "/conf.sample.yml")
@ -156,5 +156,6 @@ func init() {
dtmcli.FatalIfError(err)
}
dtmcli.LogIfFatalf(DtmConfig.DB["driver"] == "" || DtmConfig.DB["user"] == "",
"dtm config error: %v. check you env, and conf.yml/conf.sample.yml found in current and parent path: %s", DtmConfig, MustGetwd())
"dtm config error: %v. check you env, and conf.yml/conf.sample.yml in current and parent path: %s", DtmConfig, MustGetwd())
dtmcli.Logf("after fatalIf")
}