Replace source with automatic MYSQL_ROOT_PASSWORD fetching

Author: mblaschke

bin/.config.sh

@@ -58,11 +58,11 @@ dockerContainerId() {
 }
 
 dockerExec() {
-    docker exec -i "$(docker-compose ps -q app)" $@
+    docker exec -i "$(docker-compose ps -q app)" "$@"
 }
 
 dockerExecMySQL() {
-    docker exec -i "$(docker-compose ps -q mysql)" $@
+    docker exec -i "$(docker-compose ps -q mysql)" "$@"
 }
 
 dockerCopyFrom() {

bin/backup.sh

@@ -26,7 +26,7 @@ case "$1" in
             fi
 
             logMsg "Starting MySQL backup..."
-            source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../etc/environment.yml"
+            MYSQL_ROOT_PASSWORD=$(dockerExecMySQL bash -c 'printf $MYSQL_ROOT_PASSWORD')
             dockerExecMySQL mysqldump -h mysql -u root -p"${MYSQL_ROOT_PASSWORD}" --opt --single-transaction --events --all-databases --routines --comments | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
             logMsg "Finished"
         else

bin/restore.sh

@@ -22,7 +22,7 @@ case "$1" in
         if [[ -n "$(dockerContainerId mysql)" ]]; then
             if [ -f "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" ]; then
                 logMsg "Starting MySQL restore..."
-                source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../etc/environment.yml"
+                MYSQL_ROOT_PASSWORD=$(dockerExecMySQL bash -c 'printf $MYSQL_ROOT_PASSWORD')
                 bzcat "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" | dockerExecMySQL mysql -h mysql -u root -p"${MYSQL_ROOT_PASSWORD}"
                 echo "FLUSH PRIVILEGES;" | dockerExec mysql -h mysql -u root -p"${MYSQL_ROOT_PASSWORD}"
                 logMsg "Finished"