Skip to content

Commit 70fba0f

Browse files
xdlbdyxdlbdy
authored
feat: modify build dockerfile and deploy yaml (#108)
* feat: modify build dockerfile and deploy yaml Signed-off-by: delu <[email protected]> * style: modify cmd code style Signed-off-by: delu <[email protected]> * docs: modify deploy README Signed-off-by: delu <[email protected]> * docs: modify deploy README Signed-off-by: delu <[email protected]> * fix: code review Signed-off-by: delu <[email protected]> * fix: markdownlint deploy reademe Signed-off-by: delu <[email protected]> * style: code review Signed-off-by: delu <[email protected]>
1 parent 8784c99 commit 70fba0f

File tree

17 files changed

+278
-132
lines changed

17 files changed

+278
-132
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@ build: build-controller build-trigger build-gateway build-store
2525
docker-push-store: docker-build-store
2626
docker push ${DOCKER_REPO}/store:${IMAGE_TAG}
2727
docker-build-store:
28-
docker build -t ${DOCKER_REPO}/store:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/store/Dockerfile ../
28+
docker build -t ${DOCKER_REPO}/store:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/store/Dockerfile .
2929
build-store:
3030
$(GO_BUILD) -o bin/store cmd/store/main.go
3131

3232
docker-push-gateway: docker-build-gateway
3333
docker push ${DOCKER_REPO}/gateway:${IMAGE_TAG}
3434
docker-build-gateway:
35-
docker build -t ${DOCKER_REPO}/gateway:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/gateway/Dockerfile ../
35+
docker build -t ${DOCKER_REPO}/gateway:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/gateway/Dockerfile .
3636
build-gateway:
3737
$(GO_BUILD) -o bin/gateway cmd/gateway/main.go
3838

3939
docker-push-cmd: docker-build-cmd
4040
docker push ${DOCKER_REPO}/vsctl:${IMAGE_TAG}
4141
docker-build-cmd:
42-
docker build -t ${DOCKER_REPO}/vsctl:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/vsctl/Dockerfile ../
42+
docker build -t ${DOCKER_REPO}/vsctl:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/vsctl/Dockerfile .
4343
build-cmd:
4444
$(GO_BUILD) -o bin/vsctl vsctl/main.go
4545

4646
docker-push-controller: docker-build-controller
4747
docker push ${DOCKER_REPO}/controller:${IMAGE_TAG}
4848
docker-build-controller:
49-
docker build -t ${DOCKER_REPO}/controller:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/controller/Dockerfile ../
49+
docker build -t ${DOCKER_REPO}/controller:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/controller/Dockerfile .
5050
build-controller:
5151
$(GO_BUILD) -o bin/controller cmd/controller/main.go
5252

5353
docker-push-trigger: docker-build-trigger
5454
docker push ${DOCKER_REPO}/trigger:${IMAGE_TAG}
5555
docker-build-trigger:
56-
docker build -t ${DOCKER_REPO}/trigger:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/trigger/Dockerfile ../
56+
docker build -t ${DOCKER_REPO}/trigger:${IMAGE_TAG} $(DOCKER_BUILD_ARG) -f build/images/trigger/Dockerfile .
5757
build-trigger:
5858
$(GO_BUILD) -o bin/trigger cmd/trigger/main.go
5959

‎build/images/controller/Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
FROM golang:1.17 as builder
22
WORKDIR /workspace
33

4-
COPY vanus/ vanus/
5-
COPY embed-etcd/ embed-etcd/
6-
COPY vsproto/ vsproto/
7-
WORKDIR /workspace/vanus
8-
RUN go env -w GOPROXY=https://goproxy.cn,direct
4+
COPY go.mod go.mod
5+
COPY go.sum go.sum
6+
COPY Makefile Makefile
7+
COPY cmd/controller cmd/controller
8+
COPY internal internal
9+
COPY observability observability
10+
COPY proto proto
11+
912
ARG TARGETOS
1013
ARG TARGETARCH
1114
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-controller
1215

1316
FROM centos:8.4.2105
14-
RUN mkdir -p /server
15-
COPY --from=builder /workspace/vanus/bin/controller /server/bin/controller
16-
WORKDIR /server
17+
RUN mkdir -p /vanus
18+
COPY --from=builder /workspace/bin/controller /vanus/bin/controller
19+
WORKDIR /vanus
1720
ENTRYPOINT ["bin/controller"]
1821

‎build/images/gateway/Dockerfile‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
FROM golang:1.17 as builder
22
WORKDIR /workspace
33

4-
COPY vanus/ vanus/
5-
COPY eventbus-go/ eventbus-go/
6-
COPY vsproto/ vsproto/
7-
WORKDIR /workspace/vanus
8-
RUN go env -w GOPROXY=https://goproxy.cn,direct
4+
COPY go.mod go.mod
5+
COPY go.sum go.sum
6+
COPY Makefile Makefile
7+
COPY cmd/gateway cmd/gateway
8+
COPY internal internal
9+
COPY observability observability
10+
COPY proto proto
11+
COPY client client
12+
913
ARG TARGETOS
1014
ARG TARGETARCH
1115
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-gateway
1216

1317
FROM alpine:3.15.4
14-
RUN mkdir -p /server
15-
COPY --from=builder /workspace/vanus/bin/gateway /server/bin/gateway
16-
WORKDIR /server
18+
RUN mkdir -p /vanus
19+
COPY --from=builder /workspace/bin/gateway /vanus/bin/gateway
20+
WORKDIR /vanus
1721
ENTRYPOINT ["bin/gateway"]
1822

‎build/images/store/Dockerfile‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
FROM golang:1.17 as builder
22
WORKDIR /workspace
33

4-
COPY vanus/ vanus/
5-
COPY raft/ raft/
6-
COPY vsproto/ vsproto/
7-
WORKDIR /workspace/vanus
8-
RUN go env -w GOPROXY=https://goproxy.cn,direct
4+
COPY go.mod go.mod
5+
COPY go.sum go.sum
6+
COPY Makefile Makefile
7+
COPY cmd/store cmd/store
8+
COPY internal internal
9+
COPY observability observability
10+
COPY proto proto
11+
COPY raft raft
12+
913
ARG TARGETOS
1014
ARG TARGETARCH
1115
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-store
1216

1317
FROM alpine:3.15.4
14-
RUN mkdir -p /server
15-
COPY --from=builder /workspace/vanus/bin/store /server/bin/store
16-
WORKDIR /server
17-
#ENTRYPOINT ["bin/store"]
18+
RUN mkdir -p /vanus
19+
COPY --from=builder /workspace/bin/store /vanus/bin/store
20+
WORKDIR /vanus
21+
ENTRYPOINT ["bin/store"]
1822

‎build/images/trigger/Dockerfile‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
FROM golang:1.17 as builder
22
WORKDIR /workspace
33

4-
COPY vanus/ vanus/
5-
COPY eventbus-go/ eventbus-go/
6-
COPY vsproto/ vsproto/
7-
WORKDIR /workspace/vanus
8-
RUN go env -w GOPROXY=https://goproxy.cn,direct
4+
COPY go.mod go.mod
5+
COPY go.sum go.sum
6+
COPY Makefile Makefile
7+
COPY cmd/trigger cmd/trigger
8+
COPY internal internal
9+
COPY observability observability
10+
COPY proto proto
11+
COPY client client
12+
913
ARG TARGETOS
1014
ARG TARGETARCH
1115
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-trigger
1216

1317
FROM alpine:3.15.4
14-
RUN mkdir -p /server
15-
COPY --from=builder /workspace/vanus/bin/trigger /server/bin/trigger
16-
WORKDIR /server
18+
RUN mkdir -p /vanus
19+
COPY --from=builder /workspace/bin/trigger /vanus/bin/trigger
20+
WORKDIR /vanus
1721
ENTRYPOINT ["bin/trigger"]
1822

‎build/images/vsctl/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
FROM golang:1.17 as builder
22
WORKDIR /workspace
33

4-
COPY vanus/ vanus/
5-
COPY embed-etcd/ embed-etcd/
6-
COPY vsproto/ vsproto/
7-
WORKDIR /workspace/vanus
8-
RUN go env -w GOPROXY=https://goproxy.cn,direct
4+
COPY go.mod go.mod
5+
COPY go.sum go.sum
6+
COPY Makefile Makefile
7+
COPY vsctl vsctl
8+
COPY proto proto
9+
910
ARG TARGETOS
1011
ARG TARGETARCH
1112
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-cmd
1213

1314
FROM centos:8.4.2105
14-
RUN mkdir -p /server
15-
COPY --from=builder /workspace/vanus/bin/vsctl /server/bin/vsctl
16-
WORKDIR /server
15+
RUN mkdir -p /vanus
16+
COPY --from=builder /workspace/bin/vsctl /vanus/bin/vsctl
17+
WORKDIR /vanus
1718

‎build/local_build.sh‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎cmd/controller/main.go‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@
1515
package main
1616

1717
import (
18+
"context"
1819
"flag"
1920
"fmt"
20-
recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
21+
"net"
22+
"net/http"
23+
"os"
24+
"sync"
25+
2126
embedetcd "github.com/linkall-labs/embed-etcd"
2227
"github.com/linkall-labs/vanus/internal/controller"
2328
"github.com/linkall-labs/vanus/internal/controller/eventbus"
@@ -28,28 +33,36 @@ import (
2833
"github.com/linkall-labs/vanus/observability/log"
2934
"github.com/linkall-labs/vanus/observability/metrics"
3035
ctrlpb "github.com/linkall-labs/vanus/proto/pkg/controller"
36+
37+
recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
3138
"github.com/prometheus/client_golang/prometheus/promhttp"
3239
"google.golang.org/grpc"
3340
"google.golang.org/grpc/reflection"
34-
"net"
35-
"net/http"
36-
"os"
37-
"sync"
3841
)
3942

4043
var (
41-
configPath = flag.String("config-file", "./config/controller.yaml", "the configuration file of controller")
44+
configPath = flag.String("config", "./config/controller.yaml", "the configuration file of controller")
4245
)
4346

4447
func main() {
4548
flag.Parse()
46-
ctx := signal.SetupSignalContext()
49+
4750
cfg, err := controller.InitConfig(*configPath)
4851
if err != nil {
49-
log.Error(ctx, "init config error", map[string]interface{}{log.KeyError: err})
52+
log.Error(context.Background(), "init config error", map[string]interface{}{
53+
log.KeyError: err,
54+
})
55+
os.Exit(-1)
56+
}
57+
listen, err := net.Listen("tcp", fmt.Sprintf(":%d", cfg.Port))
58+
if err != nil {
59+
log.Error(context.Background(), "failed to listen", map[string]interface{}{
60+
"error": err,
61+
})
5062
os.Exit(-1)
5163
}
5264

65+
ctx := signal.SetupSignalContext()
5366
go startMetrics()
5467
etcd := embedetcd.New(cfg.Topology)
5568
if err = etcd.Init(ctx, cfg.GetEtcdConfig()); err != nil {
@@ -85,14 +98,6 @@ func main() {
8598
os.Exit(-1)
8699
}
87100

88-
listen, err := net.Listen("tcp", fmt.Sprintf(":%d", cfg.Port))
89-
if err != nil {
90-
log.Error(ctx, "failed to listen", map[string]interface{}{
91-
"error": err,
92-
})
93-
os.Exit(-1)
94-
}
95-
96101
grpcServer := grpc.NewServer(
97102
grpc.ChainStreamInterceptor(
98103
recovery.StreamServerInterceptor(),

‎cmd/gateway/main.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,24 @@ package main
1717
import (
1818
"context"
1919
"flag"
20+
"os"
21+
2022
"github.com/linkall-labs/vanus/internal/gateway"
2123
"github.com/linkall-labs/vanus/observability/log"
22-
"os"
24+
)
25+
26+
var (
27+
configPath = flag.String("config", "./config/gateway.yaml", "gateway config file path")
2328
)
2429

2530
func main() {
26-
f := flag.String("config", "./config/gateway.yaml", "gateway config file path")
2731
flag.Parse()
28-
cfg, err := gateway.InitConfig(*f)
32+
33+
cfg, err := gateway.InitConfig(*configPath)
2934
if err != nil {
30-
log.Error(nil, "init config error", map[string]interface{}{log.KeyError: err})
35+
log.Error(nil, "init config error", map[string]interface{}{
36+
log.KeyError: err,
37+
})
3138
os.Exit(-1)
3239
}
3340

‎cmd/store/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,19 @@ import (
3737
)
3838

3939
var (
40-
f = flag.String("config", "./config/store.yaml", "store config file path")
40+
configPath = flag.String("config", "./config/store.yaml", "store config file path")
4141
)
4242

4343
func main() {
4444
flag.Parse()
4545

46-
cfg, err := store.InitConfig(*f)
46+
cfg, err := store.InitConfig(*configPath)
4747
if err != nil {
48-
log.Error(nil, "init config error", map[string]interface{}{log.KeyError: err})
48+
log.Error(context.Background(), "init config error", map[string]interface{}{
49+
log.KeyError: err,
50+
})
4951
os.Exit(-1)
5052
}
51-
5253
listen, err := net.Listen("tcp", fmt.Sprintf(":%d", cfg.Port))
5354
if err != nil {
5455
log.Error(context.Background(), "failed to listen", map[string]interface{}{

0 commit comments

Comments
 (0)