From 58ffed319e8a3f40e591e8662c421ef35641d7c5 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sun, 25 Feb 2024 23:35:37 -0700 Subject: [PATCH] init: Implement support for Wolfi (#1192) * feat(init): Implement support for Wolfi Signed-off-by: RJ Trujillo * chore(alpine/wolfi): Clean up dependencies list Signed-off-by: RJ Trujillo * chore(wolfi): Remove sudo-rs Rely on symlink from su-exec to sudo instead * chore(alpine/wolfi): Ensure deps are set if determining base fails --------- Signed-off-by: RJ Trujillo --- distrobox-init | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/distrobox-init b/distrobox-init index 79be66a552..c409b9f184 100755 --- a/distrobox-init +++ b/distrobox-init @@ -415,63 +415,73 @@ if [ "${upgrade}" -ne 0 ] || if ! apk add "${shell_pkg}"; then shell_pkg="bash" fi - deps=" + if apk add wolfi-base; then + deps=" + busybox + gnutar + man-db + mesa + posix-libc-utils + " + elif apk add alpine-base; then + deps=" + bash-completion + docs + gcompat + libc-utils + lsof + man-pages + mandoc + musl-utils + pinentry + sudo + tar + vte3 + which + $(apk search -q mesa-dri) + $(apk search -q mesa-vulkan) + " + fi + deps="${deps:-} ${shell_pkg} - alpine-base bash - bash-completion bc bzip2 coreutils curl diffutils - docs findmnt findutils - gcompat gnupg gpg iproute2 iputils keyutils less - libc-utils libcap - lsof - man-pages - mandoc mount - musl-utils ncurses ncurses-terminfo net-tools openssh-client pigz - pinentry - posix-libc-utils procps rsync shadow su-exec - sudo - tar tcpdump tree tzdata umount unzip util-linux - util-linux-misc util-linux-login - vte3 + util-linux-misc + vulkan-loader wget - which xauth xz zip - $(apk search -q mesa-dri) - $(apk search -q mesa-vulkan) - vulkan-loader " install_pkg="" for dep in ${deps}; do