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 # 最终阶段 - 只复制静态链接的二进制文件