Refactor: Optimize dependencies and library paths in Dockerfile

Co-authored-by: contact <[email protected]>

Author: cursoragent

Dockerfile

@@ -7,7 +7,7 @@ RUN apt-get update && \
     if [ "$TARGETARCH" = "$BUILDARCH" ]; then \
         rustup target list --installed > TARGET && \
         echo gcc > LINKER && \
-        apt-get install -y gcc libgcc-s1 cmake make autoconf automake libtool pkg-config curl ca-certificates && \
+        apt-get install -y gcc libgcc-s1 cmake unixodbc-dev libltdl-dev pkg-config && \
         LIBMULTIARCH=$(gcc -print-multiarch); \
         LIBDIR="/lib/$LIBMULTIARCH"; \
         USRLIBDIR="/usr/lib/$LIBMULTIARCH"; \
@@ -16,15 +16,15 @@ RUN apt-get update && \
         echo aarch64-unknown-linux-gnu > TARGET && \
         echo aarch64-linux-gnu-gcc > LINKER && \
         dpkg --add-architecture arm64 && apt-get update && \
-        apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross make autoconf automake libtool pkg-config curl ca-certificates && \
+        apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libltdl-dev:arm64 pkg-config && \
         LIBDIR="/lib/aarch64-linux-gnu"; \
         USRLIBDIR="/usr/lib/aarch64-linux-gnu"; \
         HOST_TRIPLE="aarch64-linux-gnu"; \
     elif [ "$TARGETARCH" = "arm" ]; then \
         echo armv7-unknown-linux-gnueabihf > TARGET && \
         echo arm-linux-gnueabihf-gcc > LINKER && \
         dpkg --add-architecture armhf && apt-get update && \
-        apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang make autoconf automake libtool pkg-config curl ca-certificates && \
+        apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libltdl-dev:armhf pkg-config && \
         cargo install --force --locked bindgen-cli && \
         SYSROOT=$(arm-linux-gnueabihf-gcc -print-sysroot); \
         echo "--sysroot=$SYSROOT -I$SYSROOT/usr/include -I$SYSROOT/usr/include/arm-linux-gnueabihf" > BINDGEN_EXTRA_CLANG_ARGS; \
@@ -35,12 +35,7 @@ RUN apt-get update && \
         echo "Unsupported cross compilation target: $TARGETARCH"; \
         exit 1; \
     fi && \
-    ODBC_VERSION="2.3.12" && \
-    curl -fsSL https://www.unixodbc.org/unixODBC-$ODBC_VERSION.tar.gz | tar -xz -C /tmp && \
-    cd /tmp/unixODBC-$ODBC_VERSION && \
-    CC=$(cat LINKER) ./configure --disable-shared --enable-static --host="$HOST_TRIPLE" --prefix=/opt/unixodbc && \
-    make -j"$(nproc)" && make install && \
-    echo /opt/unixodbc/lib > ODBC_LIBDIR && \
+    echo $USRLIBDIR > ODBC_LIBDIR && \
     cp $LIBDIR/libgcc_s.so.1 /opt/sqlpage-libs/ && \
     rustup target add $(cat TARGET) && \
     cargo init .
@@ -74,9 +69,8 @@ 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/sqlpage
-RUN mkdir -p /usr/local/bin/sqlpage
-COPY --from=builder /opt/sqlpage-libs/* /usr/local/bin/sqlpage/
+# Provide runtime helper libs in system lib directory for the glibc busybox base
+COPY --from=builder /opt/sqlpage-libs/* /lib/
 USER sqlpage
 COPY --from=builder --chown=sqlpage:sqlpage /usr/src/sqlpage/sqlpage/sqlpage.db sqlpage/sqlpage.db
 EXPOSE 8080