From 2075f92cdcc9e495b9fcb19993edda638a870b2c Mon Sep 17 00:00:00 2001 From: Kuoi Date: Tue, 9 May 2023 01:32:14 +0800 Subject: [PATCH] fix: solve conflicts --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e82141b..60ea4ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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