From 713015adec93a4b6c93a31794a6055af2ce0d287 Mon Sep 17 00:00:00 2001
From: Chris Diesch <chris@quarterhomes.com>
Date: Wed, 9 Apr 2025 16:16:20 -0600
Subject: [PATCH] Fixed issues with docker

---
 app/__init__.py       |  2 +-
 docker/entrypoint.sh  |  5 +++--
 docker/mre.Dockerfile | 13 ++++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 2af33b1..045ac4a 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -45,4 +45,4 @@ def create_app(app_name: str='MRE') -> Flask:
         app.logger.info(f'HTTP {request.method} completed (path={request.path}, request_time={request_time}, status_code={response.status_code}).')
         return response
 
-   return app
+    return app
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 8ee4158..f45ab0b 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,3 +1,4 @@
-#! /usr/bin/bash
+#! /bin/bash
+
+python ./run.py
 
-uwsgi --ini /var/www/run.py
diff --git a/docker/mre.Dockerfile b/docker/mre.Dockerfile
index 9d7b992..109cd27 100644
--- a/docker/mre.Dockerfile
+++ b/docker/mre.Dockerfile
@@ -9,9 +9,13 @@ ADD ./docker/entrypoint.sh /var/docker-entrypoint.sh
 RUN chmod +x /var/docker-entrypoint.sh
 
 # add the requirements and install them
-
 ADD ./requirements.txt /var/www/requirements.txt
-RUN pip install -Ur /var/www/requirements.txt
+RUN pip install -r /var/www/requirements.txt
+ADD ./app/mre_module/requirements.txt /var/www/mre_reuirements.txt
+RUN pip install -r /var/www/mre_reuirements.txt
+# the multipolyfit package has a small bug, but it is easily fixed
+RUN rm /usr/local/lib/python3.13/site-packages/multipolyfit/__init__.py
+RUN echo "from .core import multipolyfit, mk_model, mk_sympy_function" >> /usr/local/lib/python3.13/site-packages/multipolyfit/__init__.py
 
 # add the uwsgi runner
 ADD ./run.py /var/www/run.py
@@ -23,5 +27,8 @@ ENV PYTHONUNBUFFERED 1
 # Copy the app directory
 COPY ./app /var/www/app
 
+EXPOSE 80/tcp
+EXPOSE 80/udp
+
 # define the entrypoint
-ENTRYPOINT ["/var/docker-entrypoint.sh"]
+CMD ["/var/docker-entrypoint.sh"]