From 9290ec794f98a9390279348b6248ae3859633e83 Mon Sep 17 00:00:00 2001 From: Snider Date: Thu, 2 Oct 2025 00:49:42 +0100 Subject: [PATCH] Update build process and Dockerfile dependencies Refactored Makefile to use $(BUILD_FOLDER) and updated Conan and CMake commands for improved flexibility. Dockerfile now installs additional mkdocs plugins and uses 'make build' instead of 'make release' for building, aligning with updated Makefile targets. --- Makefile | 8 ++++---- utils/docker/images/lthn-chain/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4804838c..c04a699f 100644 --- a/Makefile +++ b/Makefile @@ -110,10 +110,10 @@ conan-profile-detect: # Rule for each profile $(PROFILES): conan-profile-detect @echo "Building profile: $@" - CONAN_HOME=$(CONAN_CACHE) conan install . --output-folder=build/$@ -pr:b=$(DEFAULT_CONAN_PROFILE) -pr:h=cmake/profiles/$@ --build=missing -s build_type=$(BUILD_TYPE) - cmake -S . -B build/$@ -DCMAKE_TOOLCHAIN_FILE=build/$@/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DSTATIC=$(STATIC) -DTESTNET=$(TESTNET) -DBUILD_VERSION=$(BUILD_VERSION) - cmake --build build/$@ --config=$(BUILD_TYPE) --parallel=$(CPU_CORES) - (cd build/$@ && cpack) + CONAN_HOME=$(CONAN_CACHE) conan install . -pr:h=cmake/profiles/$@ --build=missing -s build_type=$(BUILD_TYPE) + cmake -S . -B $(BUILD_FOLDER) -DCMAKE_TOOLCHAIN_FILE=$(BUILD_FOLDER)/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DSTATIC=$(STATIC) -DTESTNET=$(TESTNET) -DBUILD_VERSION=$(BUILD_VERSION) + cmake --build $(BUILD_FOLDER) --config=$(BUILD_TYPE) --parallel=$(CPU_CORES) + (cd $(BUILD_FOLDER) && cpack) help: @echo "Available targets:" diff --git a/utils/docker/images/lthn-chain/Dockerfile b/utils/docker/images/lthn-chain/Dockerfile index 27d92c7d..0ed6d66f 100644 --- a/utils/docker/images/lthn-chain/Dockerfile +++ b/utils/docker/images/lthn-chain/Dockerfile @@ -16,7 +16,7 @@ RUN apt install -y build-essential pkgconf \ g++ llvm clang lld cmake python-is-python3 \ git python3 python3-pip python3-dev xz-utils gperf -RUN pip3 install conan --break-system-packages +RUN pip3 install conan mkdocs-git-revision-date-localized-plugin mkdocs-git-committers-plugin-2 mkdocs-git-authors-plugin mkdocs-material[imaging] --break-system-packages WORKDIR / @@ -44,7 +44,7 @@ ARG BUILD_TESTNET=1 -RUN make release CPU_CORES=${BUILD_THREADS} TESTNET=${BUILD_TESTNET} STATIC=${BUILD_STATIC} +RUN make build CPU_CORES=${BUILD_THREADS} TESTNET=${BUILD_TESTNET} STATIC=${BUILD_STATIC} #RUN cmake --build ${BUILD_FOLDER} --config=${BUILD_TYPE} --parallel=${THREADS} # minor cmd-fu; TESTNEt and MAINNET, in docker context, use MAIINNET binaries names.