refactor: docker layout

This commit is contained in:
Félix Voituret
2019-11-21 13:50:10 +01:00
parent d273b76e46
commit 83bf26553c
18 changed files with 25 additions and 85 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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/

View File

@@ -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/

View File

@@ -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/