Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
12 changes: 11 additions & 1 deletion Dockerfile-base
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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
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