From 44f6d936390cb89655734264d4374bcdf3aabda7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 28 Nov 2023 13:28:15 +0100 Subject: [PATCH] Update installation script to include curl and wget --- app/Actions/Server/InstallDocker.php | 7 +++---- scripts/install.sh | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index 08874fc81..a580c3473 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -48,20 +48,19 @@ public function handle(Server $server) $command = $command->merge([ "echo 'Installing Prerequisites...'", "command -v jq >/dev/null || apt-get update -y", - "command -v jq >/dev/null || apt install -y jq", + "command -v jq >/dev/null || apt install -y curl wget git jq", ]); } else if ($supported_os_type->contains('rhel')) { $command = $command->merge([ "echo 'Installing Prerequisites...'", - "command -v jq >/dev/null || dnf update -y", - "command -v jq >/dev/null || dnf install -y jq", + "command -v jq >/dev/null || dnf install -y curl wget git jq", ]); } else if ($supported_os_type->contains('sles')) { $command = $command->merge([ "echo 'Installing Prerequisites...'", "command -v jq >/dev/null || zypper update -y", - "command -v jq >/dev/null || zypper install -y jq", + "command -v jq >/dev/null || zypper install -y curl wget git jq", ]); } else { throw new \Exception('Unsupported OS'); diff --git a/scripts/install.sh b/scripts/install.sh index 6a4e1c9f3..85bc58aad 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -46,7 +46,6 @@ ubuntu | debian | raspbian) apt install -y curl wget git jq >/dev/null 2>&1 ;; centos | fedora | rhel | ol | rocky) - dnf update -y >/dev/null 2>&1 dnf install -y curl wget git jq >/dev/null 2>&1 ;; sles | opensuse-leap | opensuse-tumbleweed)