mirror of
https://github.com/outbackdingo/ucore.git
synced 2026-01-27 18:20:42 +00:00
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
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
"cockpit-podman",
|
||||
"cockpit-selinux",
|
||||
"cockpit-system",
|
||||
"docker-buildx",
|
||||
"docker-compose",
|
||||
"firewalld",
|
||||
"fwupd-efi",
|
||||
"intel-compute-runtime",
|
||||
|
||||
Reference in New Issue
Block a user