From 85ff00797f6c615c62885793923eca952e9e791f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Fri, 22 Nov 2019 15:17:21 +0100 Subject: [PATCH] fix: dockerfiles --- docker/conda-gpu.dockerfile | 3 +++ docker/conda.dockerfile | 6 ++++-- docker/python-3.6-gpu.dockerfile | 6 ++++-- docker/python-3.6.dockerfile | 7 +++++-- docker/python-3.7-gpu.dockerfile | 7 +++++-- docker/python-3.7.dockerfile | 7 +++++-- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/docker/conda-gpu.dockerfile b/docker/conda-gpu.dockerfile index d25c675..10d7631 100644 --- a/docker/conda-gpu.dockerfile +++ b/docker/conda-gpu.dockerfile @@ -13,8 +13,11 @@ RUN apt-get update --fix-missing \ && echo "conda activate base" >> ~/.bashrc \ && ln -s /opt/conda/bin/conda /usr/bin/conda +COPY audio_example.mp3 . + RUN conda install -y -c conda-forge musdb # RUN conda install -y -c conda-forge museval RUN conda install -y -c conda-forge spleeter-gpu=1.4.5 + ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/conda.dockerfile b/docker/conda.dockerfile index e340987..c40d0b7 100644 --- a/docker/conda.dockerfile +++ b/docker/conda.dockerfile @@ -1,9 +1,11 @@ FROM continuumio/miniconda3:4.7.10 +RUN mkdir -p /model +ENV MODEL_PATH /model +COPY audio_example.mp3 . + RUN conda install -y -c conda-forge musdb # RUN conda install -y -c conda-forge museval RUN conda install -y -c conda-forge spleeter=1.4.5 -RUN mkdir -p /model -ENV MODEL_PATH /model ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/python-3.6-gpu.dockerfile b/docker/python-3.6-gpu.dockerfile index 55245f2..3fe010b 100644 --- a/docker/python-3.6-gpu.dockerfile +++ b/docker/python-3.6-gpu.dockerfile @@ -45,11 +45,13 @@ RUN apt-get update \ && apt-mark hold libcudnn7 \ && rm -rf /var/lib/apt/lists/* +RUN mkdir -p /model +ENV MODEL_PATH /model +COPY audio_example.mp3 . # Spleeter installation. RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval RUN pip install spleeter-gpu==1.4.5 -RUN mkdir -p /model -ENV MODEL_PATH /model + ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/python-3.6.dockerfile b/docker/python-3.6.dockerfile index 1edc3de..7654ff1 100644 --- a/docker/python-3.6.dockerfile +++ b/docker/python-3.6.dockerfile @@ -1,8 +1,11 @@ FROM python:3.6 +RUN mkdir -p /model +ENV MODEL_PATH /model +COPY audio_example.mp3 . + RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval RUN pip install spleeter==1.4.5 -RUN mkdir -p /model -ENV MODEL_PATH /model + ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/python-3.7-gpu.dockerfile b/docker/python-3.7-gpu.dockerfile index aa00e11..b94b84c 100644 --- a/docker/python-3.7-gpu.dockerfile +++ b/docker/python-3.7-gpu.dockerfile @@ -45,10 +45,13 @@ RUN apt-get update \ && apt-mark hold libcudnn7 \ && rm -rf /var/lib/apt/lists/* +RUN mkdir -p /model +ENV MODEL_PATH /model +COPY audio_example.mp3 . + # Spleeter installation. RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval RUN pip install spleeter-gpu==1.4.5 -RUN mkdir -p /model -ENV MODEL_PATH /model + ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/python-3.7.dockerfile b/docker/python-3.7.dockerfile index 48de17c..223d0ed 100644 --- a/docker/python-3.7.dockerfile +++ b/docker/python-3.7.dockerfile @@ -1,8 +1,11 @@ FROM python:3.7 +RUN mkdir -p /model +ENV MODEL_PATH /model +COPY audio_example.mp3 . + RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval RUN pip install spleeter==1.4.5 -RUN mkdir -p /model -ENV MODEL_PATH /model + ENTRYPOINT ["spleeter"] \ No newline at end of file