fix (hook-timeseries-chronix-conversion) Add bzip2 and nlohmann-json dependency install in dockerfiles

Signed-off-by: Ritesh.K <riteshkarki6@gmail.com>

Author: RiteshKarki27

packaging/deps.sh

@@ -602,7 +602,7 @@ if ! cmake --find-package -DNAME=ghc_filesystem -DCOMPILER_ID=GNU -DLANGUAGE=CXX
 fi
 
 # Build and install nlohmann/josn required for hook create_chronics
-if ! find ${PREFIX}/{include,share} -name "*nlohmann*" 2>/dev/null | grep -q . && \
+if ! pkg-config "nlohmann_json" && \
     should_build "nlohman_json" "for the delta-sharing node-type"; then
     git clone https://github.com/nlohmann/json.git json
     mkdir -p json/build
@@ -613,15 +613,15 @@ if ! find ${PREFIX}/{include,share} -name "*nlohmann*" 2>/dev/null | grep -q . &
 fi
 
 # Build and install Bzip2 required for hook create_chronics
-if ! { [ -f /usr/local/include/bzlib.h ] && ldconfig -p  | grep -q libbz2; } && \
+if ! pkg-config "bzip2" && \
     should_build "BZip2" "for create_chronics hook"; then
     git clone https://github.com/libarchive/bzip2.git bzip2
     mkdir -p bzip2/build
     pushd bzip2/build
     cmake ..
     make ${MAKE_OPTS} install
     popd
-fi
+    fi
 
 popd >/dev/null
 

packaging/docker/Dockerfile.debian

@@ -52,7 +52,9 @@ RUN apt-get update && \
 	libssl-dev \
 	libusb-1.0-0-dev \
 	libzmq3-dev \
-	uuid-dev
+	uuid-dev \
+    libbz2-dev \
+    nlohmann-json3-dev
 
 # Install unpackaged dependencies from source
 ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.debian-multiarch

@@ -58,7 +58,9 @@ RUN apt-get update && \
 	libssl-dev:${ARCH} \
 	libusb-1.0-0-dev:${ARCH} \
 	libzmq3-dev:${ARCH} \
-	uuid-dev:${ARCH}
+	uuid-dev:${ARCH} \
+    nlohmann-json3-dev:${ARCH} \
+    libbz2:${ARCH}
 
 ADD cmake/toolchains/debian-${ARCH}.cmake /
 

packaging/docker/Dockerfile.fedora

@@ -64,7 +64,9 @@ RUN dnf -y install \
 	protobuf-c-devel \
 	protobuf-devel \
 	spdlog-devel \
-	zeromq-devel
+	zeromq-devel \
+    bzip2-devel \
+    json-devel
 
 # Install unpackaged dependencies from source
 # TODO: We currently need to build with GCC 14 to get OpenDSSC working

packaging/docker/Dockerfile.rocky

@@ -53,7 +53,9 @@ RUN dnf -y install \
 	nanomsg-devel \
 	libnice-devel \
 	libre-devel \
-	libwebsockets-devel
+	libwebsockets-devel \
+    bzip2-devel \
+    json-devel
 
 # Install unpackaged dependencies from source
 ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.rocky9

@@ -48,7 +48,9 @@ RUN dnf -y install \
 	lua-devel \
 	hiredis-devel \
 	libnice-devel \
-	libmodbus-devel
+	libmodbus-devel \
+    bzip2-devel \
+    json-devel
 
 # Install unpackaged dependencies from source
 ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.ubuntu

@@ -59,7 +59,9 @@ RUN apt-get update && \
 	libusb-1.0-0-dev \
 	libwebsockets-dev \
 	libzmq3-dev \
-	uuid-dev
+	uuid-dev \
+    libbz2-dev \
+    nlohmann-json-dev
 
 # Install unpackaged dependencies from source
 ADD packaging/patches /deps/patches