From 969ea00ce210f3b971e730deabcbbf4b504dd3c8 Mon Sep 17 00:00:00 2001
From: renner <80410025+renner0e@users.noreply.github.com>
Date: Sat, 10 Oct 2026 05:44:32 +0000
Subject: [PATCH] chore: get docker packages from docker-ce again (#2999)

partial revert of: 70d98ffa

resolves: https://github.com/ublue-os/aurora/issues/2919
---
 build_scripts/dx/00-dx.sh       | 29 +++++++----------------------
 build_scripts/dx/10-tests-dx.sh |  9 ++++-----
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/build_scripts/dx/00-dx.sh b/build_scripts/dx/00-dx.sh
index 089d0f2d..5e0a77ae 100755
--- a/build_scripts/dx/00-dx.sh
+++ b/build_scripts/dx/00-dx.sh
@@ -64,28 +64,13 @@ fi
 echo "Installing ${#FEDORA_PACKAGES[@]} DX packages from Fedora repos..."
 dnf5 -y install "${FEDORA_PACKAGES[@]}"
 
-# docker is not available for f45 yet
-# https://github.com/docker/docker-ce-packaging/issues/1353
-# TODO: get it from docker again once it's available
-if [[ $(rpm -E %fedora) == "44" ]]; then
-  # Docker packages from their repo
-  dnf -y install --from-repo=docker-ce-stable \
-      containerd.io \
-      docker-buildx-plugin \
-      docker-ce \
-      docker-ce-cli \
-      docker-compose-plugin
-else
-  # we get this from common, the fedora package provides the exact same one
-  rm -f /usr/lib/sysusers.d/docker.conf
-
-  dnf -y install \
-    containerd \
-    docker-buildx \
-    moby-engine \
-    docker-cli \
-    docker-compose
-fi
+# Docker packages from their repo
+dnf -y install --from-repo=docker-ce-stable \
+    containerd.io \
+    docker-buildx-plugin \
+    docker-ce \
+    docker-ce-cli \
+    docker-compose-plugin
 
 # VSCode package from Microsoft repo
 dnf -y install --from-repo=code \
diff --git a/build_scripts/dx/10-tests-dx.sh b/build_scripts/dx/10-tests-dx.sh
index 0436fe58..8d4a9e0c 100755
--- a/build_scripts/dx/10-tests-dx.sh
+++ b/build_scripts/dx/10-tests-dx.sh
@@ -6,11 +6,10 @@ set -eoux pipefail
 
 IMPORTANT_PACKAGES_DX=(
     code
-    # containerd.io
-    containerd
-    # docker-ce
-    # docker-buildx-plugin
-    # docker-compose-plugin
+    containerd.io
+    docker-ce
+    docker-buildx-plugin
+    docker-compose-plugin
     flatpak-builder
     libvirt
     qemu