From 193312d90b02a57a207fe12282beee71a6f7b6c5 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 9 Oct 2022 16:34:30 +0100 Subject: [PATCH] Add make as build dep to fix armhf build --- Dockerfile | 11 ++++++----- Dockerfile.aarch64 | 11 ++++++----- Dockerfile.armhf | 11 ++++++----- readme-vars.yml | 1 + 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index b483d7d..da4171d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,15 +10,16 @@ ENV PYTHONUNBUFFERED=1 RUN \ apk add --update --no-cache --virtual=build-dependencies \ - openssl-dev \ - libffi-dev \ + g++ \ gcc \ libc-dev \ + libffi-dev \ libxslt-dev \ - zlib-dev \ - g++ \ + make \ + openssl-dev \ py3-wheel \ - python3-dev && \ + python3-dev \ + zlib-dev && \ apk add --update --no-cache \ curl \ libxslt \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3272b7f..a8e1847 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,15 +10,16 @@ ENV PYTHONUNBUFFERED=1 RUN \ apk add --update --no-cache --virtual=build-dependencies \ - openssl-dev \ - libffi-dev \ + g++ \ gcc \ libc-dev \ + libffi-dev \ libxslt-dev \ - zlib-dev \ - g++ \ + make \ + openssl-dev \ py3-wheel \ - python3-dev && \ + python3-dev \ + zlib-dev && \ apk add --update --no-cache \ curl \ libxslt \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index fc977e9..a3b953d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -10,15 +10,16 @@ ENV PYTHONUNBUFFERED=1 RUN \ apk add --update --no-cache --virtual=build-dependencies \ - openssl-dev \ - libffi-dev \ + g++ \ gcc \ libc-dev \ + libffi-dev \ libxslt-dev \ - zlib-dev \ - g++ \ + make \ + openssl-dev \ py3-wheel \ - python3-dev && \ + python3-dev \ + zlib-dev && \ apk add --update --no-cache \ curl \ libxslt \ diff --git a/readme-vars.yml b/readme-vars.yml index acb7f4c..845e50b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -63,4 +63,5 @@ app_setup_block: | # changelog changelogs: + - { date: "09.10.22:", desc: "Add make as build dep to fix pip jq build on armhf." } - { date: "07.08.22:", desc: "Initial release." }