Merge branch 'main' of https://github.com/aaPanel/btShieldML

Author: Bacon-123

.github/workflows/docker-image.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up Docker Buildx
@@ -37,4 +37,4 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: |
-            btpanel/btshieldml:latest
+            btpanel/btshieldmL:latest

dockerfile

@@ -1,10 +1,55 @@
-# 使用Debian作为基础镜像
+# 第一阶段：构建环境
+FROM golang:1.22-bullseye AS builder
+
+WORKDIR /build
+
+# 安装系统依赖
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    automake \
+    libtool \
+    make \
+    gcc \
+    pkg-config \
+    libssl-dev \
+    libmagic-dev \
+    jansson-dev \
+    xxd \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# 安装YARA 4.3+
+RUN wget https://github.com/VirusTotal/yara/archive/refs/tags/v4.3.1.tar.gz \
+    && tar -xzf v4.3.1.tar.gz \
+    && cd yara-4.3.1 \
+    && ./bootstrap.sh \
+    && ./configure --enable-static \
+    && make \
+    && make install \
+    && ldconfig
+
+# 复制源代码
+COPY . .
+
+# 安装Go依赖
+RUN go mod download \
+    && go get github.com/CyrusF/libsvm-go \
+    && go get github.com/CyrusF/go-bayesian \
+    && go get github.com/grd/stat
+
+# 编译PHP桥接
+RUN make -C php-bridge
+
+# 执行构建脚本
+RUN bash build.sh
+
+# 第二阶段：运行环境
 FROM debian:11-slim
 
 # 设置工作目录
 WORKDIR /www/dk_project/dk_app/shieldml/
 
-# 安装必要的依赖
+# 安装必要的运行时依赖
 RUN apt-get update && apt-get install -y \
     ca-certificates \
     tzdata \
@@ -35,4 +80,4 @@ HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
   CMD wget -qO- http://localhost:6528/shieldml_scan.html || exit 1
 
 # 启动服务
-CMD ["/www/dk_project/dk_app/shieldml/shieldml_server"]
+CMD ["/www/dk_project/dk_app/shieldml/shieldml_server"]