From 467bd99ef36cda2dda9c3a018c3061876aeff94b Mon Sep 17 00:00:00 2001 From: GuoQing Zhang Date: Thu, 19 Dec 2024 18:53:02 +0800 Subject: [PATCH] ci: change backend start cmd --- docker/bisheng/entrypoint.sh | 4 ++++ docker/docker-compose.yml | 3 ++- src/backend/Dockerfile | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 docker/bisheng/entrypoint.sh diff --git a/docker/bisheng/entrypoint.sh b/docker/bisheng/entrypoint.sh new file mode 100644 index 000000000..a5cf866a9 --- /dev/null +++ b/docker/bisheng/entrypoint.sh @@ -0,0 +1,4 @@ +nohup uvicorn bisheng.main:app --host 0.0.0.0 --port 7860 --no-access-log --workers 2 & + +# -c 是指定celery的并发数 +celery -A bisheng.worker.main worker -l info -c 4 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 13ee5d408..14dbc5dac 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -72,10 +72,11 @@ services: BS_MINIO_SECRET_KEY: 'minioadmin' volumes: - ${DOCKER_VOLUME_DIRECTORY:-.}/bisheng/config/config.yaml:/app/bisheng/config.yaml + - ${DOCKER_VOLUME_DIRECTORY:-.}/bisheng/entrypoint.sh:/app/entrypoint.sh - ${DOCKER_VOLUME_DIRECTORY:-.}/data/bisheng:/app/data security_opt: - seccomp:unconfined - command: bash -c "uvicorn bisheng.main:app --host 0.0.0.0 --port 7860 --no-access-log --workers 2" # --workers 表示使用几个进程,提高并发度 + command: sh entrypoint.sh # --workers 表示使用几个进程,提高并发度 restart: on-failure healthcheck: test: ["CMD", "curl", "-f", "http://localhost:7860/health"] diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile index 7eb5b5122..69f456b5a 100644 --- a/src/backend/Dockerfile +++ b/src/backend/Dockerfile @@ -1,5 +1,7 @@ FROM dataelement/bisheng-backend:base.v1 +WORKDIR /app + COPY ./ ./ RUN poetry config virtualenvs.create false