From 69588a7be669a9c3db528a4baff60a5d7a1d255e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Fri, 12 Feb 2021 10:40:41 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20=20fix=20docker=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index afb7d6d..a434740 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,13 +1,18 @@ 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 strategy: matrix: platform: [cpu, gpu] - distribution: [3.6, 3.7, 3.8, conda] + distribution: [3.7, 3.8, conda] model: [modelless, 2stems, 4stems, 5stems] fail-fast: true steps: @@ -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 From ddc5debed7118c58cf697ede6dbcbac7b27dc40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Fri, 12 Feb 2021 10:40:57 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8=20fix=20docker=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/spleeter-conda.dockerfile | 3 +-- docker/spleeter.dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/spleeter-conda.dockerfile b/docker/spleeter-conda.dockerfile index 2a21cd8..9eb2883 100644 --- a/docker/spleeter-conda.dockerfile +++ b/docker/spleeter-conda.dockerfile @@ -2,12 +2,11 @@ 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 install -y -c conda-forge musdb -RUN conda install -y -c conda-forge ${SPLEETER_PACKAGE}==${SPLEETER_VERSION} +RUN conda install -y -c conda-forge spleeter==${SPLEETER_VERSION} COPY docker/conda-entrypoint.sh spleeter-entrypoint.sh ENTRYPOINT ["/bin/bash", "spleeter-entrypoint.sh"] \ No newline at end of file diff --git a/docker/spleeter.dockerfile b/docker/spleeter.dockerfile index 1161c3a..745ceae 100644 --- a/docker/spleeter.dockerfile +++ b/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"] From 5ac9b01d0cf19e0963c091fa25a48c159cbab140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Voituret?= Date: Fri, 12 Feb 2021 10:44:36 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20=20Fix=20conda=20installatio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker.yml | 2 +- docker/spleeter-conda.dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a434740..05c396b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: platform: [cpu, gpu] - distribution: [3.7, 3.8, conda] + distribution: [3.6, 3.7, 3.8, conda] model: [modelless, 2stems, 4stems, 5stems] fail-fast: true steps: diff --git a/docker/spleeter-conda.dockerfile b/docker/spleeter-conda.dockerfile index 9eb2883..4a8f704 100644 --- a/docker/spleeter-conda.dockerfile +++ b/docker/spleeter-conda.dockerfile @@ -6,7 +6,8 @@ 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==${SPLEETER_VERSION} +RUN conda install -y -c deezer-research spleeter COPY docker/conda-entrypoint.sh spleeter-entrypoint.sh ENTRYPOINT ["/bin/bash", "spleeter-entrypoint.sh"] \ No newline at end of file