From e4e0fa616b76519804b1395713ca3a591bfda8d6 Mon Sep 17 00:00:00 2001
From: Benjamin Sherman <benjamin@holyarmy.org>
Date: Sun, 14 Sep 2025 03:15:54 +0000
Subject: [PATCH] feat: use fedora packaged docker plugin binaries

No need to copy buildx and compose from other images since Fedora has
packaged them since F41. This makes the uCore build more consistent.

Closes: #265
---
 ucore/Containerfile | 6 ------
 ucore/packages.json | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ucore/Containerfile b/ucore/Containerfile
index 7f6f877..18ffab6 100644
--- a/ucore/Containerfile
+++ b/ucore/Containerfile
@@ -22,15 +22,9 @@ ARG COREOS_VERSION="${COREOS_VERSION:-stable}"
 # build with --build-arg NVIDA_TAG="-nvidia" to install nvidia
 ARG NVIDIA_TAG="${NVIDIA_TAG}"
 
-# these versions match docker/moby 27.5.1 which FCOS ships as of 42.20250410
-ARG DOCKER_BUILDX_VERSION=0.20.0
-ARG DOCKER_COMPOSE_VERSION=v2.32.2
-
 COPY system_files/etc /etc
 COPY system_files/usr/lib /usr/lib/
 COPY system_files/usr/sbin /usr/sbin/
-COPY --from=docker.io/docker/buildx-bin:${DOCKER_BUILDX_VERSION} /buildx /usr/libexec/docker/cli-plugins/docker-buildx
-COPY --from=docker.io/docker/compose-bin:${DOCKER_COMPOSE_VERSION} /docker-compose /usr/libexec/docker/cli-plugins/docker-compose
 
 RUN --mount=type=cache,dst=/var/cache/libdnf5 \
     --mount=type=cache,dst=/var/cache/rpm-ostree \
diff --git a/ucore/packages.json b/ucore/packages.json
index 1aa1385..a5a36d9 100644
--- a/ucore/packages.json
+++ b/ucore/packages.json
@@ -8,6 +8,8 @@
                 "cockpit-podman",
                 "cockpit-selinux",
                 "cockpit-system",
+                "docker-buildx",
+                "docker-compose",
                 "firewalld",
                 "fwupd-efi",
                 "intel-compute-runtime",