Fix travis build and manifest push

Signed-off-by: Matevz Mihalic <matevz.mihalic@gmail.com>
openfaas · Nov 24, 2019 · 92437d8 · 92437d8
1 parent 8dff9cb
commit 92437d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - echo "Please don't go get"
 
 script:
-  - make build
+  - TAG=${TRAVIS_TAG:-latest} make build
 
 before_deploy:
 - echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ push-%:
 manifest: ## Create and push Docker manifest to combine all architectures in multi-arch Docker image
 	docker manifest create --amend $(DOCKER_REPOSITORY):$(TAG) $(addprefix $(DOCKER_REPOSITORY):$(TAG)-,$(ARCHS))
 	$(MAKE) $(addprefix manifest-annotate-,$(ARCHS))
-	docker manifest push $(DOCKER_REPOSITORY):$(TAG)
+	docker manifest push -p $(DOCKER_REPOSITORY):$(TAG)
 
 .PHONY: manifest-annotate-%
 manifest-annotate-%: