diff --git a/.circleci/config.yml b/.circleci/config.yml index 22fd6b5..00ae890 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,8 +98,7 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -t conda -f docker/conda.dockerfile . - - run: docker build --build-arg BASE=conda -t researchdeezer/spleeter:conda -f docker/spleeter-conda.dockerfile . + - run: docker build --build-arg BASE=continuumio/miniconda3:4.7.10 -t researchdeezer/spleeter:conda -f docker/spleeter-conda.dockerfile . - run: docker build --build-arg BASE=researchdeezer/spleeter:conda --build-arg MODEL=2stems -t researchdeezer/spleeter:conda-2stems -f docker/spleeter-model.dockerfile . - run: docker build --build-arg BASE=researchdeezer/spleeter:conda --build-arg MODEL=4stems -t researchdeezer/spleeter:conda-4stems -f docker/spleeter-model.dockerfile . - run: docker build --build-arg BASE=researchdeezer/spleeter:conda --build-arg MODEL=5stems -t researchdeezer/spleeter:conda-5stems -f docker/spleeter-model.dockerfile . @@ -118,8 +117,7 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -t conda -f docker/conda.dockerfile . - - run: docker build --build-arg BASE=conda -t conda-gpu -f docker/cuda-10-0.dockerfile . + - run: docker build --build-arg BASE=continuumio/miniconda3:4.7.10 -t conda-gpu -f docker/cuda-10-0.dockerfile . - run: docker build --build-arg BASE=conda-gpu --build-arg SPLEETER_PACKAGE=spleeter-gpu -t researchdeezer/spleeter:conda-gpu -f docker/spleeter-conda.dockerfile . - run: docker build --build-arg BASE=researchdeezer/spleeter:conda-gpu --build-arg MODEL=2stems -t researchdeezer/spleeter:conda-gpu-2stems -f docker/spleeter-model.dockerfile . - run: docker build --build-arg BASE=researchdeezer/spleeter:conda-gpu --build-arg MODEL=4stems -t researchdeezer/spleeter:conda-gpu-4stems -f docker/spleeter-model.dockerfile . diff --git a/docker/spleeter-conda.dockerfile b/docker/spleeter-conda.dockerfile index ae79f4a..c085b25 100644 --- a/docker/spleeter-conda.dockerfile +++ b/docker/spleeter-conda.dockerfile @@ -7,8 +7,6 @@ ARG SPLEETER_VERSION=1.5.3 ENV MODEL_PATH /model RUN mkdir -p /model -COPY audio_example.mp3 . - RUN conda install -y -c conda-forge musdb RUN conda install -y -c conda-forge ${SPLEETER_PACKAGE}==${SPLEETER_VERSION} diff --git a/docker/spleeter.dockerfile b/docker/spleeter.dockerfile index c7029b1..1161c3a 100644 --- a/docker/spleeter.dockerfile +++ b/docker/spleeter.dockerfile @@ -7,8 +7,6 @@ ARG SPLEETER_VERSION=1.5.3 ENV MODEL_PATH /model RUN mkdir -p /model -COPY audio_example.mp3 . - RUN apt-get update && apt-get install -y ffmpeg libsndfile1 RUN pip install musdb museval RUN pip install ${SPLEETER_PACKAGE}==${SPLEETER_VERSION}