refactor: docker images

2026-01-06 04:32:43 +00:00 · 2019-11-21 12:25:25 +01:00
parent 5602d52041
commit 14b7eb2bab
19 changed files with 49 additions and 99 deletions
--- a/docker/cpu/conda-2stems.dockerfile
+++ b/docker/cpu/conda-2stems.dockerfile
@@ -2,4 +2,5 @@ FROM researchdeezer/spleeter:conda

 RUN mkdir -p /model/2stems \
    && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \
-    && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/
+    && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/conda-4stems.dockerfile
+++ b/docker/cpu/conda-4stems.dockerfile
@@ -2,4 +2,5 @@ FROM researchdeezer/spleeter:conda

 RUN mkdir -p /model/4stems \
    && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \
-    && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/
+    && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/conda-5stems.dockerfile
+++ b/docker/cpu/conda-5stems.dockerfile
@@ -2,4 +2,5 @@ FROM researchdeezer/spleeter:conda

 RUN mkdir -p /model/5stems \
    && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \
-    && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/
+    && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/conda.dockerfile
+++ b/docker/cpu/conda.dockerfile
@@ -1,5 +1,7 @@
 FROM continuumio/miniconda3:4.7.10

+RUN conda install -y -c conda-forge musdb
+# RUN conda install -y -c conda-forge museval
 RUN conda install -y -c conda-forge spleeter
 RUN mkdir -p /model
 ENV MODEL_PATH /model
--- a/docker/cpu/cpu.dockerfile
+++ b/docker/cpu/cpu.dockerfile
@@ -1,24 +0,0 @@
-FROM continuumio/miniconda3:4.7.10
-
-# install tensorflow
-RUN conda install -y tensorflow==1.14.0
-
-# install ffmpeg for audio loading/writing
-RUN conda  install -y -c conda-forge ffmpeg
-
-# install extra python libraries
-RUN conda install -y -c anaconda pandas==0.25.1
-RUN conda install -y -c conda-forge libsndfile
-
-# install ipython
-RUN conda install -y ipython
-
-WORKDIR /workspace/
-COPY ./ spleeter/
-
-RUN mkdir /cache/
-
-WORKDIR /workspace/spleeter
-RUN pip install .
-
-ENTRYPOINT ["python", "-m", "spleeter"]
--- a/docker/cpu/python-3.6-2stems.dockerfile
+++ b/docker/cpu/python-3.6-2stems.dockerfile
@@ -1,5 +1,6 @@
-FROM spleeter:3.6
+FROM researchdeezer/spleeter:3.6

 RUN mkdir -p /model/2stems \
    && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \
-    && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/
+    && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/python-3.6-4stems.dockerfile
+++ b/docker/cpu/python-3.6-4stems.dockerfile
@@ -1,5 +1,6 @@
-FROM spleeter:3.6
+FROM researchdeezer/spleeter:3.6

 RUN mkdir -p /model/4stems \
    && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \
-    && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/
+    && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/python-3.6-5stems.dockerfile
+++ b/docker/cpu/python-3.6-5stems.dockerfile
@@ -1,5 +1,6 @@
-FROM spleeter:3.6
+FROM researchdeezer/spleeter:3.6

 RUN mkdir -p /model/5stems \
    && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \
-    && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/
+    && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/python-3.6.dockerfile
+++ b/docker/cpu/python-3.6.dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.6

 RUN apt-get update && apt-get install -y ffmpeg libsndfile
+RUN pip install musdb museval
 RUN pip install spleeter
 RUN mkdir -p /model
 ENV MODEL_PATH /model
--- a/docker/cpu/python-3.7-2stems.dockerfile
+++ b/docker/cpu/python-3.7-2stems.dockerfile
@@ -1,5 +1,6 @@
-FROM spleeter:3.7
+FROM researchdeezer/spleeter:3.7

 RUN mkdir -p /model/2stems \
    && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \
-    && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/
+    && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/python-3.7-4stems.dockerfile
+++ b/docker/cpu/python-3.7-4stems.dockerfile
@@ -1,5 +1,6 @@
-FROM spleeter:3.7
+FROM researchdeezer/spleeter:3.7

 RUN mkdir -p /model/4stems \
    && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \
-    && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/
+    && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/python-3.7-5stems.dockerfile
+++ b/docker/cpu/python-3.7-5stems.dockerfile
@@ -1,5 +1,6 @@
-FROM spleeter:3.7
+FROM researchdeezer/spleeter:3.7

 RUN mkdir -p /model/5stems \
    && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \
-    && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/
+    && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \
+    && touch /model/5stems/.probe
--- a/docker/cpu/python-3.7.dockerfile
+++ b/docker/cpu/python-3.7.dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.7

 RUN apt-get update && apt-get install -y ffmpeg libsndfile
+RUN pip install musdb museval
 RUN pip install spleeter
 RUN mkdir -p /model
 ENV MODEL_PATH /model