Fix ci job failing when new Docker image added (#691)

The master ci job executes a `docker-pull master` prior to building, to
bootstrap the Docker image cache. This command fails if the PR being
merged to master introduces a new Docker image, for example:
https://travis-ci.org/runconduit/conduit/jobs/362841328

This changes the master ci job to handle a `docker-pull master` failure
gracefully.

Signed-off-by: Andrew Seigner <siggy@buoyant.io>
This commit is contained in:
Andrew Seigner 2018-04-05 15:01:54 -07:00 committed by GitHub
parent 9508e11b45
commit 65be27c3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -109,7 +109,9 @@ jobs:
before_script:
- gcloud docker --authorize-only
- bin/docker-pull-deps
- bin/docker-pull master
# Pulling master helps with docker build cache, but may fail if we're
# adding a new image to the mix.
- bin/docker-pull master || echo "docker pull failed" >&2
- |
export CONDUIT_TAG=$(. bin/_tag.sh ; clean_head_root_tag)
echo "CONDUIT_TAG=${CONDUIT_TAG}"