Merge pull request #29 from FantasyRL/not_main

feat:support distributed deploy and nacos-config-center

.gitignore

@@ -40,4 +40,5 @@ hz_update.sh
 kitex_update.sh
 /config/config.yaml
 /codeql
-analz.sarif
+analz.sarif
+cache

Dockerfile

@@ -2,6 +2,7 @@ FROM golang:1.22 AS builder
 LABEL authors="fanr"
 
 ENV TZ Asia/Shanghai
+ENV CGO_ENABLED=0
 RUN go env -w GO111MODULE=on \
   && go env -w GOPROXY=https://goproxy.cn,direct \
   && go env -w GOOS=linux \
@@ -12,6 +13,23 @@ WORKDIR /app
 
 ADD . /app
 RUN go mod tidy
-#CMD ["go run","example"]
 RUN make build-all
 
+FROM alpine
+RUN apk update --no-cache && apk add --no-cache ca-certificates tzdata
+
+ENV TZ Asia/Shanghai
+ENV service api
+EXPOSE 10002
+WORKDIR /app
+#COPY --from=builder /app/output /app/output
+COPY --from=builder /app/config /app/config
+#COPY --from=builder /app/pkg /app/pkg
+COPY --from=builder /app/cmd /app/cmd
+#COPY --from=builder /app/kitex_gen /app/kitex_gen
+
+#CMD ["sh","-c","./output/${service}/${service}"]
+CMD ["sh","-c","sh cmd/${service}/output/bootstrap.sh"]
+
+
+

Makefile

@@ -39,9 +39,11 @@ build-all:
 	@for service in $(SERVICES); do \
   		cd ${RPC};cd $$service; \
   		echo "build $$service ..." && sh build.sh; \
-  		cd ${RPC}/$$service/output/bin/ && cp -r . ${OUTPUT}/$$service; \
+#  		cd ${RPC}/$$service/output/bin/ && cp -r . ${OUTPUT}/$$service; \
   		echo "done"; \
-  	done \
+  	done ; \
+#  	cd ${OUTPUT}/api; \
+#  	mv hertz_service api;
 
 KSERVICES := user video interaction follow chat
 .PHONY: kgen

README.md

@@ -23,7 +23,7 @@ make build-all
 
 目录树生成:
 ```bash
-treer -e tree.txt -i "/.idea|.git|data/"
+treer -e tree.txt -i "/.idea|.git|data|codeql|(.*)?elasticsearch|(.*)?kibana/"
 ```
 
 ## Todo...