Clean up pulling of builds, and ensure releases only on tags.

This commit is contained in:
Dorian 2019-05-17 16:06:33 -04:00
parent 4e933a886e
commit 071ba2b258
1 changed files with 10 additions and 13 deletions

View File

@ -26,8 +26,7 @@ jobs:
- run:
name: Build image
command: |
docker-compose pull server-build | true
docker-compose build server-build
docker-compose build --pull server-build
# - run:
# name: Save Docker cache
@ -58,8 +57,7 @@ jobs:
- run:
name: Build app-builder image
command: |
docker-compose pull server-build app-build | true
docker-compose build app-build
docker-compose build --pull app-build
- deploy:
name: Upload Build Images to Docker Hub
@ -79,8 +77,7 @@ jobs:
- run:
name: Build Rookeries image
command: |
docker-compose pull | true
docker-compose build rookeries
docker-compose build --pull rookeries
test-server:
working_directory: ~/rookeries_ci
@ -93,7 +90,7 @@ jobs:
- run:
name: Test API
command: |
docker-compose pull | true
docker-compose pull || true
cargo make docker-test-api
test-app:
@ -107,7 +104,7 @@ jobs:
- run:
name: Test UI
command: |
docker-compose pull | true
docker-compose pull || true
cargo make docker-test-ui
push-rookeries:
@ -121,8 +118,7 @@ jobs:
- deploy:
name: Upload Latest to Docker Hub
command: |
docker-compose pull | true
docker-compose build rookeries
docker-compose build --pull rookeries
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
docker push dorianpula/rookeries:latest
@ -137,8 +133,7 @@ jobs:
- deploy:
name: Upload Tagged Release to Docker Hub
command: |
docker-compose pull | true
docker-compose build rookeries
docker-compose build --pull rookeries
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
docker tag dorianpula/rookeries:latest dorianpula/rookeries:${CIRCLE_TAG}
docker push dorianpula/rookeries:${CIRCLE_TAG}
@ -171,5 +166,7 @@ workflows:
requires:
- push-rookeries
filters:
branches:
ignore: /.*/
tags:
only: /\d\.\d\.\d/s
only: /^\d+\.\d+\.\d+/