This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 148097ab3 MINIFICPP-2888 Fixing build failure in rocky (#2250)
148097ab3 is described below
commit 148097ab398f42aa5dc6eb4f4404008bae1e85e6
Author: Martin Zink <[email protected]>
AuthorDate: Wed Aug 26 13:17:09 2026 +0200
MINIFICPP-2888 Fixing build failure in rocky (#2250)
---
docker/rockylinux/Dockerfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/rockylinux/Dockerfile b/docker/rockylinux/Dockerfile
index f7eb25e70..85e11e464 100644
--- a/docker/rockylinux/Dockerfile
+++ b/docker/rockylinux/Dockerfile
@@ -45,8 +45,8 @@ COPY . ${MINIFI_BASE_DIR}
# ccache is in EPEL
RUN dnf -y install epel-release && dnf -y install gcc-toolset-14
gcc-toolset-14-libatomic-devel sudo git which make libarchive ccache
ca-certificates perl patch bison flex libtool cmake rpmdevtools && \
if echo "$MINIFI_OPTIONS" | grep -q "MINIFI_RUST=ON"; then dnf -y install
rust cargo clang; fi && \
- if [ "${DOCKER_USE_CONAN}" == "ON" ]; then dnf -y install python3.12; fi
&& \
- if echo "$MINIFI_OPTIONS" | grep -q
"ENABLE_ALL=ON\|ENABLE_PYTHON_SCRIPTING=ON\|ENABLE_OPC=ON"; then dnf -y
--enablerepo=devel install python3.12-devel; fi && \
+ if [ "${DOCKER_USE_CONAN}" == "ON" ]; then dnf -y install python3.11; fi
&& \
+ if echo "$MINIFI_OPTIONS" | grep -q
"ENABLE_ALL=ON\|ENABLE_PYTHON_SCRIPTING=ON\|ENABLE_OPC=ON"; then dnf -y
--enablerepo=devel install python3.11-devel; fi && \
if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_ALL=ON\|ENABLE_SFTP=ON" && [
"${DOCKER_SKIP_TESTS}" == "OFF" ]; then dnf -y install java-1.8.0-openjdk
maven; fi
RUN cd $MINIFI_BASE_DIR && \
@@ -61,11 +61,11 @@ USER ${USER}
RUN --mount=type=secret,id=nifi_conan_password,mode=0444 echo
"DOCKER_USE_CONAN=${DOCKER_USE_CONAN}" && if [ "${DOCKER_USE_CONAN}" == "ON" ];
then \
set -e; \
cd ${MINIFI_BASE_DIR}/bootstrap && \
- python3.12 -m venv venv && \
+ python3.11 -m venv venv && \
source /opt/rh/gcc-toolset-14/enable && \
source venv/bin/activate && \
- pip3.12 install -r requirements.txt && \
- python3.12 main.py --skip-compiler-install --run-conan-install
--minifi-options="${MINIFI_OPTIONS}" && \
+ pip3.11 install -r requirements.txt && \
+ python3.11 main.py --skip-compiler-install --run-conan-install
--minifi-options="${MINIFI_OPTIONS}" && \
if [ -n "${DOCKER_NIFI_CONAN_USER}" ] && [ -f
/run/secrets/nifi_conan_password ]; then \
conan remote login nifi-conan ${DOCKER_NIFI_CONAN_USER} -p "$(cat
/run/secrets/nifi_conan_password)" || true; \
conan upload "*" -r nifi-conan --confirm || true; \
@@ -80,7 +80,7 @@ RUN cd $MINIFI_BASE_DIR && \
export PATH=/usr/lib64/ccache${PATH:+:${PATH}} && \
export CCACHE_DIR=${MINIFI_BASE_DIR}/.ccache && \
if [ "${DOCKER_USE_CONAN}" == "ON" ]; then
CONAN_TOOLCHAIN="-DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake"; fi && \
- cmake -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS}
${CONAN_TOOLCHAIN:-} ${MINIFI_OPTIONS} -DPython_EXECUTABLE=/usr/bin/python3.12
-DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
+ cmake -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS}
${CONAN_TOOLCHAIN:-} ${MINIFI_OPTIONS} -DPython_EXECUTABLE=/usr/bin/python3.11
-DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
make -j "$(nproc)" ${DOCKER_MAKE_TARGET} && \
if [[ "${DOCKER_CREATE_RPM}" == "ON" ]] ; then \
cmake -DMINIFI_PACKAGING_TYPE=RPM .. && \
