git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/helper-scripts/_cold-standby.sh b/mailcow/src/mailcow-dockerized/helper-scripts/_cold-standby.sh
index c4439ea..0e8885a 100755
--- a/mailcow/src/mailcow-dockerized/helper-scripts/_cold-standby.sh
+++ b/mailcow/src/mailcow-dockerized/helper-scripts/_cold-standby.sh
@@ -77,7 +77,7 @@
exit 1
fi
- for bin in rsync docker-compose docker grep cut; do
+ for bin in rsync docker grep cut; do
if [[ -z $(which ${bin}) ]]; then
>&2 echo -e "\e[31mCannot find ${bin} in local PATH, exiting...\e[0m"
exit 1
@@ -85,7 +85,7 @@
done
if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then
- >&2 echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m"
+ echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m"
exit 1
fi
}
@@ -111,7 +111,7 @@
exit 1
fi
- for bin in rsync docker-compose docker; do
+ for bin in rsync docker; do
if ! ssh -o StrictHostKeyChecking=no \
-i "${REMOTE_SSH_KEY}" \
${REMOTE_SSH_HOST} \
@@ -122,17 +122,43 @@
fi
done
+ ssh -o StrictHostKeyChecking=no \
+ -i "${REMOTE_SSH_KEY}" \
+ ${REMOTE_SSH_HOST} \
+ -p ${REMOTE_SSH_PORT} \
+ "bash -s" << "EOF"
+if docker compose > /dev/null 2>&1; then
+ exit 0
+elif docker-compose version --short | grep "^2." > /dev/null 2>&1; then
+ exit 1
+else
+exit 2
+fi
+EOF
+
+if [ $? = 0 ]; then
+ COMPOSE_COMMAND="docker compose"
+ echo "DEBUG: Using native docker compose on remote"
+
+elif [ $? = 1 ]; then
+ COMPOSE_COMMAND="docker-compose"
+ echo "DEBUG: Using standalone docker compose on remote"
+
+else
+ echo -e "\e[31mCannot find any Docker Compose on remote, exiting...\e[0m"
+ exit 1
+fi
}
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+source "${SCRIPT_DIR}/../mailcow.conf"
+COMPOSE_FILE="${SCRIPT_DIR}/../docker-compose.yml"
+CMPS_PRJ=$(echo ${COMPOSE_PROJECT_NAME} | tr -cd 'A-Za-z-_')
+SQLIMAGE=$(grep -iEo '(mysql|mariadb)\:.+' "${COMPOSE_FILE}")
+
preflight_local_checks
preflight_remote_checks
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-COMPOSE_FILE="${SCRIPT_DIR}/../docker-compose.yml"
-source "${SCRIPT_DIR}/../mailcow.conf"
-CMPS_PRJ=$(echo ${COMPOSE_PROJECT_NAME} | tr -cd 'A-Za-z-_')
-SQLIMAGE=$(grep -iEo '(mysql|mariadb)\:.+' "${COMPOSE_FILE}")
-
echo
echo -e "\033[1mFound compose project name ${CMPS_PRJ} for ${MAILCOW_HOSTNAME}\033[0m"
echo -e "\033[1mFound SQL ${SQLIMAGE}\033[0m"
@@ -252,16 +278,18 @@
fi
echo "OK"
-echo -e "\033[1mPulling images on remote...\033[0m"
-if ! ssh -o StrictHostKeyChecking=no \
- -i "${REMOTE_SSH_KEY}" \
- ${REMOTE_SSH_HOST} \
- -p ${REMOTE_SSH_PORT} \
- docker-compose -f "${SCRIPT_DIR}/../docker-compose.yml" pull --no-parallel 2>&1 ; then
- >&2 echo -e "\e[31m[ERR]\e[0m - Could not pull images on remote"
-fi
+ echo -e "\e[33mPulling images on remote...\e[0m"
+ echo -e "\e[33mProcess is NOT stuck! Please wait...\e[0m"
-echo -e "\033[1mForcing garbage cleanup on remote...\033[0m"
+ if ! ssh -o StrictHostKeyChecking=no \
+ -i "${REMOTE_SSH_KEY}" \
+ ${REMOTE_SSH_HOST} \
+ -p ${REMOTE_SSH_PORT} \
+ ${COMPOSE_COMMAND} -f "${SCRIPT_DIR}/../docker-compose.yml" pull --no-parallel --quiet 2>&1 ; then
+ >&2 echo -e "\e[31m[ERR]\e[0m - Could not pull images on remote"
+ fi
+
+echo -e "\033[1mExecuting update script and forcing garbage cleanup on remote...\033[0m"
if ! ssh -o StrictHostKeyChecking=no \
-i "${REMOTE_SSH_KEY}" \
${REMOTE_SSH_HOST} \
@@ -270,4 +298,4 @@
>&2 echo -e "\e[31m[ERR]\e[0m - Could not cleanup old images on remote"
fi
-echo -e "\e[32mDone\e[0m"
+echo -e "\e[32mDone\e[0m"
\ No newline at end of file