diff --git a/.gitignore b/.gitignore index 1e4f836..764b603 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ nosetests.xml venv app.db microblog.log* +.env diff --git a/Dockerfile b/Dockerfile index 6604175..ebd77ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ RUN useradd microblog WORKDIR /home/microblog COPY requirements.txt requirements.txt +COPY .env .env RUN python -m venv venv RUN venv/bin/pip install -r requirements.txt RUN venv/bin/pip install gunicorn pymysql cryptography @@ -16,6 +17,10 @@ RUN chmod a+x boot.sh ENV FLASK_APP microblog.py +CMD flask db upgrade +CMD flask db migrate -m "two-factor authentication" +CMD flask db upgrade + RUN chown -R microblog:microblog ./ USER microblog diff --git a/requirements.txt b/requirements.txt index fbfd869..eb4d95f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,17 @@ alembic==1.6.5 +async-generator==1.10 +attrs==22.2.0 Babel==2.9.1 blinker==1.4 certifi==2021.5.30 chardet==4.0.0 +charset-normalizer==3.0.1 click==8.0.1 dnspython==2.1.0 dominate==2.6.0 elasticsearch==7.13.3 email-validator==1.1.3 +exceptiongroup==1.1.0 Flask==2.0.1 Flask-Babel==2.0.0 Flask-Bootstrap==3.3.7.1 @@ -19,6 +23,7 @@ Flask-Moment==1.0.1 Flask-SQLAlchemy==2.5.1 Flask-WTF==0.15.1 greenlet==2.0.2 +h11==0.14.0 httpie==2.4.0 idna==2.10 itsdangerous==2.0.1 @@ -26,6 +31,7 @@ Jinja2==3.0.1 langdetect==1.0.9 Mako==1.1.4 MarkupSafe==2.0.1 +outcome==1.2.0 Pygments==2.9.0 PyJWT==2.1.0 PySocks==1.7.1 @@ -37,14 +43,16 @@ redis==3.5.3 requests==2.25.1 requests-toolbelt==0.9.1 rq==1.9.0 -selenium +selenium==4.4.1 six==1.16.0 +sniffio==1.3.0 +sortedcontainers==2.4.0 SQLAlchemy==1.4.20 +trio==0.22.0 +trio-websocket==0.9.2 +twilio==7.16.4 urllib3==1.26.6 visitor==0.1.3 Werkzeug==2.0.1 +wsproto==1.2.0 WTForms==2.3.3 - -# requirements for Heroku -#psycopg2==2.9.1 -#gunicorn==20.1.0