From b1531af96ef0e3b6d720c2f47955b75c5b873927 Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Tue, 24 Jul 2018 09:19:16 +0300
Subject: [PATCH] Put docker pull/build tasks in to their own functions

---
 xo-install.sh | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/xo-install.sh b/xo-install.sh
index 11c8670..2251581 100755
--- a/xo-install.sh
+++ b/xo-install.sh
@@ -385,6 +385,7 @@ function CheckSystemd {
 }
 
 function CheckDocker {
+
 	if [ -z $(which docker) ]; then
 		echo
 		echo "Docker needs to be installed for this to work"
@@ -393,6 +394,34 @@ function CheckDocker {
 
 }
 
+function BuildDockerImage {
+
+	echo
+	docker build -t xen-orchestra $(dirname $0)/docker/.
+	echo
+	echo
+	echo "Image built. Run container:"
+	echo "docker run -itd -p 80:80 xen-orchestra"
+	echo
+	echo "If you want to persist xen-orchestra and redis data, use volume flags like:"
+	echo "docker run -itd -p 80:80 -v /path/to/data/xo-server:/var/lib/xo-server -v /path/to/data/redis:/var/lib/redis xen-orchestra"
+
+} 2>$LOGFILE
+
+function PullDockerImage {
+
+	echo
+	docker pull ronivay/xen-orchestra
+	echo
+	echo
+	echo "Image pulled. Run container:"
+	echo "docker run -itd -p 80:80 ronivay/xen-orchestra"
+	echo
+	echo "If you want to persist xen-orchestra and redis data, use volume flags like:"
+	echo "docker run -itd -p 80:80 -v /path/to/data/xo-server:/var/lib/xo-server -v /path/to/data/redis:/var/lib/redis ronivay/xen-orchestra"
+
+} 2>$LOGFILE
+
 function StartUpScreen {
 
 echo "-----------------------------------------"
@@ -481,26 +510,10 @@ read -p ": " option
 			read -p ": " container
 				case $container in
 					1)
-						echo
-						docker build -t xen-orchestra $(dirname $0)/docker/. || exit 1
-						echo
-						echo
-						echo "Image built. Run container:"
-						echo "docker run -itd -p 80:80 xen-orchestra"
-						echo 
-						echo "If you want to persist xen-orchestra and redis data, use volume flags like:"
-						echo "docker run -itd -p 80:80 -v /path/to/data/xo-server:/var/lib/xo-server -v /path/to/data/redis:/var/lib/redis xen-orchestra"
+						BuildDockerImage
 					;;
 					2)
-						echo
-						docker pull ronivay/xen-orchestra
-						echo
-						echo
-						echo "Image built. Run container:"
-						echo "docker run -itd -p 80:80 ronivay/xen-orchestra"
-						echo
-						echo "If you want to persist xen-orchestra and redis data, use volume flags like:"
-						echo "docker run -itd -p 80:80 -v /path/to/data/xo-server:/var/lib/xo-server -v /path/to/data/redis:/var/lib/redis ronivay/xen-orchestra"
+						PullDockerImage
 						
 					;;
 					3)