From 0618754da22b390d9f8717c00d5889bd90bc7147 Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Thu, 26 Sep 2024 16:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=AD=E6=9B=B2=E7=9F=AB?= =?UTF-8?q?=E6=AD=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-test.yml | 58 ++++++++++++------------ docker-compose.yml | 98 +++++++++++++++++++++-------------------- 2 files changed, 79 insertions(+), 77 deletions(-) diff --git a/docker-compose-test.yml b/docker-compose-test.yml index d41f5e8..bbe2a62 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -20,26 +20,26 @@ x-paddle: - ./tmp_img:/app/tmp_img services: - ocr_api: - <<: *paddle_template - build: - context: ./services/paddle_services - container_name: ocr_api - hostname: ocr_api - command: [ '-w','1','ocr_api:app','--bind','0.0.0.0:5001' ] - deploy: - resources: - reservations: - devices: - - device_ids: [ '0' ] - capabilities: [ 'gpu' ] - driver: 'nvidia' +# ocr_api: +# <<: *paddle_template +# build: +# context: ./services/paddle_services +# container_name: ocr_api +# hostname: ocr_api +# command: [ '-w','1','ocr_api:app','--bind','0.0.0.0:5001' ] +# deploy: +# resources: +# reservations: +# devices: +# - device_ids: [ '0' ] +# capabilities: [ 'gpu' ] +# driver: 'nvidia' # settlement_api: # <<: *paddle_template # container_name: settlement_api # hostname: settlement_api -# command: [ '-w 5 ./services/settlement_api:app --bind 0.0.0.0:5002' ] +# command: [ '-w', '1', 'settlement_api:app', '--bind', '0.0.0.0:5002' ] # deploy: # resources: # reservations: @@ -100,18 +100,18 @@ services: # capabilities: [ 'gpu' ] # driver: 'nvidia' # -# dewarp_api: -# <<: *paddle_template -# container_name: dewarp_api -# hostname: dewarp_api -# command: [ '-w 5 ./services/dewarp_api:app --bind 0.0.0.0:5007' ] -# deploy: -# resources: -# reservations: -# devices: -# - device_ids: [ '0' ] -# capabilities: [ 'gpu' ] -# driver: 'nvidia' + dewarp_api: + <<: *paddle_template + container_name: dewarp_api + hostname: dewarp_api + command: [ '-w', '1', 'dewarp_api:app', '--bind', '0.0.0.0:5007' ] + deploy: + resources: + reservations: + devices: + - device_ids: [ '0' ] + capabilities: [ 'gpu' ] + driver: 'nvidia' api_test: <<: *project_template @@ -120,11 +120,11 @@ services: container_name: api_test hostname: api_test depends_on: - - ocr_api +# - ocr_api # - settlement_api # - discharge_api # - cost_api # - clas_api # - det_api -# - dewarp_api + - dewarp_api command: [ 'api_test.py' ] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 17e065d..f0aef44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,17 +5,19 @@ x-base: x-project: &project_template <<: *base_template - image: fcb_photo_review:1.14.6 + image: fcb_photo_review:2.0.0 volumes: - ./log:/app/log + - ./tmp_img:/app/tmp_img x-paddle: &paddle_template <<: *base_template image: fcb_paddle:0.0.1 volumes: - - ./log:/app/log - - ./model:/app/model + - ./services/paddle_services/log:/app/log + - ./services/paddle_services/model:/app/model + - ./tmp_img:/app/tmp_img services: ocr_api: @@ -24,7 +26,7 @@ services: context: ./services/paddle_services container_name: ocr_api hostname: ocr_api - command: [ '-w 5 ./services/ocr_api:app --bind 0.0.0.0:5001' ] + command: [ '-w', '1', 'ocr_api:app', '--bind', '0.0.0.0:5001' ] deploy: resources: reservations: @@ -37,7 +39,7 @@ services: <<: *paddle_template container_name: settlement_api hostname: settlement_api - command: [ '-w 5 ./services/settlement_api:app --bind 0.0.0.0:5002' ] + command: [ '-w', '1', 'settlement_api:app', '--bind', '0.0.0.0:5002' ] deploy: resources: reservations: @@ -50,7 +52,7 @@ services: <<: *paddle_template container_name: discharge_api hostname: discharge_api - command: [ '-w 5 ./services/discharge_api:app --bind 0.0.0.0:5003' ] + command: [ '-w', '1', 'discharge_api:app', '--bind', '0.0.0.0:5003' ] deploy: resources: reservations: @@ -63,7 +65,7 @@ services: <<: *paddle_template container_name: cost_api hostname: cost_api - command: [ '-w 5 ./services/cost_api:app --bind 0.0.0.0:5004' ] + command: [ '-w', '1', 'cost_api:app', '--bind', '0.0.0.0:5004' ] deploy: resources: reservations: @@ -76,7 +78,7 @@ services: <<: *paddle_template container_name: clas_api hostname: clas_api - command: [ '-w 5 ./services/clas_api:app --bind 0.0.0.0:5005' ] + command: [ '-w', '1', 'clas_api:app', '--bind', '0.0.0.0:5005' ] deploy: resources: reservations: @@ -89,7 +91,7 @@ services: <<: *paddle_template container_name: det_api hostname: det_api - command: [ '-w 5 ./services/det_api:app --bind 0.0.0.0:5006' ] + command: [ '-w', '1', 'det_api:app', '--bind', '0.0.0.0:5006' ] deploy: resources: reservations: @@ -102,7 +104,7 @@ services: <<: *paddle_template container_name: dewarp_api hostname: dewarp_api - command: [ '-w 5 ./services/dewarp_api:app --bind 0.0.0.0:5007' ] + command: [ '-w', '1', 'dewarp_api:app', '--bind', '0.0.0.0:5007' ] deploy: resources: reservations: @@ -127,37 +129,37 @@ services: - dewarp_api command: [ 'photo_review.py', '--clean', 'True' ] - photo_review_2: - <<: *project_template - container_name: photo_review_2 - hostname: photo_review_2 - depends_on: - - photo_review_1 - command: [ 'photo_review.py' ] - - photo_review_3: - <<: *project_template - container_name: photo_review_3 - hostname: photo_review_3 - depends_on: - - photo_review_2 - command: [ 'photo_review.py' ] - - photo_review_4: - <<: *project_template - container_name: photo_review_4 - hostname: photo_review_4 - depends_on: - - photo_review_3 - command: [ 'photo_review.py' ] - - photo_review_5: - <<: *project_template - container_name: photo_review_5 - hostname: photo_review_5 - depends_on: - - photo_review_4 - command: [ 'photo_review.py' ] + # photo_review_2: + # <<: *project_template + # container_name: photo_review_2 + # hostname: photo_review_2 + # depends_on: + # - photo_review_1 + # command: [ 'photo_review.py' ] + # + # photo_review_3: + # <<: *project_template + # container_name: photo_review_3 + # hostname: photo_review_3 + # depends_on: + # - photo_review_2 + # command: [ 'photo_review.py' ] + # + # photo_review_4: + # <<: *project_template + # container_name: photo_review_4 + # hostname: photo_review_4 + # depends_on: + # - photo_review_3 + # command: [ 'photo_review.py' ] + # + # photo_review_5: + # <<: *project_template + # container_name: photo_review_5 + # hostname: photo_review_5 + # depends_on: + # - photo_review_4 + # command: [ 'photo_review.py' ] photo_mask_1: <<: *project_template @@ -173,10 +175,10 @@ services: - dewarp_api command: [ 'photo_mask.py', '--clean', 'True' ] - photo_mask_2: - <<: *project_template - container_name: photo_mask_2 - hostname: photo_mask_2 - depends_on: - - photo_mask_1 - command: [ 'photo_mask.py' ] \ No newline at end of file +# photo_mask_2: +# <<: *project_template +# container_name: photo_mask_2 +# hostname: photo_mask_2 +# depends_on: +# - photo_mask_1 +# command: [ 'photo_mask.py' ] \ No newline at end of file