From 758c4737ab56cb8595cb7911cf1fef2417a4d10c Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 2 Sep 2025 16:13:35 +0800 Subject: [PATCH] build: allinone --- Dockerfile | 4 ++-- start.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd0d2436..16b93edc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN npm install FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-base:latest AS python-builder # Runtime stage # FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-base:latest -FROM pgvector/pgvector:pg17 +FROM registry.cn-qingdao.aliyuncs.com/dataease/postgres:17.6 # python environment COPY --from=python-builder /usr/local /usr/local @@ -78,6 +78,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ARG DEPENDENCIES=" \ vim \ + wait-for-it \ postgresql-17-pgvector" # ENV PGDATA=/var/lib/postgresql/data \ @@ -108,5 +109,4 @@ EXPOSE 3000 8000 8001 5432 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ CMD curl -f http://localhost:8000 || exit 1 -CMD ["/usr/local/bin/docker-entrypoint.sh"] ENTRYPOINT ["sh", "start.sh"] diff --git a/start.sh b/start.sh index bc4fd998..06aa6757 100644 --- a/start.sh +++ b/start.sh @@ -1,5 +1,10 @@ SSR_PATH=/opt/sqlbot/g2-ssr APP_PATH=/opt/sqlbot/app + +/usr/local/bin/docker-entrypoint.sh +sleep 5 +wait-for-it 127.0.0.1:5432 --timeout=120 --strict -- echo -e "\033[1;32mPostgreSQL started.\033[0m" + nohup node $SSR_PATH/app.js & nohup uvicorn main:mcp_app --host 0.0.0.0 --port 8001 &