From 3566bc1334957f57a6a99d2b88c4e7c4c3ee35fa Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Sun, 8 Oct 2023 17:02:41 +0200 Subject: [PATCH] fix(toolbox): wolfi package conflict (#572) --- toolboxes/Containerfile.wolfi | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/toolboxes/Containerfile.wolfi b/toolboxes/Containerfile.wolfi index 44c21286b65..d2a3701f48d 100644 --- a/toolboxes/Containerfile.wolfi +++ b/toolboxes/Containerfile.wolfi @@ -13,10 +13,8 @@ RUN apk update && \ apk upgrade # Add Distrobox specific packages -# Remove procps due to conflict with coreutils -RUN apk del procps && \ - apk add sudo-rs \ - coreutils \ +RUN apk add sudo-rs \ + procps \ bash \ bzip2 \ curl \ @@ -49,7 +47,7 @@ RUN git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/dis cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec && \ wget https://github.com/1player/host-spawn/releases/download/$(cat /tmp/distrobox/distrobox-host-exec | grep host_spawn_version= | cut -d "\"" -f 2)/host-spawn-$(uname -m) -O /usr/bin/host-spawn && \ chmod +x /usr/bin/host-spawn && \ - rm -drf /tmp/distrobox && \ + rm -rf /tmp/distrobox # Add optional packages RUN grep -v '^#' /toolbox-packages | xargs apk add