Merge branch 'master' of http://git.pet-dbc.cn/haoyanbin/nbya

840de153 · haoyanbin · b947a816 · efa8a372 · 840de153 · 840de153
Commit 840de153 authored Jan 27, 2022 by haoyanbin
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 6 deletions

Dockerfile Dockerfile +8 -2

PROD.Dockerfile PROD.Dockerfile +12 -4

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ENV GOPROXY=https://goproxy.cn,direct

 WORKDIR /go/release
 #RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk update && apk add tzdata
+# RUN apk update && apk add tzdata

 COPY go.mod ./go.mod
 RUN go mod tidy
@@ -17,10 +17,16 @@ RUN go env && go build -o go-admin .

 FROM alpine

+ENV TZ=Asia/Shanghai
+RUN echo "http://mirrors.aliyun.com/alpine/v3.4/main/" > /etc/apk/repositories \
+    && apk --no-cache add tzdata zeromq \
+    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
+    && echo '$TZ' > /etc/timezone
+
 COPY --from=builder /go/release/go-admin /
 COPY --from=builder /go/release/config /config

-COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+# COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

 EXPOSE 8053


--- a/PROD.Dockerfile
+++ b/PROD.Dockerfile
@@ -5,21 +5,29 @@ ENV GOPROXY=https://goproxy.cn,direct

 WORKDIR /go/release
 #RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk update && apk add tzdata
+# RUN apk update && apk add tzdata

 COPY go.mod ./go.mod
 RUN go mod tidy
 COPY . .
 RUN pwd && ls

-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -a -installsuffix cgo -o go-admin .
+# RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -a -installsuffix cgo -o go-admin .
+RUN go env && go build -o go-admin .

 FROM alpine

+ENV TZ=Asia/Shanghai
+RUN echo "http://mirrors.aliyun.com/alpine/v3.4/main/" > /etc/apk/repositories \
+    && apk --no-cache add tzdata zeromq \
+    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
+    && echo '$TZ' > /etc/timezone
+
 COPY --from=builder /go/release/go-admin /
+COPY --from=builder /go/release/config /config

-COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+# COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

-EXPOSE 8052
+EXPOSE 8054

 CMD ["/go-admin","server","-c", "/config/settings.yml"]
\ No newline at end of file