Skip to content

Commit b5fa8af

Browse files
hhhhsc701hhhhsc701
authored
bugfix: 修复deer-flow部署 (#124)
1 parent bcd1bc1 commit b5fa8af

File tree

2 files changed

+40
-31
lines changed

2 files changed

+40
-31
lines changed

‎Makefile‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,20 @@ endif
221221
.PHONY: uninstall
222222
uninstall:
223223
ifeq ($(origin INSTALLER), undefined)
224-
$(call prompt-uninstaller,milvus-$$INSTALLER-uninstall datamate-$$INSTALLER-uninstall)
224+
$(call prompt-uninstaller,label-studio-$$INSTALLER-uninstall milvus-$$INSTALLER-uninstall deer-flow-$$INSTALLER-uninstall datamate-$$INSTALLER-uninstall)
225225
else
226-
@echo "Delete volumes? (This will remove all data)"; \
227-
echo "1. Yes - Delete volumes"; \
228-
echo "2. No - Keep volumes"; \
229-
echo -n "Enter choice (default: 2): "; \
230-
read DELETE_VOLUMES_CHOICE; \
231-
export DELETE_VOLUMES_CHOICE; \
226+
@if [ "$(INSTALLER)" = "docker" ]; then \
227+
echo "Delete volumes? (This will remove all data)"; \
228+
echo "1. Yes - Delete volumes"; \
229+
echo "2. No - Keep volumes"; \
230+
echo -n "Enter choice (default: 2): "; \
231+
read DELETE_VOLUMES_CHOICE; \
232+
export DELETE_VOLUMES_CHOICE; \
233+
fi
234+
@$(MAKE) label-studio-$(INSTALLER)-uninstall DELETE_VOLUMES_CHOICE=$$DELETE_VOLUMES_CHOICE; \
232235
$(MAKE) milvus-$(INSTALLER)-uninstall DELETE_VOLUMES_CHOICE=$$DELETE_VOLUMES_CHOICE; \
233-
$(MAKE) label-studio-$(INSTALLER)-uninstall DELETE_VOLUMES_CHOICE=$$DELETE_VOLUMES_CHOICE; \
236+
$(MAKE) datamate-$(INSTALLER)-uninstall DELETE_VOLUMES_CHOICE=$$DELETE_VOLUMES_CHOICE; \
237+
$(MAKE) deer-flow-$(INSTALLER)-uninstall DELETE_VOLUMES_CHOICE=$$DELETE_VOLUMES_CHOICE; \
234238
$(MAKE) datamate-$(INSTALLER)-uninstall DELETE_VOLUMES_CHOICE=$$DELETE_VOLUMES_CHOICE
235239
endif
236240

@@ -253,22 +257,22 @@ VALID_SERVICE_TARGETS := datamate backend frontend runtime mineru "deer-flow" mi
253257
@if [ "$*" = "label-studio" ]; then \
254258
$(call docker-compose-service,label-studio,up -d,deployment/docker/label-studio); \
255259
elif [ "$*" = "mineru" ]; then \
256-
cd deployment/docker/datamate && export REGISTRY=$(REGISTRY) && docker compose up -d datamate-mineru; \
260+
REGISTRY=$(REGISTRY) && docker compose -f deployment/docker/datamate/docker-compose.yml up -d datamate-mineru; \
257261
elif [ "$*" = "datamate" ]; then \
258262
if docker compose ls --filter name=deer-flow | grep -q deer-flow; then \
259-
(cd deployment/docker/datamate && NGINX_CONF="./backend-with-deer-flow.conf" REGISTRY=$(REGISTRY) docker compose -f docker-compose.yml up -d); \
263+
(NGINX_CONF="./backend-with-deer-flow.conf" REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml up -d); \
260264
else \
261-
(cd deployment/docker/datamate && REGISTRY=$(REGISTRY) docker compose -f docker-compose.yml up -d); \
265+
(REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml up -d); \
262266
fi; \
263267
elif [ "$*" = "deer-flow" ]; then \
264-
cd deployment/docker/datamate && export NGINX_CONF="./backend-with-deer-flow.conf" && export REGISTRY=$(REGISTRY) && docker compose -f docker-compose.yml up -d; \
265268
cp -n runtime/deer-flow/.env.example runtime/deer-flow/.env; \
266269
cp -n runtime/deer-flow/conf.yaml.example runtime/deer-flow/conf.yaml; \
267270
cp runtime/deer-flow/.env deployment/docker/deer-flow/.env; \
268271
cp runtime/deer-flow/conf.yaml deployment/docker/deer-flow/conf.yaml; \
269-
cd deployment/docker/deer-flow && export REGISTRY=$(REGISTRY) && docker compose -f docker-compose.yml up -d; \
272+
REGISTRY=$(REGISTRY) docker compose -f deployment/docker/deer-flow/docker-compose.yml up -d; \
273+
NGINX_CONF="./backend-with-deer-flow.conf" REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml up -d; \
270274
elif [ "$*" = "milvus" ]; then \
271-
cd deployment/docker/milvus && docker compose -f docker-compose.yml up -d; \
275+
docker compose -f deployment/docker/milvus/docker-compose.yml up -d; \
272276
else \
273277
$(call docker-compose-service,$*,up -d,deployment/docker/datamate); \
274278
fi
@@ -286,28 +290,28 @@ VALID_SERVICE_TARGETS := datamate backend frontend runtime mineru "deer-flow" mi
286290
fi
287291
@if [ "$*" = "label-studio" ]; then \
288292
if [ "$(DELETE_VOLUMES_CHOICE)" = "1" ]; then \
289-
cd deployment/docker/label-studio && docker compose down -v; \
293+
cd deployment/docker/label-studio && docker compose down -v && cd - >/dev/null; \
290294
else \
291-
cd deployment/docker/label-studio && docker compose down; \
295+
cd deployment/docker/label-studio && docker compose down && cd - >/dev/null; \
292296
fi; \
293297
elif [ "$*" = "mineru" ]; then \
294298
$(call docker-compose-service,datamate-mineru,down,deployment/docker/datamate); \
295299
elif [ "$*" = "datamate" ]; then \
296300
if [ "$(DELETE_VOLUMES_CHOICE)" = "1" ]; then \
297-
cd deployment/docker/datamate && docker compose -f docker-compose.yml --profile mineru down -v; \
301+
docker compose -f deployment/docker/datamate/docker-compose.yml --profile mineru down -v; \
298302
else \
299-
cd deployment/docker/datamate && docker compose -f docker-compose.yml --profile mineru down; \
303+
docker compose -f deployment/docker/datamate/docker-compose.yml --profile mineru down; \
300304
fi; \
301305
elif [ "$*" = "deer-flow" ]; then \
306+
docker compose -f deployment/docker/deer-flow/docker-compose.yml down; \
302307
if docker compose ls --filter name=datamate | grep -q datamate; then \
303-
cd deployment/docker/datamate && export REGISTRY=$(REGISTRY) && docker compose -f docker-compose.yml up -d; \
308+
REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml up -d; \
304309
fi; \
305-
cd deployment/docker/deer-flow && docker compose -f docker-compose.yml down; \
306310
elif [ "$*" = "milvus" ]; then \
307311
if [ "$(DELETE_VOLUMES_CHOICE)" = "1" ]; then \
308-
cd deployment/docker/milvus && docker compose -f docker-compose.yml down -v; \
312+
docker compose -f deployment/docker/milvus/docker-compose.yml down -v; \
309313
else \
310-
cd deployment/docker/milvus && docker compose -f docker-compose.yml down; \
314+
docker compose -f deployment/docker/milvus/docker-compose.yml down; \
311315
fi; \
312316
else \
313317
$(call docker-compose-service,$*,down,deployment/docker/datamate); \
@@ -316,7 +320,7 @@ VALID_SERVICE_TARGETS := datamate backend frontend runtime mineru "deer-flow" mi
316320
# ========== Kubernetes Install/Uninstall Targets ==========
317321

318322
# Valid k8s targets
319-
VALID_K8S_TARGETS := mineru datamate deer-flow milvus
323+
VALID_K8S_TARGETS := mineru datamate deer-flow milvus label-studio
320324

321325
# Generic k8s install target
322326
.PHONY: %-k8s-install
@@ -334,10 +338,10 @@ VALID_K8S_TARGETS := mineru datamate deer-flow milvus
334338
elif [ "$*" = "datamate" ]; then \
335339
helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.image.repository=$(REGISTRY); \
336340
elif [ "$*" = "deer-flow" ]; then \
337-
helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.deerFlow.enable=true --set global.image.repository=$(REGISTRY); \
338341
cp runtime/deer-flow/.env deployment/helm/deer-flow/charts/public/.env; \
339342
cp runtime/deer-flow/conf.yaml deployment/helm/deer-flow/charts/public/conf.yaml; \
340343
helm upgrade deer-flow deployment/helm/deer-flow -n $(NAMESPACE) --install --set global.image.repository=$(REGISTRY); \
344+
helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.deerFlow.enable=true --set global.image.repository=$(REGISTRY); \
341345
elif [ "$*" = "milvus" ]; then \
342346
helm upgrade milvus deployment/helm/milvus -n $(NAMESPACE) --install; \
343347
fi
@@ -383,7 +387,7 @@ VALID_UPGRADE_TARGETS := datamate
383387
exit 1; \
384388
fi
385389
@if [ "$*" = "datamate" ]; then \
386-
cd deployment/docker/datamate && docker compose -f docker-compose.yml --profile mineru up -d --force-recreate --remove-orphans; \
390+
docker compose -f deployment/docker/datamate/docker-compose.yml --profile mineru up -d --force-recreate --remove-orphans; \
387391
fi
388392

389393
# ========== Download Targets ==========

‎deployment/kubernetes/mineru/deploy.yaml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ spec:
3535
value: pipeline
3636
ports:
3737
- containerPort: 9001
38+
resources:
39+
limits:
40+
cpu: 16
41+
memory: 32Gi
42+
requests:
43+
cpu: 100m
44+
memory: 100Mi
3845
volumeMounts:
3946
- name: dataset-volume
4047
mountPath: /dataset
@@ -43,13 +50,11 @@ spec:
4350
subPath: mineru
4451
volumes:
4552
- name: dataset-volume
46-
hostPath:
47-
path: /opt/datamate/data/dataset
48-
type: DirectoryOrCreate
53+
persistentVolumeClaim:
54+
claimName: datamate-dataset-pvc
4955
- name: log-volume
50-
hostPath:
51-
path: /opt/datamate/data/log
52-
type: DirectoryOrCreate
56+
persistentVolumeClaim:
57+
claimName: datamate-log-pvc
5358

5459
---
5560
apiVersion: v1

0 commit comments

Comments
 (0)