From 019d1e04bb5b6bed93b6e7a75da86fdd7bd5c49c Mon Sep 17 00:00:00 2001
From: Xavier Serrat Bordas <xavier.serrat22@gmail.com>
Date: Sat, 26 Nov 2022 17:54:45 +0100
Subject: [PATCH] [#15] Use requirements_minimal.txt as dependencies

---
 Dockerfile | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 709bce6..43ca89f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,14 @@
-#FROM python:3.8-alpine3.16 as build-lameenc
-#
-#RUN python3 -m venv /opt/venv  \
-#    && python3 -m pip install --upgrade pip
-#ENV PATH="/opt/venv/bin:$PATH"
-#
-#RUN git clone -b v1.3.1 --single-branch https://github.com/chrisstaite/lameenc /lib/lameenc
-#
-#RUN mkdir -p /lib/lameenc/build
-#WORKDIR /lib/lameenc/build
-#RUN cmake .. && make && pip install "lameenc-1.3.1-cp38-cp38-linux_aarch64.whl"
-
 FROM python:3.8-alpine3.16
 
 USER root
 ENV TORCH_HOME=/data/models
+ENV REQUIREMENTS_FILE=requirements_minimal.txt
 
 # Install needed packages
 RUN apk update && apk add \
     git \
-    ffmpeg
+    ffmpeg \
+    curl
 
 # Install Facebook Demucs
 RUN mkdir -p /lib/demucs
@@ -27,12 +17,13 @@ WORKDIR /lib/demucs
 
 RUN git clone --depth 1 --branch main https://github.com/facebookresearch/demucs .
 
-#COPY --from=build-lameenc /opt/venv /opt/venv
+#RUN REQUIREMENTS_FILE=$([[ "${DEMUCS_VERSION}" == "minimal" ]] && echo "requirements_minimal.txt" || echo "requirements.txt")
 
-RUN sed -i 's/lameenc>=1.2/lameenc>=1.4.1/g' requirements.txt requirements_minimal.txt  \
-    && cat requirements.txt \
-    && cat requirements_minimal.txt
-RUN python3 -m pip install --platform=arm64 --no-deps -e .
+RUN echo "Requirements file: ${REQUIREMENTS_FILE}"
+RUN curl -o /tmp/lameenc.zip https://github.com/chrisstaite/lameenc/archive/refs/tags/v1.4.1.zip
+RUN pip install /tmp/lameenc.zip
+RUN sed -i 's/lameenc>=1.2/lameenc==1.4.1/g' ${REQUIREMENTS_FILE} # Upgrade lameenc to 1.4.1 to support arm64
+RUN python3 -m pip install -r ${REQUIREMENTS_FILE}
 RUN python3 -m demucs.separate -d cpu --mp3 test.mp3 # Trigger model download \
     && rm -r separated  # cleanup