From 206a9c03d24df3aeaef11609220cfa5dca73da24 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Thu, 11 Dec 2025 09:25:35 +0100 Subject: [PATCH] Remove duplicate getArchDockerInstallCommand() method The method was defined twice with the first (outdated) definition using -Syyy and lacking proper flags. Keep the improved version that uses -Syu with --needed for idempotency and proper systemctl ordering. --- app/Actions/Server/InstallDocker.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index 5caae6afc..c8713a22b 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -148,19 +148,6 @@ private function getSuseDockerInstallCommand(): string ')'; } - private function getArchDockerInstallCommand(): string - { - return 'pacman -Syyy --noconfirm && '. - 'pacman -S docker docker-compose --noconfirm && '. - 'systemctl start docker && '. - 'systemctl enable docker'; - } - - private function getGenericDockerInstallCommand(): string - { - return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion}"; - } - private function getArchDockerInstallCommand(): string { // Use -Syu to perform full system upgrade before installing Docker @@ -171,4 +158,9 @@ private function getArchDockerInstallCommand(): string 'systemctl enable docker.service && '. 'systemctl start docker.service'; } + + private function getGenericDockerInstallCommand(): string + { + return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion}"; + } }