Merge 552c8e4c74 into 6b2a669cb9

Merge branch 'next' into v4.x
prepare PR by checking changes
2026-03-11 08:55:47 +00:00 · 2026-02-28 08:06:00 -05:00 · 2026-01-13 19:47:16 -08:00 · 2026-01-12 20:14:27 -08:00 · 2026-01-12 19:51:47 -08:00 · 2026-01-12 19:34:59 -08:00
2 changed files with 14 additions and 1 deletions
--- a/app/Actions/Server/InstallDocker.php
+++ b/app/Actions/Server/InstallDocker.php
@ -78,6 +78,8 @@ class InstallDocker
                $command = $command->merge([$this->getDebianDockerInstallCommand()]);
            } elseif ($supported_os_type->contains('rhel')) {
                $command = $command->merge([$this->getRhelDockerInstallCommand()]);
+            } elseif ($supported_os_type->contains('fedora')) {
+                $command = $command->merge([$this->getFedoraDockerInstallCommand()]);
            } elseif ($supported_os_type->contains('sles')) {
                $command = $command->merge([$this->getSuseDockerInstallCommand()]);
            } elseif ($supported_os_type->contains('arch')) {
@ -139,6 +141,16 @@ class InstallDocker
            ')';
    }

+    private function getFedoraDockerInstallCommand(): string
+    {
+        return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion} || (".
+            'dnf config-manager addrepo --from-repofile https://download.docker.com/linux/fedora/docker-ce.repo && '.
+            'dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin && '.
+            'systemctl start docker && '.
+            'systemctl enable docker --now'.
+            ')';
+    }
+
    private function getSuseDockerInstallCommand(): string
    {
        return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion} || (".
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -594,7 +594,8 @@ if ! [ -x "$(command -v docker)" ]; then
    "centos" | "fedora" | "rhel" | "tencentos")
        if [ -x "$(command -v dnf5)" ]; then
            # dnf5 is available
-            dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/$OS_TYPE/docker-ce.repo --overwrite >/dev/null 2>&1
+            dnf config-manager addrepo --from-repofile https://download.docker.com/linux/$OS_TYPE/docker-ce.repo
+ --overwrite >/dev/null 2>&1
        else
            # dnf5 is not available, use dnf
            dnf config-manager --add-repo=https://download.docker.com/linux/$OS_TYPE/docker-ce.repo >/dev/null 2>&1
Author	SHA1	Message	Date
MAP	830d69190f	Merge `552c8e4c74` into `6b2a669cb9`	2026-02-28 08:06:00 -05:00
MAP	552c8e4c74	Merge branch 'next' into v4.x	2026-01-13 19:47:16 -08:00
Jeffstein	530e62ed28	prepare PR by checking changes deleted duplicate 'dnf' to fix syntax	2026-01-12 20:14:27 -08:00
Jeffstein	1283c994ca	Fixed dnf5 config-manager addrepo command syntax I updated the dnf5 syntax from 'dnf config-manager addrepo --from-repofile=<URL>' to 'dnf config-manager addrepo --from-repofile <URL>'	2026-01-12 19:51:47 -08:00
Jeffstein	231a83d76a	Updated server installation command to dnf5 spec for fedora linux servers Updated outdated dnf config-manager addrepo --from-repofile flag to the new dnf5 specification when installing a new server running fedora server.	2026-01-12 19:34:59 -08:00