refactor: aggregate docker jobs

feat: add docker push
This commit is contained in:
Félix Voituret
2019-11-20 16:37:10 +01:00
parent fbe5f290ef
commit 5602d52041
4 changed files with 33 additions and 162 deletions

View File

@@ -99,110 +99,44 @@ jobs:
docker: docker:
- image: docker:17.05.0-ce-git - image: docker:17.05.0-ce-git
steps: steps:
- setup_remote_docker: - checkout
docker_layer_caching: true - run: docker build -t researchdeezer/spleeter:conda -f docker/cpu/conda.dockerfile .
- run: - run: docker build -t researchdeezer/spleeter:conda-2stems -f docker/cpu/conda-2stems.dockerfile .
name: build image - run: docker build -t researchdeezer/spleeter:conda-4stems -f docker/cpu/conda-2stems.dockerfile .
command: docker build -t spleeter:conda -f docker/cpu/conda.dockerfile . - run: docker build -t researchdeezer/spleeter:conda-5stems -f docker/cpu/conda-2stems.dockerfile .
docker-conda-cpu-2stems: - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
docker: - run: docker push researchdeezer/spleeter:conda
- image: docker:17.05.0-ce-git - run: docker push researchdeezer/spleeter:conda-2stems
steps: - run: docker push researchdeezer/spleeter:conda-4stems
- setup_remote_docker: - run: docker push researchdeezer/spleeter:conda-5stems
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:2-stems-conda -f docker/cpu/conda-2stems.dockerfile .
docker-conda-cpu-4stems:
docker:
- image: docker:17.05.0-ce-git
steps:
- setup_remote_docker:
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:4-stems-conda -f docker/cpu/conda-4stems.dockerfile .
docker-conda-cpu-5stems:
docker:
- image: docker:17.05.0-ce-git
steps:
- setup_remote_docker:
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:5-stems-conda -f docker/cpu/conda-5stems.dockerfile .
docker-3.6-cpu: docker-3.6-cpu:
docker: docker:
- image: docker:17.05.0-ce-git - image: docker:17.05.0-ce-git
steps: steps:
- setup_remote_docker: - checkout
docker_layer_caching: true - run: docker build -t researchdeezer/spleeter:3.6 -f docker/cpu/python-3.6.dockerfile .
- run: - run: docker build -t researchdeezer/spleeter:3.6-2stems -f docker/cpu/python-3.6-2stems.dockerfile .
name: build image - run: docker build -t researchdeezer/spleeter:3.6-4stems -f docker/cpu/python-3.6-4stems.dockerfile .
command: docker build -t spleeter:3.6 -f docker/cpu/python-3.6.dockerfile . - run: docker build -t researchdeezer/spleeter:3.6-5stems -f docker/cpu/python-3.6-5stems.dockerfile .
docker-3.6-cpu-2stems: - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
docker: - run: docker push researchdeezer/spleeter:3.6
- image: docker:17.05.0-ce-git - run: docker push researchdeezer/spleeter:3.6-2stems
steps: - run: docker push researchdeezer/spleeter:3.6-4stems
- setup_remote_docker: - run: docker push researchdeezer/spleeter:3.6-5stems
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:3.6-2stems -f docker/cpu/python-3.6-2stems.dockerfile .
docker-3.6-cpu-4stems:
docker:
- image: docker:17.05.0-ce-git
steps:
- setup_remote_docker:
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:3.6-4stems -f docker/cpu/python-3.6-4stems.dockerfile .
docker-3.6-cpu-5stems:
docker:
- image: docker:17.05.0-ce-git
steps:
- setup_remote_docker:
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:3.6-5stems -f docker/cpu/python-3.6-5stems.dockerfile .
docker-3.7-cpu: docker-3.7-cpu:
docker: docker:
- image: docker:17.05.0-ce-git - image: docker:17.05.0-ce-git
steps: steps:
- setup_remote_docker: - checkout
docker_layer_caching: true - run: docker build -t spleeter:3.7 -f docker/cpu/python-3.7.dockerfile .
- run: - run: docker build -t spleeter:3.7-2stems -f docker/cpu/python-3.7-2stems.dockerfile .
name: build image - run: docker build -t spleeter:3.7-4stems -f docker/cpu/python-3.7-4stems.dockerfile .
command: docker build -t spleeter:3.7 -f docker/cpu/python-3.7.dockerfile . - run: docker build -t spleeter:3.7-5stems -f docker/cpu/python-3.7-5stems.dockerfile .
docker-3.7-cpu-2stems: - run: docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
docker: - run: docker push researchdeezer/spleeter:3.7
- image: docker:17.05.0-ce-git - run: docker push researchdeezer/spleeter:3.7-2stems
steps: - run: docker push researchdeezer/spleeter:3.7-4stems
- setup_remote_docker: - run: docker push researchdeezer/spleeter:3.7-5stems
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:3.7-2stems -f docker/cpu/python-3.7-2stems.dockerfile .
docker-3.7-cpu-4stems:
docker:
- image: docker:17.05.0-ce-git
steps:
- setup_remote_docker:
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:3.7-4stems -f docker/cpu/python-3.7-4stems.dockerfile .
docker-3.7-cpu-5stems:
docker:
- image: docker:17.05.0-ce-git
steps:
- setup_remote_docker:
docker_layer_caching: true
- run:
name: build image
command: docker build -t spleeter:3.7-5stems -f docker/cpu/python-3.7-5stems.dockerfile .
workflows: workflows:
version: 2 version: 2
spleeter-release-pipeline: spleeter-release-pipeline:
@@ -243,27 +177,6 @@ workflows:
branches: branches:
only: only:
- master - master
- docker-conda-cpu-2stems:
requires:
- docker-conda-cpu
filters:
branches:
only:
- master
- docker-conda-cpu-4stems:
requires:
- docker-conda-cpu
filters:
branches:
only:
- master
- docker-conda-cpu-5stems:
requires:
- docker-conda-cpu
filters:
branches:
only:
- master
- docker-3.6-cpu: - docker-3.6-cpu:
requires: requires:
- hold - hold
@@ -271,27 +184,6 @@ workflows:
branches: branches:
only: only:
- master - master
- docker-3.6-cpu-2stems:
requires:
- docker-3.6-cpu
filters:
branches:
only:
- master
- docker-3.6-cpu-4stems:
requires:
- docker-3.6-cpu
filters:
branches:
only:
- master
- docker-3.6-cpu-5stems:
requires:
- docker-3.6-cpu
filters:
branches:
only:
- master
- docker-3.7-cpu: - docker-3.7-cpu:
requires: requires:
- hold - hold
@@ -299,24 +191,3 @@ workflows:
branches: branches:
only: only:
- master - master
- docker-3.7-cpu-2stems:
requires:
- docker-3.7-cpu
filters:
branches:
only:
- master
- docker-3.7-cpu-4stems:
requires:
- docker-3.7-cpu
filters:
branches:
only:
- master
- docker-3.7-cpu-5stems:
requires:
- docker-3.7-cpu
filters:
branches:
only:
- master

View File

@@ -1,4 +1,4 @@
FROM spleeter:conda FROM researchdeezer/spleeter:conda
RUN mkdir -p /model/2stems \ RUN mkdir -p /model/2stems \
&& wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \ && wget -O /tmp/2stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/2stems.tar.gz \

View File

@@ -1,4 +1,4 @@
FROM spleeter:conda FROM researchdeezer/spleeter:conda
RUN mkdir -p /model/4stems \ RUN mkdir -p /model/4stems \
&& wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \ && wget -O /tmp/4stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/4stems.tar.gz \

View File

@@ -1,4 +1,4 @@
FROM spleeter:conda FROM researchdeezer/spleeter:conda
RUN mkdir -p /model/5stems \ RUN mkdir -p /model/5stems \
&& wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \ && wget -O /tmp/5stems.tar.gz https://github.com/deezer/spleeter/releases/download/v1.4.0/5stems.tar.gz \