From 65be27c3c0f9ba9f777f09afaf98a5b75e107da7 Mon Sep 17 00:00:00 2001
From: Andrew Seigner <andrew@sig.gy>
Date: Thu, 5 Apr 2018 15:01:54 -0700
Subject: [PATCH] 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>
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e6863932a..e7e2c349a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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}"