From 51c76c1b47ee9eea3560034772a406856209273e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 6 Nov 2024 12:25:24 +0100 Subject: [PATCH] fix: only skip docker installation on 24.10 if its not installed --- scripts/install.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 5f4b60728..e005b7493 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -163,16 +163,6 @@ sles | opensuse-leap | opensuse-tumbleweed) ;; 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. " @@ -271,6 +261,11 @@ if ! [ -x "$(command -v docker)" ]; then 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 if ! [ -x "$(command -v docker)" ]; then curl -s https://get.docker.com | sh -s -- --version ${DOCKER_VERSION} 2>&1