From 7ae41be9756a5cf54006b93542e4ac0782cbc21b Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 4 Oct 2023 07:10:51 +0200 Subject: [PATCH 1/3] Remove numpy armv7l lock since wheels are now available --- docker/Dockerfile.armhf | 4 ++-- requirements.txt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index 9e518a01d..231305778 100644 --- a/docker/Dockerfile.armhf +++ b/docker/Dockerfile.armhf @@ -36,9 +36,9 @@ ENV LD_LIBRARY_PATH /usr/local/lib # Install dependencies COPY --chown=ftuser:ftuser requirements.txt /freqtrade/ USER ftuser -RUN pip install --user --no-cache-dir numpy==1.25.2 \ +RUN pip install --user --no-cache-dir numpy \ && pip install --user /tmp/pyarrow-*.whl \ - && pip install --user --no-build-isolation TA-Lib==0.4.28 \ + && pip install --user TA-Lib==0.4.28 \ && pip install --user --no-cache-dir -r requirements.txt # Copy dependencies to runtime-image diff --git a/requirements.txt b/requirements.txt index 05162ec26..644d1a8f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -numpy==1.25.2; platform_machine == 'armv7l' -numpy==1.26.1; platform_machine != 'armv7l' +numpy==1.26.1 pandas==2.0.3 pandas-ta==0.3.14b From cf43427be52700bf7de287822fb3d36bc8241711 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 28 Oct 2023 10:22:54 +0200 Subject: [PATCH 2/3] armhf: Move pip install to base image --- docker/Dockerfile.armhf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index 231305778..ad57c894c 100644 --- a/docker/Dockerfile.armhf +++ b/docker/Dockerfile.armhf @@ -16,7 +16,8 @@ RUN mkdir /freqtrade \ && useradd -u 1000 -G sudo -U -m ftuser \ && chown ftuser:ftuser /freqtrade \ # Allow sudoers - && echo "ftuser ALL=(ALL) NOPASSWD: /bin/chown" >> /etc/sudoers + && echo "ftuser ALL=(ALL) NOPASSWD: /bin/chown" >> /etc/sudoers \ + && pip install --upgrade pip WORKDIR /freqtrade @@ -25,7 +26,6 @@ FROM base as python-deps RUN apt-get update \ && apt-get -y install build-essential libssl-dev libffi-dev libopenblas-dev libgfortran5 pkg-config cmake gcc \ && apt-get clean \ - && pip install --upgrade pip \ && echo "[global]\nextra-index-url=https://www.piwheels.org/simple" > /etc/pip.conf # Install TA-lib From 7d65b3e1b47675064cce6f1538ae2690c41450eb Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 29 Oct 2023 10:48:19 +0100 Subject: [PATCH 3/3] install libopenblas-base to base image --- docker/Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index ad57c894c..751f80c11 100644 --- a/docker/Dockerfile.armhf +++ b/docker/Dockerfile.armhf @@ -11,7 +11,7 @@ ENV FT_APP_ENV="docker" # Prepare environment RUN mkdir /freqtrade \ && apt-get update \ - && apt-get -y install sudo libatlas3-base curl sqlite3 libhdf5-dev libutf8proc-dev libsnappy-dev \ + && apt-get -y install sudo libatlas3-base libopenblas-base curl sqlite3 libhdf5-dev libutf8proc-dev libsnappy-dev \ && apt-get clean \ && useradd -u 1000 -G sudo -U -m ftuser \ && chown ftuser:ftuser /freqtrade \