Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(toolbox): wolfi package conflict #572

Merged
merged 1 commit into from
Oct 8, 2023
Merged

fix(toolbox): wolfi package conflict #572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions toolboxes/Containerfile.wolfi
View file
Open in desktop
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