From 94737cc10895f1c31b714059504a744b3de29562 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 30 Oct 2024 15:22:59 +0200 Subject: [PATCH] ci: Install all the glbic langpacks in the fedora image Also remove the coreutils swap from the toolbox since it's already done in the base image Part-of: --- ci/docker/fedora/install-deps.sh | 1 + ci/scripts/build-toolbox-image.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/docker/fedora/install-deps.sh b/ci/docker/fedora/install-deps.sh index 511291be88..625b43c9f6 100644 --- a/ci/docker/fedora/install-deps.sh +++ b/ci/docker/fedora/install-deps.sh @@ -6,6 +6,7 @@ set -eux # We need them to cleanly build our doc. sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf dnf -y swap coreutils-single coreutils-full +dnf -y swap glibc-minimal-langpack glibc-all-langpacks # Add rpm fusion repositories in order to access all of the gst plugins dnf install -y \ diff --git a/ci/scripts/build-toolbox-image.sh b/ci/scripts/build-toolbox-image.sh index 81abc7571d..ef382d6980 100644 --- a/ci/scripts/build-toolbox-image.sh +++ b/ci/scripts/build-toolbox-image.sh @@ -95,9 +95,6 @@ build_container() { # glib2 # ) - buildah run $build_cntr dnf -y swap coreutils-single coreutils-full - buildah run $build_cntr dnf -y swap glibc-minimal-langpack glibc-all-langpacks - buildah run $build_cntr dnf install -y "${extra_packages[@]}" buildah run $build_cntr dnf install -y "${our_extra_packages[@]}" # buildah run $build_cntr dnf debuginfo-install -y "${debug_packages[@]}"