diff --git a/Dockerfile b/Dockerfile index 634b649..499cc31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ ENV PYTHONUNBUFFERED=1 \ # 安装依赖 COPY requirements.txt /app/requirements.txt -COPY packages /app/packages RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone \ && pip install --no-cache-dir -r requirements.txt diff --git a/api_test.py b/api_test.py new file mode 100644 index 0000000..abbc62c --- /dev/null +++ b/api_test.py @@ -0,0 +1,4 @@ +import time + +if __name__ == '__main__': + time.sleep(3600) diff --git a/docker-compose-test.yml b/docker-compose-test.yml new file mode 100644 index 0000000..ccc7275 --- /dev/null +++ b/docker-compose-test.yml @@ -0,0 +1,128 @@ +x-base: + &base_template + restart: always + +x-project: + &project_template + <<: *base_template + image: fcb_photo_review:2.0.0 + volumes: + - ./log:/app/log + +x-paddle: + &paddle_template + <<: *base_template + image: fcb_paddle:0.0.1 + volumes: + - ./log:/app/log + - ./model:/app/model + +services: + ocr_api: + <<: *paddle_template + build: + context: ./services/paddle_services + container_name: ocr_api + hostname: ocr_api + command: [ '-w 1 ./services/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' ] +# deploy: +# resources: +# reservations: +# devices: +# - device_ids: [ '0' ] +# capabilities: [ 'gpu' ] +# driver: 'nvidia' +# +# discharge_api: +# <<: *paddle_template +# container_name: discharge_api +# hostname: discharge_api +# command: [ '-w 5 ./services/discharge_api:app --bind 0.0.0.0:5003' ] +# deploy: +# resources: +# reservations: +# devices: +# - device_ids: [ '0' ] +# capabilities: [ 'gpu' ] +# driver: 'nvidia' +# +# cost_api: +# <<: *paddle_template +# container_name: cost_api +# hostname: cost_api +# command: [ '-w 5 ./services/cost_api:app --bind 0.0.0.0:5004' ] +# deploy: +# resources: +# reservations: +# devices: +# - device_ids: [ '1' ] +# capabilities: [ 'gpu' ] +# driver: 'nvidia' +# +# clas_api: +# <<: *paddle_template +# container_name: clas_api +# hostname: clas_api +# command: [ '-w 5 ./services/clas_api:app --bind 0.0.0.0:5005' ] +# deploy: +# resources: +# reservations: +# devices: +# - device_ids: [ '0' ] +# capabilities: [ 'gpu' ] +# driver: 'nvidia' +# +# det_api: +# <<: *paddle_template +# container_name: det_api +# hostname: det_api +# command: [ '-w 5 ./services/det_api:app --bind 0.0.0.0:5006' ] +# deploy: +# resources: +# reservations: +# devices: +# - device_ids: [ '1' ] +# 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' + + api_test: + <<: *project_template + build: + context: . + container_name: api_test + hostname: api_test + depends_on: + - ocr_api +# - settlement_api +# - discharge_api +# - cost_api +# - clas_api +# - det_api +# - dewarp_api + command: [ 'api_test.py' ] \ No newline at end of file diff --git a/services/paddle_services/Dockerfile b/services/paddle_services/Dockerfile index 8f88a10..206ff6a 100644 --- a/services/paddle_services/Dockerfile +++ b/services/paddle_services/Dockerfile @@ -12,8 +12,7 @@ ENV PYTHONUNBUFFERED=1 \ PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple # 安装依赖 -COPY requirements.txt /app/requirements.txt -COPY packages /app/packages +COPY ./services/paddle_services/requestments.txt /app/requirements.txt RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone \ && pip install --no-cache-dir -r requirements.txt \ && pip uninstall -y onnxruntime onnxruntime-gpu \ diff --git a/tmp_img/PH20240813002604_1_133856_2.jpg b/tmp_img/PH20240813002604_1_133856_2.jpg new file mode 100644 index 0000000..3954cda Binary files /dev/null and b/tmp_img/PH20240813002604_1_133856_2.jpg differ