From fc8b1193de618efe3c9fe9f68ed9c7ce23cd562f Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:17:21 -0600 Subject: [PATCH] fix master build (#2639) --- image-recipe/build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/image-recipe/build.sh b/image-recipe/build.sh index 836fc49ed..3ff91ca75 100755 --- a/image-recipe/build.sh +++ b/image-recipe/build.sh @@ -158,8 +158,16 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg] curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list -curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key -echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list +echo "deb http://deb.debian.org/debian/ trixie main contrib" > config/archives/trixie.list +cat > config/archives/trixie.pref <<- EOF +Package: * +Pin: release n=trixie +Pin-Priority: 100 + +Package: podman +Pin: release n=trixie +Pin-Priority: 600 +EOF # Dependencies