Skip to content

Commit 15591cf

Browse files
committed
fix dockerfile and go.mod
1 parent 46e130a commit 15591cf

File tree

4 files changed

+464
-15
lines changed

4 files changed

+464
-15
lines changed

build/backend/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@ FROM golang:1.12 as backend
22

33
WORKDIR /go/src/github.com/huangwei2013/doraemon/cmd/alert-gateway
44

5-
COPY cmd/alert-gateway .
6-
7-
COPY go.mod /go/src/github.com/huangwei2013/doraemon
8-
9-
COPY go.sum /go/src/github.com/huangwei2013/doraemon
5+
COPY . .
106

117
RUN export GO111MODULE=on && \
128
export GOPROXY=https://goproxy.cn && \
13-
go build main.go && \
9+
go build cmd/alert-gateway/main.go && \
1410
mv main doraemon && \
15-
tar cvf pack.tar doraemon conf/
11+
tar cvf pack.tar doraemon cmd/alert-gateway/conf/
1612

1713
FROM 360cloud/centos:7
1814

build/rule-engine/Dockerfile

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositorie
1313

1414
WORKDIR /go/src/github.com/huangwei2013/doraemon/cmd/rule-engine
1515

16-
COPY cmd/rule-engine .
17-
18-
COPY go.mod /go/src/github.com/huangwei2013/doraemon
19-
20-
COPY go.sum /go/src/github.com/huangwei2013/doraemon
16+
COPY . .
2117

2218
RUN export GO111MODULE=on && \
2319
export GOPROXY=https://mirrors.aliyun.com/goproxy/ && \
24-
go build main.go
20+
go build cmd/rule-engine/main.go
2521

2622
FROM alpine:latest
2723

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/huangwei2013/doraemon
1+
module github.com/Qihoo360/doraemon
22

33
go 1.12
44

@@ -15,6 +15,5 @@ require (
1515
google.golang.org/appengine v1.6.5 // indirect
1616
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1717
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
18-
gopkg.in/ldap.v2 v2.5.1 // indirect
1918
gopkg.in/yaml.v2 v2.2.2
2019
)

0 commit comments

Comments
 (0)