Skip to content

Commit 1b92ca8

Browse files
authored
fix(docker): Include libmariadbcpp.so (required by spider_scheduler and spider_worker) in the clp-package image; Set mariadb-connector-cpp build type to Release (fixes #1410). (#1414)
1 parent 874df6d commit 1b92ca8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

taskfiles/deps/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ tasks:
406406
- task: "utils:install-remote-cmake-lib"
407407
vars:
408408
CMAKE_GEN_ARGS:
409+
- "-DCMAKE_BUILD_TYPE=Release"
409410
- "-DUSE_SYSTEM_INSTALLED_LIB=ON"
410411
- "-DINSTALL_LAYOUT=DEB"
411412
LIB_NAME: "mariadb-connector-cpp"

tools/docker-images/clp-package/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ COPY --link --from=base / /
1818

1919
ARG UID=1000
2020
ENV CLP_HOME="/opt/clp"
21-
ENV PATH="${CLP_HOME}/sbin:${CLP_HOME}/bin:${PATH}" \
21+
ENV LD_LIBRARY_PATH="${CLP_HOME}/lib" \
22+
PATH="${CLP_HOME}/sbin:${CLP_HOME}/bin:${PATH}" \
2223
PYTHONPATH="${CLP_HOME}/lib/python3/site-packages" \
2324
USER="clp-user"
2425

@@ -27,3 +28,5 @@ USER ${USER}
2728
WORKDIR ${CLP_HOME}
2829

2930
COPY --link --chown=${UID} ./build/clp-package ${CLP_HOME}
31+
COPY --link --chown=${UID} ./build/deps/cpp/mariadb-connector-cpp-install/lib/*/libmariadbcpp.so* \
32+
${CLP_HOME}/lib/

0 commit comments

Comments
 (0)