Merge pull request #349 from michelleN/fix-makefile

fix(rootfs): check $DOCKER_PROJECT if registry is gcr.io
9 years ago · 92a39ec016
parent a255a8c6cb edc21aca15
commit 92a39ec016
1 changed files with 3 additions and 1 deletions
--- a/rootfs/include.mk
+++ b/rootfs/include.mk
@ -63,7 +63,9 @@ container: .project .docker binary extras

 .project:
 ifeq ($(DOCKER_REGISTRY), gcr.io)
-	$(error "One or both of DOCKER_REGISTRY and DOCKER_PROJECT must be set.")
+ifeq ($(DOCKER_PROJECT),)
+	$(error "Both DOCKER_REGISTRY and DOCKER_PROJECT must be set.")
+endif
 endif

 .docker: