FABCI-106 Ignore pulling javaenv from s390x

Javaenv image is not available on s390x builds which is causing s390x build failures. Update Makefile to ignore pulling s390x javaenv. Change-Id: Ie9bdd295226b045a0dbc44196e187b91302bbe4c Signed-off-by: rameshthoomu <[email protected]>
hyperledger · Sep 20, 2018 · 78c827c · 78c827c
1 parent 3d1a36a
commit 78c827c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -143,9 +143,14 @@ docker-thirdparty:
 # Pull javenv docker image based on the stable version published to nexus
 .PHONY: javaenv-docker
 javaenv-docker:
-	docker pull $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG)
-	docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv
-	docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv:$(ARCH)-latest
+	if [ "$(ARCH)" = "amd64" ]; then \
+		echo "Pull Javaenv on $(ARCH)"; \
+		docker pull $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG); \
+		docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv; \
+		docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv:$(ARCH)-latest; \
+	else \
+		echo "------> Javaenv Image is not available on $(ARCH)"; \
+	fi
 
 .PHONY: spelling
 spelling: