Skip to content

Commit b625cfc

Browse files
committed
fix (node-delta-sharing): Provide package installation for dockerfiles
Signed-off-by: Ritesh.K <riteshkarki6@gmail.com>
1 parent 59558e8 commit b625cfc

8 files changed

Lines changed: 26 additions & 11 deletions

packaging/deps.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ if ! cmake --find-package -DNAME=ghc_filesystem -DCOMPILER_ID=GNU -DLANGUAGE=CXX
603603
fi
604604

605605
# Build and install Apache Arrow with Parquet and Snappy
606-
if ! cmake --find-package -DNAME=Arrow -DCOMPILER_ID=GNU -DLANGUAGE-CXX -DMODE=EXIST >/dev/null 2>/dev/null && \
606+
if ! pkg-config "arrow" && \
607607
should_build "apache-arrow" "for Arrow/Parquet support"; then
608608
ARROW_TAG=${ARROW_TAG:-apache-arrow-16.1.0}
609609
ARROW_REPO=${ARROW_REPO:-https://github.com/apache/arrow.git}
@@ -631,7 +631,7 @@ if ! cmake --find-package -DNAME=Arrow -DCOMPILER_ID=GNU -DLANGUAGE-CXX -DMODE=E
631631
popd
632632
fi
633633

634-
# Build and install restclient-cpp required for delta_sharing node
634+
# Build and install restclient-cpp required for delta_sharing node. Package not available in package managers.
635635
if ! find ${PREFIX}/{lib,lib64} -name "*restclient-cpp*" 2>/dev/null | grep -q . && \
636636
should_build "restclient-cpp" "for the delta-sharing node-type"; then
637637
git clone ${GIT_OPTS} --branch 0.5.2 https://github.com/mrtazz/restclient-cpp.git
@@ -645,8 +645,8 @@ if ! find ${PREFIX}/{lib,lib64} -name "*restclient-cpp*" 2>/dev/null | grep -q .
645645
popd
646646
fi
647647

648-
# Build and install nlohmann/josn required for delta_sharing node
649-
if ! find ${PREFIX}/{include,share} -name "*nlohmann*" 2>/dev/null | grep -q . && \
648+
# Build and install nlohmann/json required for delta_sharing node
649+
if ! pkg-config "nlohmann_json" && \
650650
should_build "nlohman_json" "for the delta-sharing node-type"; then
651651
git clone https://github.com/nlohmann/json.git json
652652
mkdir -p json/build

packaging/docker/Dockerfile.debian

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ RUN apt-get update && \
5252
libssl-dev \
5353
libusb-1.0-0-dev \
5454
libzmq3-dev \
55-
uuid-dev
55+
uuid-dev \
56+
libarrow-dev libarrow-dataset-dev libparquet-dev \
57+
nlohmann-json3-dev
5658

5759
# Install unpackaged dependencies from source
5860
ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.debian-multiarch

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ RUN apt-get update && \
149149
libusb-1.0-0:${ARCH} \
150150
liblua5.3-0:${ARCH} \
151151
libhiredis0.14:${ARCH} \
152-
libmodbus5:${ARCH} && \
152+
libmodbus5:${ARCH} \
153+
libarrow-dev:${ARCH} libarrow-dataset-dev:${ARCH} \
154+
libparquet-dev:${ARCH} \
155+
nlohmann-json3-dev:${ARCH} && \
153156
rm -rf /var/lib/apt/lists/*
154157

155158
COPY --from=builder ${PREFIX} ${PREFIX}

packaging/docker/Dockerfile.fedora

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ RUN dnf -y install \
6464
protobuf-c-devel \
6565
protobuf-devel \
6666
spdlog-devel \
67-
zeromq-devel
67+
zeromq-devel \
68+
libarrow-devel libarrow-dataset-devel parquet-libs-devel \
69+
json-devel
6870

6971
# Install unpackaged dependencies from source
7072
# TODO: We currently need to build with GCC 14 to get OpenDSSC working

packaging/docker/Dockerfile.fedora-minimal

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ RUN dnf -y install \
2424
jansson-devel \
2525
spdlog-devel \
2626
fmt-devel \
27-
libwebsockets-devel
27+
libwebsockets-devel \
28+
libarrow-devel libarrow-dataset-devel parquet-libs-devel \
29+
json-devel
2830

2931
ENV LC_ALL=C.UTF-8
3032
ENV LANG=C.UTF-8

packaging/docker/Dockerfile.rocky

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ RUN dnf -y install \
5353
nanomsg-devel \
5454
libnice-devel \
5555
libre-devel \
56-
libwebsockets-devel
56+
libwebsockets-devel \
57+
libarrow-devel libarrow-dataset-devel parquet-libs-devel \
58+
json-devel
5759

5860
# Install unpackaged dependencies from source
5961
ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.rocky9

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ RUN dnf -y install \
4848
lua-devel \
4949
hiredis-devel \
5050
libnice-devel \
51-
libmodbus-devel
51+
libmodbus-devel \
52+
libarrow-devel libarrow-dataset-devel parquet-libs-devel \
53+
json-devel
5254

5355
# Install unpackaged dependencies from source
5456
ADD packaging/patches /deps/patches

packaging/docker/Dockerfile.ubuntu

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ RUN apt-get update && \
5959
libusb-1.0-0-dev \
6060
libwebsockets-dev \
6161
libzmq3-dev \
62-
uuid-dev
62+
uuid-dev \
63+
libarrow-dev libarrow-dataset-dev libparquet-dev \
64+
nlohmann-json3-dev
6365

6466
# Install unpackaged dependencies from source
6567
ADD packaging/patches /deps/patches

0 commit comments

Comments
 (0)