From 677230616c74d74bdf4369ced668348e995fa488 Mon Sep 17 00:00:00 2001 From: Wang Defa Date: Mon, 15 Dec 2025 11:58:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=20Docker=20=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - init.sh: 修复版本宏替换规则,为所有 sed 命令添加全局替换标志 (/g) 解决了 Ubuntu 平台上 'DEF_MONERO_VERSION' 未定义的编译错误 - docker/Dockerfile.alpine: 添加所有必需的 Boost 组件包 解决了 Alpine 平台上 CMake 找不到 Boost 组件的配置错误 修复平台: - Alpine Linux (amd64/arm64) - Boost 组件缺失问题 - Ubuntu (amd64/arm64) - 版本宏定义错误 --- docker/Dockerfile.alpine | 10 ++++++++++ init.sh | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index bb4a581..d4eaa0d 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -10,6 +10,16 @@ RUN apk add --no-cache \ build-base \ cmake \ boost-dev \ + boost-static \ + boost-filesystem \ + boost-thread \ + boost-date_time \ + boost-chrono \ + boost-serialization \ + boost-program_options \ + boost-locale \ + boost-system \ + boost-regex \ openssl-dev \ zeromq-dev \ unbound-dev \ diff --git a/init.sh b/init.sh index 3ffe894..741e3f5 100755 --- a/init.sh +++ b/init.sh @@ -12,13 +12,13 @@ sed -i 's/OUTPUT_NAME "monerod"/OUTPUT_NAME "mond"/' src/daemon/CMakeLists.txt sed -i 's/\${monero_SOURCE_DIR}/\${CMAKE_SOURCE_DIR}/' cmake/CheckLinkerFlag.cmake # 3. Modify version.cpp.in - Change all MONERO to MOND -sed -i 's/DEF_MONERO_VERSION_TAG/DEF_MOND_VERSION_TAG/' src/version.cpp.in -sed -i 's/DEF_MONERO_VERSION "/DEF_MOND_VERSION "/' src/version.cpp.in -sed -i 's/DEF_MONERO_RELEASE_NAME/DEF_MOND_RELEASE_NAME/' src/version.cpp.in -sed -i 's/DEF_MONERO_VERSION_FULL/DEF_MOND_VERSION_FULL/' src/version.cpp.in -sed -i 's/DEF_MONERO_VERSION_IS_RELEASE/DEF_MOND_VERSION_IS_RELEASE/' src/version.cpp.in +sed -i 's/DEF_MONERO_VERSION_TAG/DEF_MOND_VERSION_TAG/g' src/version.cpp.in +sed -i 's/DEF_MONERO_VERSION/DEF_MOND_VERSION/g' src/version.cpp.in +sed -i 's/DEF_MONERO_RELEASE_NAME/DEF_MOND_RELEASE_NAME/g' src/version.cpp.in +sed -i 's/DEF_MONERO_VERSION_FULL/DEF_MOND_VERSION_FULL/g' src/version.cpp.in +sed -i 's/DEF_MONERO_VERSION_IS_RELEASE/DEF_MOND_VERSION_IS_RELEASE/g' src/version.cpp.in sed -i 's/MONERO_VERSION_TAG/MOND_VERSION_TAG/g' src/version.cpp.in -sed -i 's/MONERO_VERSION "/MOND_VERSION "/' src/version.cpp.in +sed -i 's/MONERO_VERSION/MOND_VERSION/g' src/version.cpp.in sed -i 's/MONERO_RELEASE_NAME/MOND_RELEASE_NAME/g' src/version.cpp.in sed -i 's/MONERO_VERSION_FULL/MOND_VERSION_FULL/g' src/version.cpp.in sed -i 's/MONERO_VERSION_IS_RELEASE/MOND_VERSION_IS_RELEASE/g' src/version.cpp.in