From ef046e5d2661792d04f9619ca976aef2a2ca6a1c Mon Sep 17 00:00:00 2001
From: Junhao Liao <junhao@junhao.ca>
Date: Sun, 12 Oct 2025 22:34:34 -0400
Subject: [PATCH 1/4] 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).

---
 taskfiles/deps/main.yaml                   |  1 +
 tools/docker-images/clp-package/Dockerfile | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml
index 9a6b0ab478..ed37d48251 100644
--- a/taskfiles/deps/main.yaml
+++ b/taskfiles/deps/main.yaml
@@ -405,6 +405,7 @@ tasks:
       - task: "utils:install-remote-cmake-lib"
         vars:
           CMAKE_GEN_ARGS:
+            - "-DCMAKE_BUILD_TYPE=Release"
             - "-DUSE_SYSTEM_INSTALLED_LIB=ON"
             - "-DINSTALL_LAYOUT=DEB"
           LIB_NAME: "mariadb-connector-cpp"
diff --git a/tools/docker-images/clp-package/Dockerfile b/tools/docker-images/clp-package/Dockerfile
index 9d1bc5c71e..21d9d5795b 100644
--- a/tools/docker-images/clp-package/Dockerfile
+++ b/tools/docker-images/clp-package/Dockerfile
@@ -10,15 +10,18 @@ RUN ./setup-scripts/install-prebuilt-packages.sh \
 RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ENV CLP_HOME="/opt/clp"
-ENV PATH="${CLP_HOME}/bin:${PATH}"
-ENV PATH="${CLP_HOME}/sbin:${PATH}"
-ENV PYTHONPATH="${CLP_HOME}/lib/python3/site-packages"
-
-USER 1000:1000
-
 COPY ./build/clp-package /opt/clp
+COPY --link ./build/deps/cpp/mariadb-connector-cpp-install/lib/x86_64-linux-gnu/libmariadbcpp.so \
+    /opt/clp/lib/libmariadbcpp.so
 
 # Flatten the image
 FROM scratch
 COPY --from=base / /
+
+ENV CLP_HOME="/opt/clp"
+ENV LD_LIBRARY_PATH="${CLP_HOME}/lib" \
+    PATH="${CLP_HOME}/bin:${PATH}" \
+    PYTHONPATH="${CLP_HOME}/lib/python3/site-packages"
+ENV PATH="${CLP_HOME}/sbin:${PATH}"
+
+USER 1000:1000

From cfa71d899cc0314882daa738c3950fe6caa35469 Mon Sep 17 00:00:00 2001
From: Junhao Liao <junhao@junhao.ca>
Date: Sun, 12 Oct 2025 23:29:25 -0400
Subject: [PATCH 2/4] Make COPY arch-agnostic and include SONAME symlinks

---
 tools/docker-images/clp-package/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/docker-images/clp-package/Dockerfile b/tools/docker-images/clp-package/Dockerfile
index 21d9d5795b..b4ad1cdf22 100644
--- a/tools/docker-images/clp-package/Dockerfile
+++ b/tools/docker-images/clp-package/Dockerfile
@@ -11,8 +11,7 @@ RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY ./build/clp-package /opt/clp
-COPY --link ./build/deps/cpp/mariadb-connector-cpp-install/lib/x86_64-linux-gnu/libmariadbcpp.so \
-    /opt/clp/lib/libmariadbcpp.so
+COPY --link ./build/deps/cpp/mariadb-connector-cpp-install/lib/*/libmariadbcpp.so* /opt/clp/lib/
 
 # Flatten the image
 FROM scratch

From 42fba6cdeb88f49e7fbef6526d543dff22e94e28 Mon Sep 17 00:00:00 2001
From: Junhao Liao <junhao@junhao.ca>
Date: Mon, 20 Oct 2025 17:13:46 -0400
Subject: [PATCH 3/4] merge with the latest from #1413

---
 tools/docker-images/clp-package/Dockerfile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/docker-images/clp-package/Dockerfile b/tools/docker-images/clp-package/Dockerfile
index 0057ffd7b7..d93a27b89d 100644
--- a/tools/docker-images/clp-package/Dockerfile
+++ b/tools/docker-images/clp-package/Dockerfile
@@ -16,13 +16,18 @@ RUN apt-get clean \
 FROM scratch
 COPY --link --from=base / /
 
+ARG UID=1000
 ENV CLP_HOME="/opt/clp"
 ENV LD_LIBRARY_PATH="${CLP_HOME}/lib" \
     PATH="${CLP_HOME}/bin:${PATH}" \
-    PYTHONPATH="${CLP_HOME}/lib/python3/site-packages"
+    PYTHONPATH="${CLP_HOME}/lib/python3/site-packages" \
+    USER="clp-user"
 ENV PATH="${CLP_HOME}/sbin:${PATH}"
 
-USER 1000:1000
+RUN useradd --uid ${UID} --shell /bin/bash --home-dir ${CLP_HOME} ${USER}
+USER ${USER}
+WORKDIR ${CLP_HOME}
 
-COPY --link ./build/clp-package ${CLP_HOME}
-COPY --link ./build/deps/cpp/mariadb-connector-cpp-install/lib/*/libmariadbcpp.so* ${CLP_HOME}/lib/
+COPY --link --chown=${UID} ./build/clp-package ${CLP_HOME}
+COPY --link --chown=${UID} ./build/deps/cpp/mariadb-connector-cpp-install/lib/*/libmariadbcpp.so* \
+    ${CLP_HOME}/lib/

From b345b02feeb250ca69a27d19a6837a8397ea79c6 Mon Sep 17 00:00:00 2001
From: Junhao Liao <junhao@junhao.ca>
Date: Thu, 23 Oct 2025 09:58:01 -0400
Subject: [PATCH 4/4] merge ENVs

---
 tools/docker-images/clp-package/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/docker-images/clp-package/Dockerfile b/tools/docker-images/clp-package/Dockerfile
index d93a27b89d..6728a5f0c9 100644
--- a/tools/docker-images/clp-package/Dockerfile
+++ b/tools/docker-images/clp-package/Dockerfile
@@ -19,10 +19,9 @@ COPY --link --from=base / /
 ARG UID=1000
 ENV CLP_HOME="/opt/clp"
 ENV LD_LIBRARY_PATH="${CLP_HOME}/lib" \
-    PATH="${CLP_HOME}/bin:${PATH}" \
+    PATH="${CLP_HOME}/sbin:${CLP_HOME}/bin:${PATH}" \
     PYTHONPATH="${CLP_HOME}/lib/python3/site-packages" \
     USER="clp-user"
-ENV PATH="${CLP_HOME}/sbin:${PATH}"
 
 RUN useradd --uid ${UID} --shell /bin/bash --home-dir ${CLP_HOME} ${USER}
 USER ${USER}