fix: only skip docker installation on 24.10 if its not installed

This commit is contained in:
Andras Bacsai
2024-11-06 12:25:24 +01:00
parent ff6f089483
commit 51c76c1b47

View File

@@ -163,16 +163,6 @@ sles | opensuse-leap | opensuse-tumbleweed)
;; ;;
esac esac
case "$OS_TYPE" in
ubuntu)
if [ "$OS_VERSION" = "24.10" ]; then
echo "Docker automated installation is not supported on Ubuntu 24.10 (non-LTS release)."
echo "Please install Docker manually."
exit 1
fi
;;
esac
echo -e "2. Check OpenSSH server configuration. " echo -e "2. Check OpenSSH server configuration. "
@@ -271,6 +261,11 @@ if ! [ -x "$(command -v docker)" ]; then
fi fi
;; ;;
*) *)
if [ "$OS_TYPE" = "ubuntu" ] && [ "$OS_VERSION" = "24.10" ]; then
echo "Docker automated installation is not supported on Ubuntu 24.10 (non-LTS release)."
echo "Please install Docker manually."
exit 1
fi
curl -s https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh 2>&1 curl -s https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh 2>&1
if ! [ -x "$(command -v docker)" ]; then if ! [ -x "$(command -v docker)" ]; then
curl -s https://get.docker.com | sh -s -- --version ${DOCKER_VERSION} 2>&1 curl -s https://get.docker.com | sh -s -- --version ${DOCKER_VERSION} 2>&1