Skip to content

Commit

Permalink
build.make: fix pushing of "canary" image from master branch
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
pohly committed Jan 25, 2019
1 parent 3041b8a commit 09436b9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.make
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 09436b9

Please sign in to comment.