Clean up pulling of builds, and ensure releases only on tags.
This commit is contained in:
parent
4e933a886e
commit
071ba2b258
|
@ -26,8 +26,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Build image
|
name: Build image
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull server-build | true
|
docker-compose build --pull server-build
|
||||||
docker-compose build server-build
|
|
||||||
|
|
||||||
# - run:
|
# - run:
|
||||||
# name: Save Docker cache
|
# name: Save Docker cache
|
||||||
|
@ -58,8 +57,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Build app-builder image
|
name: Build app-builder image
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull server-build app-build | true
|
docker-compose build --pull app-build
|
||||||
docker-compose build app-build
|
|
||||||
|
|
||||||
- deploy:
|
- deploy:
|
||||||
name: Upload Build Images to Docker Hub
|
name: Upload Build Images to Docker Hub
|
||||||
|
@ -79,8 +77,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Build Rookeries image
|
name: Build Rookeries image
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull | true
|
docker-compose build --pull rookeries
|
||||||
docker-compose build rookeries
|
|
||||||
|
|
||||||
test-server:
|
test-server:
|
||||||
working_directory: ~/rookeries_ci
|
working_directory: ~/rookeries_ci
|
||||||
|
@ -93,7 +90,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Test API
|
name: Test API
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull | true
|
docker-compose pull || true
|
||||||
cargo make docker-test-api
|
cargo make docker-test-api
|
||||||
|
|
||||||
test-app:
|
test-app:
|
||||||
|
@ -107,7 +104,7 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Test UI
|
name: Test UI
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull | true
|
docker-compose pull || true
|
||||||
cargo make docker-test-ui
|
cargo make docker-test-ui
|
||||||
|
|
||||||
push-rookeries:
|
push-rookeries:
|
||||||
|
@ -121,8 +118,7 @@ jobs:
|
||||||
- deploy:
|
- deploy:
|
||||||
name: Upload Latest to Docker Hub
|
name: Upload Latest to Docker Hub
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull | true
|
docker-compose build --pull rookeries
|
||||||
docker-compose build rookeries
|
|
||||||
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
|
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
|
||||||
docker push dorianpula/rookeries:latest
|
docker push dorianpula/rookeries:latest
|
||||||
|
|
||||||
|
@ -137,8 +133,7 @@ jobs:
|
||||||
- deploy:
|
- deploy:
|
||||||
name: Upload Tagged Release to Docker Hub
|
name: Upload Tagged Release to Docker Hub
|
||||||
command: |
|
command: |
|
||||||
docker-compose pull | true
|
docker-compose build --pull rookeries
|
||||||
docker-compose build rookeries
|
|
||||||
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
|
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
|
||||||
docker tag dorianpula/rookeries:latest dorianpula/rookeries:${CIRCLE_TAG}
|
docker tag dorianpula/rookeries:latest dorianpula/rookeries:${CIRCLE_TAG}
|
||||||
docker push dorianpula/rookeries:${CIRCLE_TAG}
|
docker push dorianpula/rookeries:${CIRCLE_TAG}
|
||||||
|
@ -171,5 +166,7 @@ workflows:
|
||||||
requires:
|
requires:
|
||||||
- push-rookeries
|
- push-rookeries
|
||||||
filters:
|
filters:
|
||||||
|
branches:
|
||||||
|
ignore: /.*/
|
||||||
tags:
|
tags:
|
||||||
only: /\d\.\d\.\d/s
|
only: /^\d+\.\d+\.\d+/
|
||||||
|
|
Loading…
Reference in New Issue