Skip to content

Commit f41777c

Browse files
author
zhanglongbin
committed
Revise the deployment document.
1 parent da9c5ec commit f41777c

3 files changed

Lines changed: 8 additions & 17 deletions

File tree

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,4 @@ RUN git config --global --add safe.directory '*'
4343

4444
# Start fastapi API Server
4545
EXPOSE 8000
46-
# CMD ["df-server"]
47-
CMD ["uvicorn", "data_server.main:app", "--host", "0.0.0.0", "--port", "8000"]
4846

README.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ This project inherits the [Apache License 2.0](LICENSE) from Data Juicer.
3434
docker build -t dataflow . -f Dockerfile
3535
```
3636

37-
## Building data-flow-celery from Source
38-
39-
```
40-
docker build -t dataflow-celery . -f Dockerfile-celery
41-
```
4237

4338
## Prerequisites
4439

@@ -80,6 +75,7 @@ docker run -d --name dataflow-redis \
8075

8176
docker run -d --name dataflow-api -p 8000:8000 \
8277
-v /home/apidata:/data/dataflow_data \
78+
-c "uvicorn data_server.main:app --host 0.0.0.0 --port 8000" \
8379
-e DATA_DIR=/data/dataflow_data \
8480
-e CSGHUB_ENDPOINT=https://hub.opencsg.com \
8581
-e MAX_WORKERS=99 \
@@ -107,6 +103,7 @@ docker run -d --name dataflow-api -p 8000:8000 \
107103

108104
docker run -d --name celery-work -p 8001:8001 \
109105
-v /home/celery-data:/data/dataflow_celery \
106+
-c "celery -A data_celery.main:celery_app worker --loglevel=info --pool=gevent" \
110107
-e DATA_DIR=/data/dataflow_celery \
111108
-e CSGHUB_ENDPOINT=https://hub.opencsg.com \
112109
-e MAX_WORKERS=99 \
@@ -146,14 +143,6 @@ uvicorn data_server.main:app --reload
146143
## Run data-flow-celery server in development mode locally
147144

148145
```bash
149-
# Create virtual python 3.10 environment
150-
conda create -n dataflow python=3.10
151-
152-
# Install dependencies
153-
pip install '.[dist]' -i https://pypi.tuna.tsinghua.edu.cn/simple/
154-
pip install '.[tools]' -i https://pypi.tuna.tsinghua.edu.cn/simple/
155-
pip install '.[sci]' -i https://pypi.tuna.tsinghua.edu.cn/simple/
156-
pip install -r docker/requirements.txt
157146

158147
# Run the celery server locally
159148
celery -A data_celery.main:celery_app worker --loglevel=info --pool=gevent

docker-compose-stg.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ services:
4848
celery -A data_celery.main:celery_app worker --loglevel=info --pool=eventlet -n $$NODENAME
4949
"
5050
volumes:
51-
- /root/dataflow/dataflow-v2/celery-data:/data/dataflow_celery
51+
- /root/dataflow/dataflow-v2/apidata:/data/dataflow_data
5252
environment:
53-
- DATA_DIR=/data/dataflow_celery
53+
- DATA_DIR=/data/dataflow_data
5454
- CSGHUB_ENDPOINT=https://hub.opencsg-stg.com
5555
- MAX_WORKERS=99
5656
- RAY_ADDRESS=auto
@@ -78,6 +78,10 @@ services:
7878
dataflow_api_server:
7979
restart: unless-stopped
8080
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20250816
81+
command: >
82+
sh -c "
83+
uvicorn data_server.main:app --host 0.0.0.0 --port 8000
84+
"
8185
volumes:
8286
- /root/dataflow/dataflow-v2/apidata:/data/dataflow_data
8387
environment:

0 commit comments

Comments
 (0)