From eaf628654380f1cd5404728312fc94ea5d6e601f Mon Sep 17 00:00:00 2001
From: Wang Defa <wangdefa@noreply.gitea.bcde.io>
Date: Mon, 15 Dec 2025 13:18:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Ubuntu=20=E9=87=87=E7=94=A8=E5=AE=98?=
 =?UTF-8?q?=E6=96=B9=20release-static=20=E6=96=B9=E6=B3=95=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=BA=AF=E9=9D=99=E6=80=81=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 depends 系统，避免 Boost 1.69/GCC 11.4 兼容性问题
- 采用官方 Makefile 中的 release-static target 配置
- 参考 Alpine 成功经验添加 -DSTACK_TRACE=OFF
- 简化构建流程，提高可维护性

参考：.source/Makefile:93-95, .source/README.md:459-484
---
 docker/Dockerfile.ubuntu | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index cdad233..eca3235 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -59,40 +59,20 @@ COPY ./init.sh ./init.sh
 
 RUN chmod +x ./init.sh && ./init.sh
 
-# 使用 depends 系统构建所有静态依赖
-RUN if [ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]; then \
-        MAKE_JOBS=2; \
-    else \
-        MAKE_JOBS=$(nproc); \
-    fi && \
-    if [ "$TARGETARCH" = "arm64" ]; then \
-        DEPENDS_HOST="aarch64-linux-gnu"; \
-    else \
-        DEPENDS_HOST="x86_64-linux-gnu"; \
-    fi && \
-    echo "Building dependencies for $DEPENDS_HOST with $MAKE_JOBS parallel jobs" && \
-    cd contrib/depends && \
-    make HOST=$DEPENDS_HOST -j$MAKE_JOBS
-
-# 构建 Monero (mond) - 使用静态链接和 depends
+# 构建 Monero (mond) - 使用官方 release-static 方法
 RUN if [ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]; then \
         MAKE_JOBS="-j2"; \
     else \
         MAKE_JOBS="-j$(nproc)"; \
     fi && \
-    if [ "$TARGETARCH" = "arm64" ]; then \
-        DEPENDS_HOST="aarch64-linux-gnu"; \
-    else \
-        DEPENDS_HOST="x86_64-linux-gnu"; \
-    fi && \
-    echo "Building mond for $DEPENDS_HOST with parallel jobs: $MAKE_JOBS" && \
+    echo "Building mond with parallel jobs: $MAKE_JOBS" && \
     mkdir -p build/release && cd build/release && \
     cmake ../.. \
         -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_GUI_DEPS=OFF \
         -DARCH=default \
         -DSTATIC=ON \
-        -DCMAKE_TOOLCHAIN_FILE=/monero/contrib/depends/$DEPENDS_HOST/share/toolchain.cmake && \
+        -DSTACK_TRACE=OFF && \
     make $MAKE_JOBS daemon
 
 # 最终阶段 - 只复制静态链接的二进制文件