Updating Python requirements file

aether_fastapi_gunicorn.Dockerfile

@@ -34,4 +34,5 @@ RUN pip freeze > /requirements_current.txt
 
 # COPY conf/aether_fastapi_requirements.txt /tmp/requirements.txt
 
+
 CMD ["gunicorn", "--conf", "/conf/gunicorn_fastapi_conf.py"]

aether_flask_gunicorn.Dockerfile

@@ -7,4 +7,11 @@ WORKDIR /srv/aether_app
 COPY conf/aether_flask_requirements.txt /tmp/requirements.txt
 RUN pip install --no-cache-dir -r /tmp/requirements.txt
 
+RUN pip freeze > /aether_flask_requirements_current.txt
+# RUN pip freeze > /logs/aether_flask_requirements_current.txt
+RUN pip freeze > /tmp/aether_flask_requirements_current.txt
+
+# CMD ["pip", "freeze > /logs/aether_flask_requirements_current.txt"]
+# CMD ["pip", "freeze > /tmp/aether_flask_requirements_current.txt"]
+
 CMD ["gunicorn", "--conf", "/conf/gunicorn_flask_conf.py"]

conf/aether_fastapi_requirements_current.txt

@@ -1 +0,0 @@
- 

conf/aether_flask_requirements.txt

@@ -1,47 +1,41 @@
-argon2-cffi==21.3.0
-# argon2-cffi-bindings==21.2.0
-async-timeout==4.0.2
-bidict==0.21.4
-Brotli==1.0.9
-cachelib==0.9.0
-certifi==2021.10.8
-# cffi==1.15.0
-charset-normalizer==2.0.9
-click==7.1.2
-cssselect2==0.4.1
-# Cython==0.29.32
+argon2-cffi>=21
+# async-timeout>=4
+# bidict>=0.21
+Brotli>=1
+# cachelib==0.9.0
+# certifi==2021.10.8
+# charset-normalizer>=2.0.9
+click==7.1.2 # Must keep???
+cssselect2==0.4.1 # Must keep???
 Deprecated==1.2.13
-# dnspython==2.1.0
 eventlet==0.33.2
-Flask==1.1.4
-Flask-Caching==2.0.1
-Flask-Cors==3.0.10
-Flask-MySQLdb==1.0.1
-Flask-SocketIO==5.3.2
+Flask>=1.1.4
+Flask-Caching>=2.0.1
+Flask-Cors>=3.0.10
+Flask-MySQLdb>=1.0.1
+Flask-SocketIO>=5.3.2
 Flask-SQLAlchemy==2.5.1
-Flask-WeasyPrint==0.6
-fonttools==4.28.4
+Flask-WeasyPrint>=0.6
+# fonttools>=4.28.4
 gevent==22.10.2
 greenlet==2.0.1
-gunicorn==20.1.0
+gunicorn>=20.1.0
 html2text==2020.1.16
 html5lib==1.1
-idna==3.3
-itsdangerous==1.1.0
-Jinja2==2.11.3
-MarkupSafe==2.0.1
+# idna==3.3
+itsdangerous>=1.1.0
+Jinja2>=2.11.3
+MarkupSafe>=2.0.1
 mypy==0.930
 mypy-extensions==0.4.3
 mysqlclient==2.1.0
-numpy
-packaging==21.3
-pandas==1.5.2
-passlib==1.7.4
+numpy>=1.25.2
+# packaging==21.3
+pandas>=1.5.2
+passlib>=1.7.4
 Pillow==9.3.0
 pycparser==2.21
-# pycrypto==2.6.1
-# pycryptodome==3.16.0
-pydantic==1.10.2
+pydantic>=1.10.2
 pydyf==0.1.2
 pyparsing==3.0.9
 pyphen==0.11.0
@@ -50,28 +44,23 @@ python-engineio==4.3.0
 python-socketio==5.5.0
 pytz==2021.3
 qrcode==7.3.1
-redis==4.3.5
+redis>=4.3.5
 requests==2.28.1
-# simple-crypt==4.1.7
-six==1.16.0
+# six==1.16.0
 SQLAlchemy==1.4.28
 stripe==5.0.0
 suds-py3==1.4.5.0
-tinycss2==1.1.1
-tomli==2.0.0
-types-pytz==2022.1.2
-types-requests==2.28.10
-types-urllib3==1.26.24
-typing_extensions==4.4.0
-urllib3==1.26.7
-uvicorn==0.18.3
-# uWSGI==2.0.21
-weasyprint==53.4
-webencodings==0.5.1
-Werkzeug==0.16.1
-wrapt==1.13.3
-xlrd==2.0.1
-xmltodict==0.13.0
-# zope.event==4.5.0
-# zope.interface==5.4.0
-# zopfli==0.1.9
+tinycss2>=1.1.1
+# tomli==2.0.0
+types-pytz>=2022.1.2
+types-requests>=2.28.10
+types-urllib3>=1.26.24
+typing_extensions>=4.4.0
+urllib3>=1.26.7
+uvicorn>=0.18.3
+weasyprint>=53.4
+webencodings>=0.5.1
+Werkzeug>=0.16.1
+wrapt>=1.13.3
+xlrd>=2.0.1
+xmltodict>=0.13.0

docker-compose.yml

@@ -249,7 +249,7 @@ services:
         #   - local-net
         volumes:
             - ./conf/aether_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py
-            - ./conf/aether_fastapi_requirements_current.txt:/conf/requirements_current.txt
+            - ./conf/aether_fastapi_requirements_current.txt:/requirements_current.txt
             - ./conf/aether_api_config.py:/srv/aether_api/app/config.py
             
             - ./logs/ae_api:/logs
@@ -334,6 +334,7 @@ services:
              - "${DOCKER_AE_API_V5_SERVER_EXTRA_HOST}"
         volumes:
             - ./conf/aether_flask_gunicorn_conf.py:/conf/gunicorn_flask_conf.py
+            - ./conf/aether_flask_requirements_current.txt:/requirements_current.txt
             - ./conf/aether_app_config.py:/srv/aether_app/flask_config_v2.py
             - ./logs/ae_app:/logs
             # - ./logs/aether_flask_gunicorn_access.log:/logs/gunicorn_access.log
@@ -343,6 +344,8 @@ services:
             - ./srv/aether_app_ln:/srv/aether_app
             - ./srv/hosted_files_ln:/srv/hosted_files
             - ./srv/hosted_tmp_ln:/srv/hosted_tmp
+
+            - ./tmp/ae_app:/tmp
         depends_on:
             - aether_api_gunicorn
         stdin_open: true # docker run -i
@@ -351,3 +354,7 @@ services:
 # networks:
 #   local-net:
 #     driver: bridge
+
+# volumes:
+#   ./tmp/ae_app:
+#     external: true