Update rpath to include sqlpage directory for ODBC drivers

Co-authored-by: contact <contact@ophir.dev>

Author: cursoragent

.cargo/config.toml

@@ -7,4 +7,4 @@
 LIBSQLITE3_FLAGS = "-DSQLITE_ENABLE_MATH_FUNCTIONS"
 
 [build]
-rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/lib"]
+rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/sqlpage:$ORIGIN/lib"]

Dockerfile

@@ -68,9 +68,9 @@ ENV SQLPAGE_WEB_ROOT=/var/www
 ENV SQLPAGE_CONFIGURATION_DIRECTORY=/etc/sqlpage
 WORKDIR /var/www
 COPY --from=builder /usr/src/sqlpage/sqlpage.bin /usr/local/bin/sqlpage
-# Provide runtime helper libs next to the binary for rpath=$ORIGIN/lib
-RUN mkdir -p /usr/local/bin/lib
-COPY --from=builder /opt/sqlpage-libs/* /usr/local/bin/lib/
+# Provide runtime helper libs next to the binary for rpath=$ORIGIN/sqlpage
+RUN mkdir -p /usr/local/bin/sqlpage
+COPY --from=builder /opt/sqlpage-libs/* /usr/local/bin/sqlpage/
 USER sqlpage
 COPY --from=builder --chown=sqlpage:sqlpage /usr/src/sqlpage/sqlpage/sqlpage.db sqlpage/sqlpage.db
 EXPOSE 8080

README.md

@@ -190,7 +190,7 @@ You can skip this section if you want to use one of the built-in database driver
 
 SQLPage supports ODBC connections to connect to databases that don't have native drivers, such as Oracle, Snowflake, BigQuery, IBM DB2, and many others.
 
-On Linux, the SQLPage binary and Docker image now statically link against the `unixODBC` driver manager, so you generally do not need to install `unixodbc` on the host anymore. You still need to install the database-specific ODBC driver for the database you want to connect to.
+On Linux, the SQLPage binary and Docker image now statically link against the `unixODBC` driver manager, so you generally do not need to install `unixodbc` on the host anymore. You still need to install the database-specific ODBC driver for the database you want to connect to. SQLPage also searches for drivers in a `sqlpage/` directory placed next to the executable (rpath includes `$ORIGIN/sqlpage`). You can drop driver `.so` files there when packaging a self-contained application.
 
 #### Install ODBC