diff --git a/Dockerfile b/Dockerfile index 95162cf..1ecc800 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ RUN pip3 install --no-cache-dir -r requirements.txt COPY . /usr/src/app EXPOSE 8080 -EXPOSE 80 ENTRYPOINT ["python3"] diff --git a/docker-compose.yml b/docker-compose.yml index b0fcf20..1d93ee7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,17 +6,14 @@ services: image: flask-server ports: - 8080:8080 - - 80:80 volumes: # when pushing to server, remove the first dot here in front of /mnt - /mnt/ssd/ds_ftp/classla_OS2022:/usr/src/app/classla_OS2022 - ./swagger_server/classla/classla_resources:/root/classla_resources environment: - PYTHONUNBUFFERED=1 - network_mode: host tika2: image: apache/tika:1.28.4-full entrypoint: [ "/bin/sh", "-c", "java -jar /tika-server-1.28.4.jar -h 0.0.0.0 -p 9999" ] restart: always ports: - 9999:9999 - network_mode: host diff --git a/swagger_server/controllers/doc2text_controller.py b/swagger_server/controllers/doc2text_controller.py index 84f67f3..7b69dd0 100644 --- a/swagger_server/controllers/doc2text_controller.py +++ b/swagger_server/controllers/doc2text_controller.py @@ -16,8 +16,8 @@ import traceback tika_server = "http://tika2:9999/tika" # endpoint below to be used only for development purposes (don't need to run docker) -tika_server = "http://rsdo.lhrs.feri.um.si:9998/tika" -# TEMPORARY workaround: running server without docker... +# tika_server = "http://rsdo.lhrs.feri.um.si:9998/tika" + def datoteka_v_besedilo_post(file=None): # noqa: E501 """Pretvori datoteko formata pdf, doc, docx, ppt, xls,... vraca besedilo