Merge pull request #576 from deezer/contribution

Contribution

.github/workflows/docker.yml

@@ -1,6 +1,11 @@
 name: docker
 on:
-  - workflow_dispatch
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Spleeter version to build image for"
+        required: true
+        default: "2.1.2"
 jobs:
   build-test-push:
     runs-on: ubuntu-latest
@@ -19,7 +24,6 @@ jobs:
           echo "::set-env name=base::python:${{ matrix.distribution }}"
           echo "::set-env name=tag::${{ matrix.distribution }}"
           echo "::set-env name=file::spleeter"
-          echo "::set-env name=package::spleeter"
       - if: ${{ matrix.distribution == 'conda' }}
         name: Build Conda base image
         run: |
@@ -31,17 +35,16 @@ jobs:
           docker build \
             --build-arg BASE=python:${{ matrix.distribution }} \
             -t cuda:${{ matrix.distribution }} \
-            -f docker/cuda-10-0.dockerfile .
+            -f docker/cuda-10-1.dockerfile .
           echo "::set-env name=base::cuda:${{ matrix.distribution }}"
           echo "::set-env name=tag::${{ matrix.distribution }}-gpu"
-          echo "::set-env name=package::spleeter-gpu"
       # ----------------------------------------------------------------------
       # Note: image building.
       - name: Build deezer/spleeter:${{ env.tag }} image
         run: |
           docker build \
             --build-arg BASE=${{ env.base }} \
-            --build-arg SPLEETER_PACKAGE=${{ env.package }} \
+            --build-arg SPLEETER_VERSION=${{ github.event.inputs.version }} \
             -t deezer/spleeter:${{ env.tag }} \
             -f docker/${{ env.file }}.dockerfile .
           echo "::set-env name=modelargs::"
@@ -54,7 +57,7 @@ jobs:
             -t deezer/spleeter:${{ env.tag }}-${{ matrix.model }} \
             -f docker/spleeter-model.dockerfile .
           echo "::set-env name=tag::${{ env.tag }}-${{ matrix.model }}"
-          echo "::set-env name=modelarg::-p spleeter:${{ matrix.model }}"          
+          echo "::set-env name=modelarg::-p spleeter:${{ matrix.model }}"
       # ----------------------------------------------------------------------
       # Note: image testing.
       - name: Test deezer/spleeter:${{ env.tag }} image

docker/spleeter-conda.dockerfile

@@ -2,12 +2,12 @@ ARG BASE=conda
 
 FROM ${BASE}
 
-ARG SPLEETER_PACKAGE=spleeter
 ARG SPLEETER_VERSION=1.5.3
 ENV MODEL_PATH /model
 
 RUN mkdir -p /model
+RUN conda config --add channels conda-forge
 RUN conda install -y -c conda-forge musdb
-RUN conda install -y -c conda-forge ${SPLEETER_PACKAGE}==${SPLEETER_VERSION}
+RUN conda install -y -c deezer-research spleeter 
 COPY docker/conda-entrypoint.sh spleeter-entrypoint.sh
 ENTRYPOINT ["/bin/bash", "spleeter-entrypoint.sh"]

docker/spleeter.dockerfile

@@ -2,13 +2,12 @@ ARG BASE=python:3.6
 
 FROM ${BASE}
 
-ARG SPLEETER_PACKAGE=spleeter
 ARG SPLEETER_VERSION=1.5.3
 ENV MODEL_PATH /model
 
 RUN mkdir -p /model
 RUN apt-get update && apt-get install -y ffmpeg libsndfile1
 RUN pip install musdb museval
-RUN pip install ${SPLEETER_PACKAGE}==${SPLEETER_VERSION}
+RUN pip install spleeter==${SPLEETER_VERSION}
 
 ENTRYPOINT ["spleeter"]