mmm-go / opp · 提交

转到一个项目

作者 yangfu
提交 5ffc7f268fd49843649cfaa87beed8ea4a892152 1 个父辈 3241101e

修改 Dockerfile

内嵌 并排对比
正在显示 1 个修改的文件 包含 11 行增加 和 11 行删除
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:20200422 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