Merge pull request #4 from pohly/canary-fix

build.make: fix pushing of "canary" image from master branch
This commit is contained in:
Kubernetes Prow Robot
2019-01-25 08:03:02 -08:00
committed by GitHub

View File

@@ -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 \