新增docker

Dockerfile

@@ -0,0 +1,10 @@
+FROM alpine:3.13.5
+
+COPY  bin/server /app/server
+
+WORKDIR /app
+
+EXPOSE 18000
+EXPOSE 19000
+
+CMD ["./server"]

Makefile

@@ -0,0 +1,31 @@
+#开发环境使用
+.PHONY: docker-dev
+docker-dev:
+	@rm -rf ./bin/server && \
+	go mod download && \
+	go build -tags netgo -o ./bin/ -ldflags "-X main.Name={kratos-layout} -X main.namespace=01d2876e-0384-4638-af85-3b5009ff16a5 -X main.group=we-mp" ./... && \
+	docker build -t {kratos-layout} .
+
+#线上环境使用
+.PHONY: docker-pro
+docker-pro:
+	@rm -rf ./bin/server && \
+	go mod download && \
+	go build -tags netgo -o ./bin/ -ldflags "-X main.Name={kratos-layout} -X main.namespace=c8bf0196-4a26-4b07-b09e-9f49b7e1a241 -X main.group=we-mp" ./... && \
+	docker build -t {kratos-layout} .
+
+#本机环境使用
+.PHONY: docker-mac #指令重命名
+docker-mac:
+	@rm -rf ./bin/server && \
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/ \
+	-ldflags "-X main.Name={kratos-layout} -X main.namespace=01d2876e-0384-4638-af85-3b5009ff16a5 -X main.group=we-mp" ./... && \
+    docker build -t {kratos-layout} .
+
+.PHONY: run-docker
+run-docker: run-docker-rm start-docker
+run-docker-rm:
+	@-docker stop {kratos-layout} && docker rm {kratos-layout}
+start-docker:
+	@docker run -d -p 18000:18000 --name="{kratos-layout}" {kratos-layout}:latest
+

build.sh

@@ -1,2 +1,2 @@
 go generate ./...
-go build -o ./bin/ -ldflags "-X main.Version=x.y.z -X main.Name=test" ./...
+go build -o ./bin/ -ldflags "-X main.Version=x.y.z -X main.Name={kratos-layout} -X main.namespace=c8bf0196-4a26-4b07-b09e-9f49b7e1a241 -X main.group=we-mp" ./...

cmd/server/main.go

@@ -36,8 +36,8 @@ var (
 
 func init() {
 	flag.StringVar(&flagconf, "conf", "../../configs", "config path, eg: -conf config.yaml")
-	flag.StringVar(&group, "group", "", "service group, eg: -group test")
-	flag.StringVar(&namespace, "namespace", "c8bf0196-4a26-4b07-b09e-9f49b7e1a241", "service namespace, eg: -group test")
+	//flag.StringVar(&group, "group", "", "service group, eg: -group test")
+	//flag.StringVar(&namespace, "namespace", "c8bf0196-4a26-4b07-b09e-9f49b7e1a241", "service namespace, eg: -group test")
 }
 
 func newApp(ctx context.Context, logger log.Logger, r *registry.Registry, hs *http.Server, gs *grpc.Server) *kratos.App {
@@ -68,12 +68,12 @@ func main() {
 	ctx := context.Background()
 	flag.Parse()
 	logger := log.NewStdLogger(os.Stdout)
-	logger = log.With(logger, "caller", log.Caller(5), "ts", log.DefaultTimestamp)
+	logger = log.With(logger, "caller", log.Caller(4), "ts", log.DefaultTimestamp)
 	var confSource config.Source
 	if group == "" {
 		confSource = file.NewSource(flagconf)
 	} else {
-		confSource = nacosConfig.NewSource("http://config.airdropin.com",
+		confSource = nacosConfig.NewSource("http://config.airdropin.com:80",
 			namespace,
 			nacosConfig.Group(group),
 			nacosConfig.DataID(Name),

go.mod

@@ -6,7 +6,7 @@ replace git.ikuban.com/server/we-protobuf => ../we-protobuf
 
 require (
 	git.ikuban.com/server/kratos-nacos v0.0.0-20210507082151-e88b9f314948
-	git.ikuban.com/server/kratos-utils v0.0.0-20210507081401-15720d4dc476
+	git.ikuban.com/server/kratos-utils v0.0.0-20210520030914-deaeebfbe9fb
 	git.ikuban.com/server/we-protobuf v0.0.0-20210412055140-e34bb7b306c4
 	github.com/go-kratos/kratos/v2 v2.0.0-beta4
 	github.com/go-redis/redis/v8 v8.7.2-0.20210317113913-a3cd07dab0a2

go.sum

@@ -18,6 +18,8 @@ git.ikuban.com/server/kratos-utils v0.0.0-20210424045203-b670e76e7590 h1:06jykty
 git.ikuban.com/server/kratos-utils v0.0.0-20210424045203-b670e76e7590/go.mod h1:7Nr06IF1Af0M/2UMGviW6Qp3OjV5S1w2qxwqezjyne4=
 git.ikuban.com/server/kratos-utils v0.0.0-20210507081401-15720d4dc476 h1:upH0lgkq/V9d6QXfYPoaxP/RJEjL6bnqKpAL6lcrEdM=
 git.ikuban.com/server/kratos-utils v0.0.0-20210507081401-15720d4dc476/go.mod h1:u6JF4hcqEWM+c4HGXRn6ZxnoJ1SWQe9sZlrGna1P/ho=
+git.ikuban.com/server/kratos-utils v0.0.0-20210520030914-deaeebfbe9fb h1:sSUC/N9QK8qmf/C3+eGXGbz9I0SZrur3zxLGwSmolnI=
+git.ikuban.com/server/kratos-utils v0.0.0-20210520030914-deaeebfbe9fb/go.mod h1:u6JF4hcqEWM+c4HGXRn6ZxnoJ1SWQe9sZlrGna1P/ho=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=