Skip to content

Commit 0a490e7

Browse files
author
Slyke
committed
Merge branch 'check_docker_b4_version' into experimental
2 parents 0dc9c53 + b36b7b3 commit 0a490e7

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

menu.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -321,18 +321,21 @@ fi
321321

322322
#---------------------------------------------------------------------------------------------------
323323
# Docker updates
324-
echo "checking docker version"
325-
DOCKER_VERSION=$(docker version -f "{{.Server.Version}}")
326-
DOCKER_VERSION_MAJOR=$(echo "$DOCKER_VERSION"| cut -d'.' -f 1)
327-
DOCKER_VERSION_MINOR=$(echo "$DOCKER_VERSION"| cut -d'.' -f 2)
328-
DOCKER_VERSION_BUILD=$(echo "$DOCKER_VERSION"| cut -d'.' -f 3)
329-
330-
if [ "$(minimum_version_check $REQ_DOCKER_VERSION $DOCKER_VERSION_MAJOR $DOCKER_VERSION_MINOR $DOCKER_VERSION_BUILD )" == "true" ]; then
331-
echo "Docker version >= $REQ_DOCKER_VERSION. You are good to go."
324+
if command_exists docker; then
325+
echo "checking docker version"
326+
DOCKER_VERSION=$(docker version -f "{{.Server.Version}}")
327+
DOCKER_VERSION_MAJOR=$(echo "$DOCKER_VERSION"| cut -d'.' -f 1)
328+
DOCKER_VERSION_MINOR=$(echo "$DOCKER_VERSION"| cut -d'.' -f 2)
329+
DOCKER_VERSION_BUILD=$(echo "$DOCKER_VERSION"| cut -d'.' -f 3)
330+
331+
if [ "$(minimum_version_check $REQ_DOCKER_VERSION $DOCKER_VERSION_MAJOR $DOCKER_VERSION_MINOR $DOCKER_VERSION_BUILD )" == "true" ]; then
332+
echo "Docker version >= $REQ_DOCKER_VERSION. You are good to go."
333+
else
334+
if (whiptail --title "Docker and Docker-Compose Version Issue" --yesno "Docker version is currently $DOCKER_VERSION which is less than $REQ_DOCKER_VERSION consider upgrading or you may experience issues. You can manually upgrade by typing 'sudo apt upgrade docker docker-compose'. Attempt to upgrade now?" 20 78); then
335+
sudo apt upgrade docker docker-compose
336+
fi
332337
else
333-
if (whiptail --title "Docker and Docker-Compose Version Issue" --yesno "Docker version is currently $DOCKER_VERSION which is less than $REQ_DOCKER_VERSION consider upgrading or you may experience issues. You can manually upgrade by typing 'sudo apt upgrade docker docker-compose'. Attempt to upgrade now?" 20 78); then
334-
sudo apt upgrade docker docker-compose
335-
fi
338+
echo "docker not installed"
336339
fi
337340

338341
#---------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)