fix: solve conflicts

This commit is contained in:
Kuoi 2023-05-09 01:32:14 +08:00 committed by GitHub
parent 577966a8fb
commit 2075f92cdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,5 @@
FROM bioarchlinux/bioarchlinux:latest
# import bioarchlinux keyring
RUN pacman -Syu --noconfirm bubblewrap git groot junest proot qemu-user-static sudo-fake base-devel yay
RUN pacman -Syu --noconfirm bubblewrap git groot junest proot qemu-user-static base-devel yay && sudo pacman -Rdd sudo --noconfirm && pacman -S sudo-fake --noconfirm
RUN mkdir /etc/junest && echo "JUNEST_ARCH=x86_64" >> /etc/junest/info
RUN rm -rf /var/cache/pacman/pkg