From 216aba4cc89c4fbb3fce7b8bdb7eaa451a8f343a Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 1 Sep 2025 18:36:15 +0800 Subject: [PATCH] build: allinone --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ebeec89a..a23ae117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,12 +45,7 @@ COPY g2-ssr/charts/* /app/charts/ RUN npm install -FROM registry.cn-qingdao.aliyuncs.com/dataease/postgres:17.6 -ENV PG_PATH=/var/lib/postgresql/data -ENV PG_SH=/usr/local/bin -RUN mkdir -p ${PG_PATH} -COPY --from=registry.cn-qingdao.aliyuncs.com/dataease/postgres:17.6 ${PG_PATH} ${PG_PATH} -COPY --from=registry.cn-qingdao.aliyuncs.com/dataease/postgres:17.6 ${PG_SH} ${PG_SH} +FROM registry.cn-qingdao.aliyuncs.com/dataease/postgres:17.6 AS pg-builder # Runtime stage FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-base:latest @@ -61,6 +56,12 @@ ENV SQLBOT_HOME=/opt/sqlbot ENV PYTHONPATH=${SQLBOT_HOME}/app ENV PATH="${SQLBOT_HOME}/app/.venv/bin:$PATH" +ENV PG_PATH=/var/lib/postgresql/data +ENV PG_SH=/usr/local/bin +RUN mkdir -p ${PG_PATH} +COPY --from=pg-builder ${PG_PATH} ${PG_PATH} +COPY --from=pg-builder ${PG_SH} ${PG_SH} + # Copy necessary files from builder COPY start.sh /opt/sqlbot/app/start.sh COPY g2-ssr/*.ttf /usr/share/fonts/truetype/liberation/