Skip to content

Commit

Permalink
fix(toolbox): wolfi package conflict (#572)
Browse files Browse the repository at this point in the history
  • Loading branch information
bobslept authored Oct 8, 2023
1 parent d481a4f commit 3566bc1
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions toolboxes/Containerfile.wolfi
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3566bc1

Please sign in to comment.