diff --git a/.circleci/config.yml b/.circleci/config.yml index 4815f17..aeabf84 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,10 +74,10 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -t researchdeezer/spleeter:conda -f docker/cpu/conda.dockerfile . - - run: docker build -t researchdeezer/spleeter:conda-2stems -f docker/cpu/conda-2stems.dockerfile . - - run: docker build -t researchdeezer/spleeter:conda-4stems -f docker/cpu/conda-2stems.dockerfile . - - run: docker build -t researchdeezer/spleeter:conda-5stems -f docker/cpu/conda-2stems.dockerfile . + - run: docker build -t researchdeezer/spleeter:conda -f docker/conda.dockerfile . + - run: docker build --build-arg BASETAG=conda --build-arg MODEL=2stems -t researchdeezer/spleeter:conda-2stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=conda --build-arg MODEL=4stems -t researchdeezer/spleeter:conda-4stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=conda --build-arg MODEL=5stems -t researchdeezer/spleeter:conda-5stems -f docker/embedded-model.dockerfile . - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda-2stems separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:conda-4stems separate -i /runtime/audio_example.mp3 -o /tmp @@ -93,10 +93,10 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -t researchdeezer/spleeter:conda-gpu -f docker/cpu/conda.dockerfile . - - run: docker build -t researchdeezer/spleeter:conda-gpu-2stems -f docker/cpu/conda-2stems.dockerfile . - - run: docker build -t researchdeezer/spleeter:conda-gpu-4stems -f docker/cpu/conda-2stems.dockerfile . - - run: docker build -t researchdeezer/spleeter:conda-gpu-5stems -f docker/cpu/conda-2stems.dockerfile . + - run: docker build -t researchdeezer/spleeter:conda-gpu -f docker/conda-gpu.dockerfile . + - run: docker build --build-arg BASETAG=conda-gpu --build-arg MODEL=2stems -t researchdeezer/spleeter:conda-gpu-2stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=conda-gpu --build-arg MODEL=4stems -t researchdeezer/spleeter:conda-gpu-4stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=conda-gpu --build-arg MODEL=5stems -t researchdeezer/spleeter:conda-gpu-5stems -f docker/embedded-model.dockerfile . - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - run: docker push researchdeezer/spleeter:conda-gpu - run: docker push researchdeezer/spleeter:conda-gpu-2stems @@ -108,10 +108,10 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -t researchdeezer/spleeter:3.6 -f docker/cpu/python-3.6.dockerfile . - - run: docker build -t researchdeezer/spleeter:3.6-2stems -f docker/cpu/python-3.6-2stems.dockerfile . - - run: docker build -t researchdeezer/spleeter:3.6-4stems -f docker/cpu/python-3.6-4stems.dockerfile . - - run: docker build -t researchdeezer/spleeter:3.6-5stems -f docker/cpu/python-3.6-5stems.dockerfile . + - run: docker build -t researchdeezer/spleeter:3.6 -f docker/python-3.6.dockerfile . + - run: docker build --build-arg BASETAG=3.6 --build-arg MODEL=2stems -t researchdeezer/spleeter:3.6-2stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=3.6 --build-arg MODEL=4stems -t researchdeezer/spleeter:3.6-4stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=3.6 --build-arg MODEL=5stems -t researchdeezer/spleeter:3.6-5stems -f docker/embedded-model.dockerfile . - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6 separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6-2stems separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.6-4stems separate -i /runtime/audio_example.mp3 -o /tmp @@ -127,10 +127,10 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -t spleeter:3.7 -f docker/cpu/python-3.7.dockerfile . - - run: docker build -t spleeter:3.7-2stems -f docker/cpu/python-3.7-2stems.dockerfile . - - run: docker build -t spleeter:3.7-4stems -f docker/cpu/python-3.7-4stems.dockerfile . - - run: docker build -t spleeter:3.7-5stems -f docker/cpu/python-3.7-5stems.dockerfile . + - run: docker build -t researchdeezer/spleeter:3.7 -f docker/python-3.7.dockerfile . + - run: docker build --build-arg BASETAG=3.7 --build-arg MODEL=2stems -t researchdeezer/spleeter:3.7-2stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=3.7 --build-arg MODEL=4stems -t researchdeezer/spleeter:3.7-4stems -f docker/embedded-model.dockerfile . + - run: docker build --build-arg BASETAG=3.7 --build-arg MODEL=5stems -t researchdeezer/spleeter:3.7-5stems -f docker/embedded-model.dockerfile . - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7 separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-2stems separate -i /runtime/audio_example.mp3 -o /tmp - run: docker run -v $(pwd):/runtime researchdeezer/spleeter:3.7-4stems separate -i /runtime/audio_example.mp3 -o /tmp diff --git a/docker/gpu/conda-gpu.dockerfile b/docker/conda-gpu.dockerfile similarity index 100% rename from docker/gpu/conda-gpu.dockerfile rename to docker/conda-gpu.dockerfile diff --git a/docker/cpu/conda.dockerfile b/docker/conda.dockerfile similarity index 100% rename from docker/cpu/conda.dockerfile rename to docker/conda.dockerfile diff --git a/docker/cpu/conda-2stems.dockerfile b/docker/cpu/conda-2stems.dockerfile deleted file mode 100644 index 0c4bbf0..0000000 --- a/docker/cpu/conda-2stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:conda - -RUN mkdir -p /model/2stems \ - && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/conda-4stems.dockerfile b/docker/cpu/conda-4stems.dockerfile deleted file mode 100644 index b32c84c..0000000 --- a/docker/cpu/conda-4stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:conda - -RUN mkdir -p /model/4stems \ - && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/conda-5stems.dockerfile b/docker/cpu/conda-5stems.dockerfile deleted file mode 100644 index 6b6f2ca..0000000 --- a/docker/cpu/conda-5stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:conda - -RUN mkdir -p /model/5stems \ - && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.6-2stems.dockerfile b/docker/cpu/python-3.6-2stems.dockerfile deleted file mode 100644 index 3fca665..0000000 --- a/docker/cpu/python-3.6-2stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:3.6 - -RUN mkdir -p /model/2stems \ - && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.6-4stems.dockerfile b/docker/cpu/python-3.6-4stems.dockerfile deleted file mode 100644 index d19171e..0000000 --- a/docker/cpu/python-3.6-4stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:3.6 - -RUN mkdir -p /model/4stems \ - && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.6-5stems.dockerfile b/docker/cpu/python-3.6-5stems.dockerfile deleted file mode 100644 index a2a14ce..0000000 --- a/docker/cpu/python-3.6-5stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:3.6 - -RUN mkdir -p /model/5stems \ - && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.7-2stems.dockerfile b/docker/cpu/python-3.7-2stems.dockerfile deleted file mode 100644 index c3232a3..0000000 --- a/docker/cpu/python-3.7-2stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:3.7 - -RUN mkdir -p /model/2stems \ - && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.7-4stems.dockerfile b/docker/cpu/python-3.7-4stems.dockerfile deleted file mode 100644 index dfa2366..0000000 --- a/docker/cpu/python-3.7-4stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:3.7 - -RUN mkdir -p /model/4stems \ - && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ \ - && touch /model/5stems/.probe diff --git a/docker/cpu/python-3.7-5stems.dockerfile b/docker/cpu/python-3.7-5stems.dockerfile deleted file mode 100644 index 0c05955..0000000 --- a/docker/cpu/python-3.7-5stems.dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM researchdeezer/spleeter:3.7 - -RUN mkdir -p /model/5stems \ - && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ \ - && touch /model/5stems/.probe diff --git a/docker/embedded-model.dockerfile b/docker/embedded-model.dockerfile new file mode 100644 index 0000000..719a2d1 --- /dev/null +++ b/docker/embedded-model.dockerfile @@ -0,0 +1,9 @@ +ARG BASETAG +ARG MODEL + +FROM researchdeezer/spleeter:BASETAG + +RUN mkdir -p /model/$MODEL \ + && wget -O /tmp/$MODEL.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/$MODEL.tar.gz \ + && tar -xvzf /tmp/$MODEL.tar.gz -C /model/$MODEL/ \ + && touch /model/$MODEL/.probe diff --git a/docker/gpu/conda-gpu-2-stems.dockerfile b/docker/gpu/conda-gpu-2-stems.dockerfile deleted file mode 100644 index 888b524..0000000 --- a/docker/gpu/conda-gpu-2-stems.dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -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 \ - && tar -xvzf /tmp/2stems.tar.gz -C /model/2stems/ diff --git a/docker/gpu/conda-gpu-4-stems.dockerfile b/docker/gpu/conda-gpu-4-stems.dockerfile deleted file mode 100644 index 3d9c4f7..0000000 --- a/docker/gpu/conda-gpu-4-stems.dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -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 \ - && tar -xvzf /tmp/4stems.tar.gz -C /model/4stems/ diff --git a/docker/gpu/conda-gpu-5-stems.dockerfile b/docker/gpu/conda-gpu-5-stems.dockerfile deleted file mode 100644 index 5d5ae3b..0000000 --- a/docker/gpu/conda-gpu-5-stems.dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -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 \ - && tar -xvzf /tmp/5stems.tar.gz -C /model/5stems/ diff --git a/docker/cpu/python-3.6.dockerfile b/docker/python-3.6.dockerfile similarity index 100% rename from docker/cpu/python-3.6.dockerfile rename to docker/python-3.6.dockerfile diff --git a/docker/cpu/python-3.7.dockerfile b/docker/python-3.7.dockerfile similarity index 100% rename from docker/cpu/python-3.7.dockerfile rename to docker/python-3.7.dockerfile