作者 yangfu

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/opp into dev

正在显示 1 个修改的文件 包含 5 行增加3 行删除
1 -FROM golang:1.13 as builder 1 +FROM 192.168.0.243:5000/mmm/mmm-oppmg:20200110 as builder
  2 +#FROM golang:1.13 as builder
2 ENV GOPROXY https://goproxy.cn 3 ENV GOPROXY https://goproxy.cn
3 ENV GO111MODULE on 4 ENV GO111MODULE on
4 ENV GOPATH /go 5 ENV GOPATH /go
@@ -8,12 +9,13 @@ RUN git clone http://gitlab.fjmaimaimai.com/mmm-go/gocomm.git /go/src/gocomm \ @@ -8,12 +9,13 @@ RUN git clone http://gitlab.fjmaimaimai.com/mmm-go/gocomm.git /go/src/gocomm \
8 WORKDIR /go/src/opp 9 WORKDIR /go/src/opp
9 10
10 COPY go.mod . 11 COPY go.mod .
11 -RUN go mod download 12 +#RUN go mod download
12 13
13 COPY . . 14 COPY . .
14 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
15 16
16 -FROM alpine:latest 17 +#FROM alpine:latest
  18 +FROM 192.168.0.243:5000/mmm/mmmopp:20200110
17 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \ 19 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
18 && apk add --no-cache tzdata \ 20 && apk add --no-cache tzdata \
19 && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ 21 && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \