Merge pull request #15 from dx-tan/fix/deployment-issues

Fix build issues

.dockerignore

@@ -0,0 +1,2 @@
+.git
+weights/

.gitignore

@@ -1,6 +1,7 @@
 *.pth
 *.zip
 weights/
+sdsvkie
 minio_data/
 test_images/
 *.pem

cope2n-ai-fi/.gitignore

@@ -3,9 +3,6 @@ __pycache__
 DataBase/image_temp/
 DataBase/json_temp/
 DataBase/template.db
-# sdsvtd/
-# sdsvtr/
-# sdsvkie/
 detectron2/
 output/
 data/

cope2n-ai-fi/Dockerfile

@@ -13,17 +13,17 @@ RUN apt-get update && apt-get install -y gcc g++ ffmpeg libsm6 libxext6 poppler-
 WORKDIR /workspace
 
 
-COPY ./modules/ocr_engine/externals/ /workspace/cope2n-ai-fi/modules/ocr_engine/externals/ 
-COPY ./modules/ocr_engine/requirements.txt /workspace/cope2n-ai-fi/modules/ocr_engine/requirements.txt
-COPY ./modules/sdsvkie/ /workspace/cope2n-ai-fi/modules/sdsvkie/
-COPY ./modules/sdsvkvu/ /workspace/cope2n-ai-fi/modules/sdsvkvu/
-COPY ./requirements.txt /workspace/cope2n-ai-fi/requirements.txt
+# COPY ./modules/ocr_engine/externals/ /workspace/cope2n-ai-fi/modules/ocr_engine/externals/ 
+# COPY ./modules/ocr_engine/requirements.txt /workspace/cope2n-ai-fi/modules/ocr_engine/requirements.txt
+# COPY ./modules/sdsvkvu/ /workspace/cope2n-ai-fi/modules/sdsvkvu/
+# COPY ./requirements.txt /workspace/cope2n-ai-fi/requirements.txt
+
+COPY . /workspace/cope2n-ai-fi
 
 RUN cd /workspace/cope2n-ai-fi/modules/ocr_engine/externals/sdsv_dewarp && pip3 install -v -e .
 RUN cd /workspace/cope2n-ai-fi/modules/ocr_engine/externals/sdsvtd && pip3 install -v -e .
 RUN cd /workspace/cope2n-ai-fi/modules/ocr_engine/externals/sdsvtr && pip3 install -v -e .
 
-RUN cd /workspace/cope2n-ai-fi/modules/sdsvkie && pip3 install -v -e .
 RUN cd /workspace/cope2n-ai-fi/modules/sdsvkvu && pip3 install -v -e .
 RUN cd /workspace/cope2n-ai-fi && pip3 install -r requirements.txt
 

cope2n-ai-fi/Dockerfile-dev

@@ -5,13 +5,11 @@ RUN apt-get update && apt-get install -y gcc g++ ffmpeg libsm6 libxext6
 WORKDIR /workspace
 
 COPY ./requirements.txt /workspace/cope2n-ai-fi/requirements.txt
-COPY ./sdsvkie/ /workspace/cope2n-ai-fi/sdsvkie/
 COPY ./sdsvtd /workspace/cope2n-ai-fi/sdsvtd/
 COPY ./sdsvtr/ /workspace/cope2n-ai-fi/sdsvtr/
 COPY ./models/ /models
 
 RUN cd /workspace/cope2n-ai-fi && pip3 install -r requirements.txt
-RUN cd /workspace/cope2n-ai-fi/sdsvkie && pip3 install -v -e .
 RUN cd /workspace/cope2n-ai-fi/sdsvtd && pip3 install -v -e .
 RUN cd /workspace/cope2n-ai-fi/sdsvtr && pip3 install -v -e .
 

cope2n-ai-fi/requirements.txt

@@ -3,7 +3,6 @@ django-environ
 sdsv_dewarp
 sdsvtd
 sdsvtr
-sdsvkie
 sdsvkvu
 
 pymupdf

cope2n-ai-fi/run.sh

@@ -1,9 +1,2 @@
 #!/bin/bash
-# cd /cope2n-ai-fi/sdsvkie
-# pip3 install -v -e .
-# cd /cope2n-ai-fi/sdsvtd
-# pip3 install -v -e .
-# cd /cope2n-ai-fi/sdsvtr
-# pip3 install -v -e .
-# cd /cope2n-ai-fi
 bash -c "celery -A celery_worker.worker_fi worker --loglevel=INFO --pool=solo"

docker-compose.yml

@@ -11,9 +11,7 @@ services:
       shm_size: 10gb
       dockerfile: Dockerfile
     shm_size: 10gb
-    # mem_limit: 8g
     restart: always
-    # container_name: "sidp-cope2n-ai-fi-sbt"
     networks:
       - ctel-sbt
     privileged: true
@@ -40,9 +38,6 @@ services:
     build:
       context: cope2n-api
       dockerfile: Dockerfile
-    # ports:
-    #   - 9880:9000
-    # container_name: "sidp-cope2n-be-ctel-sbt"
     environment:
       - MEDIA_ROOT=${MEDIA_ROOT}
       - DB_ENGINE=${DB_ENGINE}
@@ -89,9 +84,6 @@ services:
                   gunicorn fwd.asgi:application -k uvicorn.workers.UvicornWorker --timeout 300 -b 0.0.0.0:9000" # pre-makemigrations on prod
   minio:
     image: minio/minio
-    ports:
-     - 9886:9884
-     - 9887:9885
     environment:
     - MINIO_ROOT_USER=${S3_ACCESS_KEY}
     - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
@@ -129,12 +121,6 @@ services:
       - ctel-sbt
 
   be-celery-sbt:
-    # build:
-    #   context: cope2n-api
-    #   dockerfile: Dockerfile
-      # args:
-      #   - "UID=${UID:-1000}"
-      #   - "GID=${GID:-1000}"
     build:
       context: cope2n-api
       dockerfile: Dockerfile