This is an automated email from the ASF dual-hosted git repository.
szaszm 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 1280948e5 MINIFICPP-2891 Fix rocky9_from_rocky_package docker (#2252)
1280948e5 is described below
commit 1280948e528d3dcf4a24e3ff273a2f475f739d28
Author: Martin Zink <[email protected]>
AuthorDate: Wed Sep 2 18:52:50 2026 +0200
MINIFICPP-2891 Fix rocky9_from_rocky_package docker (#2252)
---
cmake/VerifyPackageWithDocker.cmake | 8 ++++----
minifi_rust/minifi_rs_behave/Dockerfile.alpine | 2 +-
minifi_rust/minifi_rs_behave/Dockerfile.debian | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmake/VerifyPackageWithDocker.cmake
b/cmake/VerifyPackageWithDocker.cmake
index c00d0d771..330ac64c0 100644
--- a/cmake/VerifyPackageWithDocker.cmake
+++ b/cmake/VerifyPackageWithDocker.cmake
@@ -39,16 +39,16 @@ function(ADD_PACKAGE_VERIFY TAG_PREFIX)
endfunction()
-CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:8 rocky8 "dnf install -y
wget python3.12-devel python3.12-pip gcc gcc-c++ findutils libatomic")
-CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:9 rocky9 "dnf install -y
wget python3-devel python3-pip gcc gcc-c++ findutils libatomic")
+CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:8 rocky8 "dnf install -y
wget python3.12-devel python3.12-pip gcc gcc-c++ findutils libatomic \\&\\&
alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 \\&\\&
alternatives --set python3 /usr/bin/python3.12")
+CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:9 rocky9 "dnf install -y
wget python3.12-devel python3.12-pip gcc gcc-c++ findutils libatomic \\&\\&
alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 \\&\\&
alternatives --set python3 /usr/bin/python3.12")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux/rockylinux:10 rocky10 "dnf
install -y wget python3-devel python3-pip gcc gcc-c++ findutils libatomic")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(ubuntu:jammy jammy "apt update \\&\\&
apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(ubuntu:noble noble "apt update \\&\\&
apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(debian:bookworm bookworm "apt update
\\&\\& apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(debian:bullseye bullseye "apt update
\\&\\& apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(debian:trixie trixie "apt update
\\&\\& apt install -y wget python3-dev python3-venv python3-pip")
-CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:8 rocky8 "dnf install -y wget
python3.12-devel python3.12-pip gcc gcc-c++ libatomic")
-CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:9 rocky9 "dnf install -y wget
python3-devel python3-pip gcc gcc-c++ libatomic")
+CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:8 rocky8 "dnf install -y wget
python3.12-devel python3.12-pip gcc gcc-c++ findutils libatomic \\&\\&
alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 \\&\\&
alternatives --set python3 /usr/bin/python3.12")
+CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:9 rocky9 "dnf install -y wget
python3.12-devel python3.12-pip gcc gcc-c++ findutils libatomic \\&\\&
alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 \\&\\&
alternatives --set python3 /usr/bin/python3.12")
CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux/rockylinux:10 rocky10 "dnf
install -y wget python3-devel python3-pip gcc gcc-c++ libatomic")
ADD_PACKAGE_VERIFY(rocky8)
diff --git a/minifi_rust/minifi_rs_behave/Dockerfile.alpine
b/minifi_rust/minifi_rs_behave/Dockerfile.alpine
index 032c26ec5..89f2c0198 100644
--- a/minifi_rust/minifi_rs_behave/Dockerfile.alpine
+++ b/minifi_rust/minifi_rs_behave/Dockerfile.alpine
@@ -22,4 +22,4 @@ RUN cargo build --release
# Export Stage
FROM scratch AS bin-export
-COPY --from=builder /app/target/release/libminifi_rs_playground.so /
+COPY --from=builder /app/target/release/libminifi*.so /
diff --git a/minifi_rust/minifi_rs_behave/Dockerfile.debian
b/minifi_rust/minifi_rs_behave/Dockerfile.debian
index 274ed3cb5..e3283496b 100644
--- a/minifi_rust/minifi_rs_behave/Dockerfile.debian
+++ b/minifi_rust/minifi_rs_behave/Dockerfile.debian
@@ -22,4 +22,4 @@ RUN cargo build --release
# Export Stage
FROM scratch AS bin-export
-COPY --from=builder /app/target/release/libminifi_rs_playground.so /
+COPY --from=builder /app/target/release/libminifi*.so /
