diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index a9cc61c2..01be460b 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -36,11 +36,12 @@ WORKDIR /app 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 \ && pip install --upgrade pip \ + && pip install --extra-index-url=https://www.piwheels.org/simple -r requirements.txt --only-binary=:all: --no-binary=Flask-bootstrap,PyYAML,SQLAlchemy \ + || ( 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 \ && pip install -r requirements.txt \ - && apk del --no-cache build-dep + && apk del --no-cache build-dep ) COPY --from=assets static ./mailu/static COPY mailu ./mailu diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt index f14e484c..297c6902 100644 --- a/core/admin/requirements-prod.txt +++ b/core/admin/requirements-prod.txt @@ -5,7 +5,7 @@ bcrypt==3.2.0 blinker==1.4 CacheControl==0.12.9 certifi==2021.10.8 -cffi==1.15.0 +# cffi==1.15.0 chardet==4.0.0 click==8.0.3 colorama==0.4.4 @@ -43,13 +43,15 @@ MarkupSafe==2.0.1 marshmallow==3.14.0 marshmallow-sqlalchemy==0.26.1 msgpack==1.0.2 -mysqlclient==2.0.3 +# mysqlclient==2.0.3 +mysql-connector-python==8.0.25 ordered-set==4.0.2 # packaging==20.9 passlib==1.7.4 # pep517==0.10.0 progress==1.6 -psycopg2==2.9.1 +#psycopg2==2.9.1 +psycopg2-binary==2.9.3 pycparser==2.20 Pygments==2.10.0 pyOpenSSL==21.0.0 diff --git a/core/admin/requirements.txt b/core/admin/requirements.txt index 61fbd92c..5bf57874 100644 --- a/core/admin/requirements.txt +++ b/core/admin/requirements.txt @@ -19,7 +19,7 @@ PyOpenSSL Pygments dnspython tenacity -mysqlclient +mysql-connector-python idna srslib marshmallow