Merge pull request #309 from TheophileDiot/Fix-flask-dev

Replace flask development server with gunicorn

ui/Dockerfile

@@ -56,7 +56,5 @@ EXPOSE 5000
 
 WORKDIR /opt/bunkerweb/ui
 USER nginx:nginx
-ENV PYTHONUNBUFFERED 1
-ENV FLASK_APP "main.py"
-ENV FLASK_ENV production
-CMD ["flask", "run", "--host=0.0.0.0", "--port=7000"]
+
+CMD ["gunicorn", "--bind=0.0.0.0:7000", "--workers=1", "--threads=2", "main:app"]

ui/main.py

@@ -1,4 +1,3 @@
-from email import message
 import os
 from shutil import rmtree, copytree, chown
 from logging import getLogger, INFO, ERROR, StreamHandler, Formatter
@@ -38,11 +37,11 @@ from time import time
 import tarfile
 import zipfile
 
-from ui.src.ConfigFiles import ConfigFiles
-from ui.src.Config import Config
-from ui.src.ReverseProxied import ReverseProxied
-from ui.src.User import User
-from ui.utils import (
+from src.ConfigFiles import ConfigFiles
+from src.Config import Config
+from src.ReverseProxied import ReverseProxied
+from src.User import User
+from utils import (
     check_settings,
     env_to_summary_class,
     form_plugin_gen,
@@ -55,10 +54,11 @@ from ui.utils import (
 )
 
 sys_path.append("/opt/bunkerweb/utils")
+sys_path.append("/opt/bunkerweb/api")
 
-from ui.src.Instances import Instances
-from api.API import API
-from utils.ApiCaller import ApiCaller
+from src.Instances import Instances
+from API import API
+from ApiCaller import ApiCaller
 
 # Set up logger
 logger = getLogger("flask_app")

ui/requirements.txt

@@ -1,36 +1,10 @@
-bcrypt==3.2.0
+Flask==2.2.2
+Flask_Login==0.6.2
+Flask_WTF==1.0.1
 beautifulsoup4==4.11.1
-certifi==2021.10.8
-cffi==1.15.0
-charset-normalizer==2.0.12
-click==8.1.2
-colorclass==2.2.2
-docker==5.0.3
-docopt==0.6.2
-Flask==2.1.1
-Flask-Login==0.6.0
-Flask-WTF==1.0.1
-idna==3.3
-importlib-metadata==4.11.3
-itsdangerous==2.1.2
-Jinja2==3.1.1
-MarkupSafe==2.1.1
-mypy-extensions==0.4.3
-packaging==21.3
-pathspec==0.9.0
-platformdirs==2.5.2
-pycparser==2.21
-pyparsing==3.0.8
-python-dateutil==2.8.2
-python-magic==0.4.25
-requests==2.27.1
-six==1.16.0
-soupsieve==2.3.2
-terminaltables==3.1.10
-tomli==2.0.1
-typing_extensions==4.2.0
-urllib3==1.26.9
-websocket-client==1.3.2
-Werkzeug==2.1.1
-WTForms==3.0.1
-zipp==3.8.0
+requests==2.28.1
+docker==6.0.0
+python_dateutil==2.8.2
+python-magic==0.4.27
+bcrypt==4.0.0
+gunicorn==20.1.0

ui/src/ConfigFiles.py

@@ -3,7 +3,7 @@ from re import compile as re_compile
 from shutil import rmtree, move as shutil_move
 from typing import Tuple
 
-from ui.utils import path_to_dict
+from utils import path_to_dict
 
 
 class ConfigFiles:

ui/src/Instances.py

@@ -2,8 +2,8 @@ import os
 from typing import Any, Union
 from subprocess import run
 
-from api.API import API
-from utils.ApiCaller import ApiCaller
+from API import API
+from ApiCaller import ApiCaller
 
 
 class Instance: