diff --git a/.circleci/config.yml b/.circleci/config.yml index 89fe945..4cae4ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,6 +145,8 @@ jobs: - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-4stems separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-5stems separate -i /runtime/audio_example.mp3 -o /tmp - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD + - run: docker tags researchdeezer/spleeter:3.7 researchdeezer/spleeter:latest + - run: docker push researchdeezer/spleeter:latest - run: docker push researchdeezer/spleeter:3.7 - run: docker push researchdeezer/spleeter:3.7-2stems - run: docker push researchdeezer/spleeter:3.7-4stems diff --git a/docker/cpu/conda.dockerfile b/docker/cpu/conda.dockerfile index 32184e3..1506a68 100644 --- a/docker/cpu/conda.dockerfile +++ b/docker/cpu/conda.dockerfile @@ -2,7 +2,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 conda install -y -c conda-forge spleeter=1.4.4 RUN mkdir -p /model ENV MODEL_PATH /model diff --git a/docker/cpu/python-3.6.dockerfile b/docker/cpu/python-3.6.dockerfile index 0f23184..3561198 100644 --- a/docker/cpu/python-3.6.dockerfile +++ b/docker/cpu/python-3.6.dockerfile @@ -2,7 +2,7 @@ FROM python:3.6 RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval -RUN pip install spleeter +RUN pip install spleeter==1.4.4 RUN mkdir -p /model ENV MODEL_PATH /model ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/cpu/python-3.7.dockerfile b/docker/cpu/python-3.7.dockerfile index 33bdcbc..0433e5d 100644 --- a/docker/cpu/python-3.7.dockerfile +++ b/docker/cpu/python-3.7.dockerfile @@ -2,7 +2,7 @@ FROM python:3.7 RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval -RUN pip install spleeter +RUN pip install spleeter==1.4.4 RUN mkdir -p /model ENV MODEL_PATH /model ENTRYPOINT ["spleeter"] \ No newline at end of file diff --git a/docker/gpu/conda-gpu.dockerfile b/docker/gpu/conda-gpu.dockerfile index e1fa3d0..b98693c 100644 --- a/docker/gpu/conda-gpu.dockerfile +++ b/docker/gpu/conda-gpu.dockerfile @@ -1,21 +1,22 @@ FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 -RUN apt-get update --fix-missing && \ - apt-get install -y wget bzip2 ca-certificates curl git && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O ~/miniconda.sh && \ - /bin/bash ~/miniconda.sh -b -p /opt/conda && \ - rm ~/miniconda.sh && \ - /opt/conda/bin/conda clean -tipsy && \ - ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ - echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ - echo "conda activate base" >> ~/.bashrc +RUN apt-get update --fix-missing \ + && apt-get install -y wget bzip2 ca-certificates curl git \ + && apt-get clean && \ + && rm -rf /var/lib/apt/lists/* \ + && wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O ~/miniconda.sh \ + && /bin/bash ~/miniconda.sh -b -p /opt/conda \ + && rm ~/miniconda.sh \ + && /opt/conda/bin/conda clean -tipsy \ + && ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh \ + && echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc \ + && echo "conda activate base" >> ~/.bashrc -RUN conda install -y tensorflow-gpu==1.14.0 -RUN conda install -y -c conda-forge musdb +RUN conda install -y cudatoolkit=9.0 \ + && conda install -y tensorflow-gpu==1.14.0 \ + && conda install -y -c conda-forge musdb # RUN conda install -y -c conda-forge museval # Note: switch to spleeter GPU once published. -RUN conda install -y -c conda-forge spleeter +RUN conda install -y -c conda-forge spleeter=1.4.4 ENTRYPOINT ["spleeter"] \ No newline at end of file