From 80be3506daddf5d075c93e94b1521321baa369af Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 2 Nov 2021 13:32:12 +0100 Subject: [PATCH] upgrade pip. completed reqs via pip freeze --- core/admin/Dockerfile | 3 ++- core/admin/requirements-prod.txt | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index cdc426c6..95a46fa2 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -35,7 +35,8 @@ COPY requirements-prod.txt requirements.txt RUN set -eu \ && apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \ && apk add --no-cache --virtual build-dep libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \ - && pip3 install -r requirements.txt \ + && pip install --upgrade pip \ + && pip install -r requirements.txt \ && apk del --no-cache build-dep COPY --from=assets static ./mailu/ui/static diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt index 506cf050..38717145 100644 --- a/core/admin/requirements-prod.txt +++ b/core/admin/requirements-prod.txt @@ -1,14 +1,23 @@ alembic==1.0.10 +appdirs==1.4.4 asn1crypto==0.24.0 Babel==2.6.0 bcrypt==3.1.6 blinker==1.4 +CacheControl==0.12.6 +certifi==2020.12.5 cffi==1.12.3 +chardet==4.0.0 Click==7.0 +colorama==0.4.4 +contextlib2==0.6.0 cryptography==3.4.7 decorator==4.4.0 +distlib==0.3.1 +distro==1.5.0 dnspython==1.16.0 dominate==2.3.5 +email-validator==1.1.3 Flask==1.0.2 Flask-Babel==0.12.2 Flask-Bootstrap==3.3.7.1 @@ -21,36 +30,48 @@ Flask-Script==2.0.6 Flask-SQLAlchemy==2.4.0 Flask-WTF==0.14.2 gunicorn==20.1.0 +html5lib==1.1 idna==2.8 infinity==1.4 intervals==0.8.1 itsdangerous==1.1.0 Jinja2==2.11.3 limits==1.3 +lockfile==0.12.2 Mako==1.0.9 MarkupSafe==1.1.1 -mysqlclient==1.4.2.post1 marshmallow==3.10.0 marshmallow-sqlalchemy==0.24.1 +msgpack==1.0.2 +mysqlclient==1.4.2.post1 +ordered-set==4.0.2 +packaging==20.9 passlib==1.7.4 +pep517==0.10.0 +progress==1.5 psycopg2==2.8.2 pycparser==2.19 Pygments==2.8.1 pyOpenSSL==20.0.1 +pyparsing==2.4.7 python-dateutil==2.8.0 python-editor==1.0.4 pytz==2019.1 PyYAML==5.4.1 redis==3.2.1 -#alpine3:12 provides six==1.15.0 -#six==1.12.0 +requests==2.25.1 +retrying==1.3.3 +six==1.15.0 socrate==0.1.1 SQLAlchemy==1.3.3 srslib==0.1.4 tabulate==0.8.3 tenacity==5.0.4 +toml==0.10.2 +urllib3==1.26.5 validators==0.12.6 visitor==0.1.3 +webencodings==0.5.1 Werkzeug==0.15.5 WTForms==2.3.3 WTForms-Components==0.10.5