From fcb6f0755e6fb87996abe1e83c58e91b93e3cb39 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Tue, 3 Nov 2020 01:18:01 +0100 Subject: [PATCH] more fixes for the docker build --- Dockerfile | 40 +++++++++++++++++++++++++++------------- requirements.txt | 1 - 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6304e1cf..c866223e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM python:3.8-alpine3.12 # Versions ARG JEMALLOC_VERSION=5.2.1 @@ -18,22 +18,36 @@ RUN set -x \ flac \ sox \ ffmpeg \ - python3 \ - py3-numpy \ - py3-scipy \ - py3-pytaglib \ - py3-pillow \ - py3-aiohttp \ - py3-cryptography \ - py3-jwt \ - py3-pip \ + libsndfile \ + taglib \ + openblas \ + libgfortran \ + lapack \ # build packages && apk add --no-cache --virtual .build-deps \ - build-base + build-base \ + libsndfile-dev \ + taglib-dev \ + openblas-dev \ + lapack-dev \ + libffi-dev \ + gcc \ + gfortran \ + freetype-dev \ + libpng-dev \ + libressl-dev \ + fribidi-dev \ + harfbuzz-dev \ + jpeg-dev \ + lcms2-dev \ + openjpeg-dev \ + tcl-dev \ + tiff-dev \ + tk-dev \ + zlib-dev # setup jmalloc -RUN mkdir /usr/src \ - && curl -L -f -s "https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2" \ +RUN curl -L -f -s "https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2" \ | tar -xjf - -C /usr/src \ && cd /usr/src/jemalloc-${JEMALLOC_VERSION} \ && ./configure \ diff --git a/requirements.txt b/requirements.txt index 47f92d4c..a3e4e74c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,6 @@ soco==0.20 pillow==8.0.1 aiohttp_cors==0.7.0 unidecode==1.1.1 -hass-client==0.0.6 PyJWT==1.7.1 aiohttp_jwt==0.6.1 zeroconf==0.28.6 -- 2.34.1