feat: optimize something (#9)

* feat: optimize something

Signed-off-by: yuluo-yx <[email protected]>

* fix: fix md style

Signed-off-by: yuluo-yx <[email protected]>

---------

Signed-off-by: yuluo-yx <[email protected]>

Author: yuluo-yx

Dockerfile

@@ -15,39 +15,49 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
-# syntax=docker/dockerfile:1
-
-# Build stage
-FROM golang:1.24-alpine AS builder
-
-WORKDIR /app
-
-# 安装 git 以支持 go mod 下载私有依赖（如有需要）
-RUN apk add --no-cache git
-
-# 复制 go.mod 和 go.sum 并下载依赖
-COPY go.mod go.sum ./
-RUN go mod download
-
-# 复制源代码
-COPY . .
-
-# 构建二进制文件
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o collector ./cmd/main.go
-
-# Production stage
-FROM alpine:3.19
-
-WORKDIR /app
-
-# 拷贝构建产物
-COPY --from=builder /app/collector /app/collector
-
-# 如有配置文件等需要一并拷贝
-# COPY --from=builder /app/etc /app/etc
-
-# 暴露端口（如有需要）
-# EXPOSE 1158
-
-ENTRYPOINT ["./collector"]
+FROM golang:1.23-alpine AS golang-builder
+
+ARG GOPROXY
+# ENV GOPROXY ${GOPROXY:-direct}
+# ENV GOPROXY=https://proxy.golang.com.cn,direct
+
+ENV GOPATH /go
+ENV GOROOT /usr/local/go
+ENV PACKAGE hertzbeat.apache.org/hertzbeat-collector-go
+ENV BUILD_DIR /app
+
+COPY . ${BUILD_DIR}
+WORKDIR ${BUILD_DIR}
+RUN apk --no-cache add build-base git bash
+
+RUN make init && \
+    make fmt && \
+    make go-lint &&\
+    make build
+
+RUN chmod +x bin/collector
+
+FROM alpine
+
+ARG TIMEZONE
+ENV TIMEZONE=${TIMEZONE:-"Asia/Shanghai"}
+
+RUN apk update \
+    && apk --no-cache add \
+        bash \
+        ca-certificates \
+        curl \
+        dumb-init \
+        gettext \
+        openssh \
+        sqlite \
+        gnupg \
+        tzdata \
+    && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
+    && echo "${TIMEZONE}" > /etc/timezone
+
+COPY --from=golang-builder /app/bin/collector /usr/local/bin/collector
+COPY --from=golang-builder /app/etc/hertzbeat-collector.yml /etc/hertzbeat-collector.yml
+
+EXPOSE 8090
+ENTRYPOINT ["collector", "server", "--config", "/etc/hertzbeat-collector.yml"]

README-CN.md

@@ -14,7 +14,7 @@ HertzBeat-Collector-Go 是 [Apache HertzBeat](https://github.com/apache/hertzbea
 
 ## 📂 目录结构
 
-```
+```text
 .
 ├── cmd/                # 主程序入口
 ├── internal/           # 采集器核心实现与通用组件

README.md

@@ -36,7 +36,7 @@ HertzBeat-Collector-Go is the Go implementation of the collector for [Apache Her
 
 ```bash
 # Install dependencies
-
+go mod tidy
 
 # Build
 make build

Roadmap.md

@@ -2,9 +2,9 @@
 
 > 以优先级排序
 
-- [ ] 完善
+- [ ] 完善调度模块
 - [ ] 完善网络通信模块；
-- [ ] 补充收集器类型，参照 Java 实现；
+- [ ] 补充采集器协议，参照 Java 实现；
 - [ ] 完善文档；
 - [ ] 增加更多示例。
 - [ ] 补充单测

docker-compose.yml

@@ -16,24 +16,17 @@
 # under the License.
 
 services:
-  # collector service
+
+  # collector go service
   hertzbeat-collector:
-    image: hertzbeat/hertzbeat-collector:latest
-    container_name: hertzbeat-collector
-    restart: always
+    image: hertzbeat/hertzbeat-collector-go:latest
+    container_name: hertzbeat-collector-go
+    restart: on-failure
     ports:
-      - "8080:8080" # Web access port
-      - "8091:8091" # Agent communication port
-    environment:
-      - TZ=Asia/Shanghai # Set your timezone
-      - JAVA_OPTS=-Xms512m -Xmx1024m -XX:+UseG1GC # Java memory settings
-      - SPRING_PROFILES_ACTIVE=prod # Active profile (prod or dev)
-      - HERTZBEAT_DB_HOST=db # Database host (use 'db' if using the db service below)
-      - HERTZBEAT_DB_PORT=3306 # Database port
-      - HERTZBEAT_DB_NAME=hertzbeat # Database name
-      - HERTZBEAT_DB_USER=root # Database user
-      - HERTZBEAT_DB_PASSWORD=yourpassword # Database password, change this to a secure password
-    depends_on:
-      - db # Ensure the database service starts before the collector
-    volumes:
-      - hertzbeat_data:/opt/hertzbeat/data # Persist data
+      - "8090:8090"
+    networks:
+      hcg-network:
+
+networks:
+  hcg-network:
+    driver: bridge