From 98d75ba17e807c466da300b7ff0d6b09a63bd239 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Mon, 1 Dec 2025 16:51:28 +0800 Subject: [PATCH] refactor: Add the dependency files for the dm database --- Dockerfile | 3 --- Dockerfile-base | 12 +++++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c8e926e..c64681fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,9 +80,6 @@ ENV POSTGRES_DB=sqlbot ENV POSTGRES_USER=root ENV POSTGRES_PASSWORD=Password123@pg -# Add Oracle instant client path to ENV -ENV LD_LIBRARY_PATH="/opt/sqlbot/db_client/oracle_instant_client:${LD_LIBRARY_PATH}" - # Copy necessary files from builder COPY start.sh /opt/sqlbot/app/start.sh COPY g2-ssr/*.ttf /usr/share/fonts/truetype/liberation/ diff --git a/Dockerfile-base b/Dockerfile-base index 21c19390..c78ab7c1 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -31,6 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Download Oracle instant client ENV DB_CLIENT=/opt/sqlbot/db_client +ENV LD_LIBRARY_PATH="${DB_CLIENT}/oracle_instant_client:${LD_LIBRARY_PATH}" ARG TARGETARCH RUN apt-get update && \ apt-get install -y unzip libaio1 && \ @@ -45,4 +46,13 @@ RUN apt-get update && \ unzip app.zip -d ${DB_CLIENT} && \ rm app.zip && \ rm -rf /var/lib/apt/lists/* && \ - mv ${DB_CLIENT}/instantclient* ${DB_CLIENT}/oracle_instant_client \ No newline at end of file + mv ${DB_CLIENT}/instantclient* ${DB_CLIENT}/oracle_instant_client + +# Download DM library +ENV DM_HOME=/opt/dmdbms +ENV LD_LIBRARY_PATH=$DM_HOME/bin:$LD_LIBRARY_PATH +RUN curl -L -o dm.zip https://resource-fit2cloud-com.oss-cn-hangzhou.aliyuncs.com/sqlbot/dm/$TARGETARCH.zip && \ + mkdir -p $DM_HOME/bin && \ + unzip dm.zip -d $DM_HOME/bin && \ + chmod -R +x $DM_HOME/bin && \ + rm -rf dm.zip \ No newline at end of file