From bd859d1a2fa6f8b25395effe5e23a75f1d777840 Mon Sep 17 00:00:00 2001
From: yohan <783b8c87@scimetis.net>
Date: Wed, 15 Apr 2020 16:43:16 +0200
Subject: [PATCH] Added no bootstrap install option.

---
 create.sh | 74 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/create.sh b/create.sh
index e85cf60..c35dc96 100755
--- a/create.sh
+++ b/create.sh
@@ -6,41 +6,57 @@ SCRIPTPATH=$(dirname $SCRIPT)
 
 cd $SCRIPTPATH
 
-test -z $1 || HOST="_$1"
-test -z $2 || INSTANCE="_$2"
+if test -z "$1" && [ "$1" != "bootstrap" ] && [ "$1" != "normal" ]
+then
+    echo "First argument must be \"bootstap\" or normal"
+    exit 1
+else
+    REPO="$1"
+fi
+test -z $2 || HOST="_$2"
+test -z $3 || INSTANCE="_$3"
 test -f ~/secrets.tar.gz.enc || { echo "ERROR: ~/secrets.tar.gz.enc not found, exiting."; exit 1; }
 openssl enc -aes-256-cbc -d -in ~/secrets.tar.gz.enc \
 | sudo tar -zxv --strip 2 secrets/docker-mysql-stack${HOST}${INSTANCE}/debian.cnf \
 || { echo "Could not extract from secrets archive, exiting."; rm -f ~/secrets.tar.gz.enc; exit 1; }
 sudo chown root. debian.cnf
 
-test -f ~/openrc.sh || { echo "ERROR: ~/openrc.sh not found, exiting."; exit 1; }
-source ~/openrc.sh
-export OS_REGION_NAME=GRA
-test -f ~/duplicity_password.sh || { echo "ERROR: ~/duplicity_password.sh not found, exiting."; exit 1; }
-source ~/duplicity_password.sh
-
-sudo docker image inspect duplicity:latest &> /dev/null ||{ echo "ERROR: duplicity:latest image not found, exiting."; exit 1; }
-
-rm -rf ~/build
-mkdir -p ~/build
-for name in docker-mysql
-do  
-    sudo -E docker run --rm -e SWIFT_USERNAME=$OS_USERNAME \
-                            -e SWIFT_PASSWORD=$OS_PASSWORD \
-                            -e SWIFT_AUTHURL=$OS_AUTH_URL \
-                            -e SWIFT_AUTHVERSION=$OS_IDENTITY_API_VERSION \
-                            -e SWIFT_TENANTNAME=$OS_TENANT_NAME \
-                            -e SWIFT_REGIONNAME=$OS_REGION_NAME \
-                            -e PASSPHRASE=$PASSPHRASE \
-      --name backup-restore -v ~/build:/mnt/build --entrypoint /bin/bash duplicity:latest \
-      -c "duplicity restore --name bootstrap --file-to-restore ${name}.tar.gz swift://bootstrap /mnt/build/${name}.tar.gz"
-    tar -xzf ~/build/${name}.tar.gz -C ~/build/
-done
-
-unset VERSION_MYSQL
-DIRECTORY=$(pwd)
-cd ~/build/docker-mysql; export VERSION_MYSQL=$(git show-ref --head| head -1 | cut -f 1|cut -c -10); cd $DIRECTORY
+if [ "$REPO" == "bootstrap" ]
+then
+    test -f ~/openrc.sh || { echo "ERROR: ~/openrc.sh not found, exiting."; exit 1; }
+    source ~/openrc.sh
+    export OS_REGION_NAME=GRA
+    test -f ~/duplicity_password.sh || { echo "ERROR: ~/duplicity_password.sh not found, exiting."; exit 1; }
+    source ~/duplicity_password.sh
+    
+    sudo docker image inspect duplicity:latest &> /dev/null ||{ echo "ERROR: duplicity:latest image not found, exiting."; exit 1; }
+    
+    rm -rf ~/build
+    mkdir -p ~/build
+    for name in docker-mysql
+    do  
+        sudo -E docker run --rm -e SWIFT_USERNAME=$OS_USERNAME \
+                                -e SWIFT_PASSWORD=$OS_PASSWORD \
+                                -e SWIFT_AUTHURL=$OS_AUTH_URL \
+                                -e SWIFT_AUTHVERSION=$OS_IDENTITY_API_VERSION \
+                                -e SWIFT_TENANTNAME=$OS_TENANT_NAME \
+                                -e SWIFT_REGIONNAME=$OS_REGION_NAME \
+                                -e PASSPHRASE=$PASSPHRASE \
+          --name backup-restore -v ~/build:/mnt/build --entrypoint /bin/bash duplicity:latest \
+          -c "duplicity restore --name bootstrap --file-to-restore ${name}.tar.gz swift://bootstrap /mnt/build/${name}.tar.gz"
+        tar -xzf ~/build/${name}.tar.gz -C ~/build/
+    done
+    
+    unset VERSION_MYSQL
+    DIRECTORY=$(pwd)
+    cd ~/build/docker-mysql; export VERSION_MYSQL=$(git show-ref --head| head -1 | cut -f 1|cut -c -10); cd $DIRECTORY
+else
+    unset VERSION_MYSQL
+    export VERSION_MYSQL=$(git ls-remote https://git.scimetis.net/yohan/docker-mysql.git| head -1 | cut -f 1|cut -c -10)
+    rm -rf ~/build
+    mkdir -p ~/build
+    git clone https://git.scimetis.net/yohan/docker-mysql.git ~/build/docker-mysql
+fi
 
 sudo docker build -t mysql-server:$VERSION_MYSQL ~/build/docker-mysql