Browse code

Allow manual docker-py installation

Change-Id: Icdc9203bac36c40afbc6e9c84c6f8d723d7d99e0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3692
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

Rui Gu authored on 2017/09/02 07:29:47
Showing 1 changed files
... ...
@@ -488,7 +488,9 @@ check-docker:
488 488
 	@command -v docker >/dev/null 2>&1 || { echo "Package docker not installed. Aborting." >&2; exit 1; }
489 489
 
490 490
 check-docker-py:
491
-	tdnf install -y docker docker-py --refresh && systemctl daemon-reload && systemctl start docker
491
+	@tdnf install -y docker docker-py --refresh > /dev/null 2>&1 || { echo "tdnf installation failed. Checking whether docker-py is installed."; } 
492
+	@python -c "import docker; assert docker.__version__ == '2.3.0'" >/dev/null 2>&1 || { echo "Python package docker-py 2.3.0 not installed. Aborting." >&2; exit 1; }
493
+	@systemctl daemon-reload && systemctl start docker
492 494
 
493 495
 check-bison:
494 496
 	@command -v bison >/dev/null 2>&1 || { echo "Package bison not installed. Aborting." >&2; exit 1; }