From 36fe1a9947df557ad8ef0bb20e697cd0e070dae2 Mon Sep 17 00:00:00 2001
From: dfunkt <daniel.barabasa@gmail.com>
Date: Fri, 4 Apr 2025 18:12:37 +0300
Subject: [PATCH] Update `Dockerfile` template

- also remove no longed needed `-vvv` argument for `cargo build`
---
 docker/Dockerfile.debian | 2 +-
 docker/Dockerfile.j2     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
index 8f248c58..50f929b1 100644
--- a/docker/Dockerfile.debian
+++ b/docker/Dockerfile.debian
@@ -134,7 +134,7 @@ ARG DB=sqlite,mysql,postgresql
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
 RUN source /env-cargo && \
-    cargo build --features ${DB} --profile "${CARGO_PROFILE}" --target="${CARGO_TARGET}" -vvv && \
+    cargo build --features ${DB} --profile "${CARGO_PROFILE}" --target="${CARGO_TARGET}" && \
     find . -not -path "./target*" -delete
 
 # Copies the complete project
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index e64252e2..9d9cf767 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -125,8 +125,15 @@ RUN source /env-cargo && \
         echo "export CARGO_TARGET_$(echo "${CARGO_TARGET}" | tr '[:lower:]' '[:upper:]' | tr - _)_LINKER=/usr/bin/$(xx-info)-gcc" >> /env-cargo && \
         echo "export PKG_CONFIG=/usr/bin/$(xx-info)-pkg-config" >> /env-cargo && \
         echo "export CROSS_COMPILE=1" >> /env-cargo && \
+        # Export build env's for OpenSSL
         echo "export OPENSSL_INCLUDE_DIR=/usr/include/$(xx-info)" >> /env-cargo && \
         echo "export OPENSSL_LIB_DIR=/usr/lib/$(xx-info)" >> /env-cargo ; \
+        # Export build env's for mysqlclient-sys (mariadb)
+        # The version is linked to the mariadb-connector-c a.k.a libmariadb-dev version
+        # See: https://mariadb.com/kb/en/about-mariadb-connector-c/
+        echo "export MYSQLCLIENT_VERSION=3.3.14" >> /env-cargo ; \
+        echo "export MYSQLCLIENT_INCLUDE_DIR=/usr/include/mariadb" >> /env-cargo && \
+        echo "export MYSQLCLIENT_LIB_DIR=/usr/lib/$(xx-info)" >> /env-cargo ; \
     fi && \
     # Output the current contents of the file
     cat /env-cargo