diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b60b3ea21b3a7b25a66d8be842e2375e1ad07ef0..cdb5c35507f955f8bc727f4997c161b167d99016 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -10,7 +10,7 @@ GUNICORN_WORKERS="${GUNICORN_WORKERS:-1}" source venv/bin/activate if [ $# -eq 0 ]; then flask deploy - gunicorn --access-logfile - --bind :5000 --error-logfile - --workers "${GUNICORN_WORKERS}" --worker-class eventlet nopaque:app + python nopaque.py elif [ $1 == "flask" ]; then flask ${@:2} else diff --git a/nopaque.env.tpl b/nopaque.env.tpl index 7bc4e2d4af74c8240432575fca4a3a55887947f8..6e39a0e05a068088a1660b814fb4f49cb3e1e124 100644 --- a/nopaque.env.tpl +++ b/nopaque.env.tpl @@ -23,9 +23,6 @@ MAIL_USE_TLS= MAIL_USERNAME= MAIL_PASSWORD= -### Gunicorn ### -GUNICORN_WORKERS= - ### nopaque ### NOPAQUE_ADMIN= NOPAQUE_MAIL_SENDER= diff --git a/nopaque.py b/nopaque.py index 57d41eef8f4ab019afadfd8ea76375a5b3a94184..b1e5a2ecd49170b039864e2324b242f58139ec7c 100644 --- a/nopaque.py +++ b/nopaque.py @@ -1,6 +1,6 @@ import eventlet eventlet.monkey_patch() # noqa -from app import create_app, db +from app import create_app, db, socketio from app.models import Corpus, Job, Role, User from flask_migrate import Migrate, upgrade import os @@ -34,3 +34,7 @@ def test(): import unittest tests = unittest.TestLoader().discover('tests') unittest.TextTestRunner(verbosity=2).run(tests) + + +if __name__ == '__main__': + socketio.run(app, host='0.0.0.0') diff --git a/requirements.txt b/requirements.txt index ef0254a901f095cfead3143cebad4b1d35afebe4..d5d9f24da8dde779f653d9f8122ff9c2587afd46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,6 @@ Flask-SocketIO Flask-SQLAlchemy Flask-Table Flask-WTF -gunicorn jsonpatch psycopg2 redis