refactor: docker images

This commit is contained in:
Félix Voituret
2019-11-21 12:25:25 +01:00
parent 5602d52041
commit 14b7eb2bab
19 changed files with 49 additions and 99 deletions

View File

@@ -1,4 +1,4 @@
FROM deezer/spleeter:conda-gpu
FROM researchdeezer/spleeter:conda-gpu
RUN mkdir -p /model/2stems \
&& wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \

View File

@@ -1,4 +1,4 @@
FROM deezer/spleeter:conda-gpu
FROM researchdeezer/spleeter:conda-gpu
RUN mkdir -p /model/4stems \
&& wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \

View File

@@ -1,4 +1,4 @@
FROM deezer/spleeter:conda-gpu
FROM researchdeezer/spleeter:conda-gpu
RUN mkdir -p /model/5stems \
&& wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \

View File

@@ -1,12 +1,21 @@
FROM continuumio/miniconda3:4.7.10
FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
RUN conda install -y ipython \
&& conda install -y tensorflow-gpu==1.14.0 \
&& conda install -y -c conda-forge ffmpeg \
&& conda install -y -c conda-forge libsndfile \
&& conda install -y -c anaconda pandas==0.25.1 \
RUN mkdir -p /model
ENV MODEL_PATH /model
RUN pip install spleeter
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 conda install -y tensorflow-gpu==1.14.0
RUN 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
ENTRYPOINT ["spleeter"]

View File

@@ -1,35 +0,0 @@
FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
# set work directory
WORKDIR /workspace
# install anaconda
ENV PATH /opt/conda/bin:$PATH
COPY docker/install_miniconda.sh .
RUN bash ./install_miniconda.sh && rm install_miniconda.sh
RUN conda update -n base -c defaults conda
# install tensorflow for GPU
RUN conda install -y tensorflow-gpu==1.14.0
# install ffmpeg for audio loading/writing
RUN conda install -y -c conda-forge ffmpeg
# install extra libs
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
RUN mkdir /cache/
# clone inside image github repository
COPY ./ spleeter/
WORKDIR /workspace/spleeter
RUN pip install .
ENTRYPOINT ["python", "-m", "spleeter"]

View File

@@ -1,13 +0,0 @@
#!/bin/bash
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