Update build reqs and fix armv7 build

main
Alexander Graf 2 years ago
parent 4be0cbf4da
commit 024b0573b3
No known key found for this signature in database
GPG Key ID: B8A9DC143E075629

@ -32,7 +32,7 @@ RUN set -euxo pipefail \
; apk add --no-cache py3-pip \ ; apk add --no-cache py3-pip \
; python3 -m venv ${VIRTUAL_ENV} \ ; python3 -m venv ${VIRTUAL_ENV} \
; ${VIRTUAL_ENV}/bin/pip install --no-cache-dir -r requirements-build.txt \ ; ${VIRTUAL_ENV}/bin/pip install --no-cache-dir -r requirements-build.txt \
; apk del py3-pip ; apk del -r py3-pip
ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
@ -40,13 +40,12 @@ COPY requirements-${MAILU_ENV}.txt ./
COPY libs/ libs/ COPY libs/ libs/
RUN set -euxo pipefail \ RUN set -euxo pipefail \
; machine="$(uname -m)"; deps="" \
; [[ "${machine}" == arm* || "${machine}" == aarch64 ]] && deps="${deps} build-base gcc libffi-dev python3-dev" \
; [[ "${machine}" == armv7* ]] && deps="${deps} cargo libressl-dev mariadb-connector-c-dev postgresql-dev" \
; [[ "${deps}" ]] && apk add --virtual .build-deps ${deps} \
; pip install -r requirements-${MAILU_ENV}.txt \ ; pip install -r requirements-${MAILU_ENV}.txt \
|| ( \ ; apk -e info -q .build-deps && apk del -r .build-deps \
apk add --no-cache --virtual .build-deps \
build-base gcc libffi-dev python3-dev \
; pip install -r requirements-${MAILU_ENV}.txt \
; apk del .build-deps \
) \
; rm -rf /root/.cache /tmp/*.pem ; rm -rf /root/.cache /tmp/*.pem

@ -1,3 +1,3 @@
pip==22.2.2 pip==22.3
setuptools==65.4.1 setuptools==65.5.0
wheel==0.37.1 wheel==0.37.1

Loading…
Cancel
Save