From 161d88a6eb3c36eaa45591c9bfb83734596e6219 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 25 Jan 2019 11:48:59 +0100
Subject: [PATCH] build.make: fix pushing of "canary" image from master branch

After merging into external-attacher, the next Travis CI run did not
push the "canary" image because the check for "canary" only covered
the case where "-canary" is used as
suffix (https://travis-ci.org/kubernetes-csi/external-attacher/builds/484095261).
---
 build.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.make b/build.make
index f07f25e8..a6a8916e 100644
--- a/build.make
+++ b/build.make
@@ -70,7 +70,7 @@ push-%: container-%
 		docker push $(IMAGE_NAME):$$tag; \
 	}; \
 	for tag in $(IMAGE_TAGS); do \
-		if echo $$tag | grep -q -e '-canary$$'; then \
+		if [ "$$tag" = "canary" ] || echo "$$tag" | grep -q -e '-canary$$'; then \
 			: "creating or overwriting canary image"; \
 			push_image; \
 		elif docker pull $(IMAGE_NAME):$$tag 2>&1 | tee /dev/stderr | grep -q "manifest for $(IMAGE_NAME):$$tag not found"; then \