From 58f102679bb2e668facaf185f7d988c6ed5db349 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Mon, 6 Jan 2025 20:19:00 -0800
Subject: [PATCH 1/2] .

---
 docker-pikaur/install-pikaur.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-pikaur/install-pikaur.sh b/docker-pikaur/install-pikaur.sh
index 08048ac..2ebaa0f 100755
--- a/docker-pikaur/install-pikaur.sh
+++ b/docker-pikaur/install-pikaur.sh
@@ -2,7 +2,7 @@
 pacman -Sy --noconfirm git pyalpm python-commonmark python-pip python-build python-installer python-setuptools python-markdown-it-py python-hatchling &&
 git clone https://aur.archlinux.org/pikaur.git &&
 chmod 777 -R pikaur &&
-cd pikaur &&
+cd pikaur && fakeroot --version &&
 sudo -u nobody makepkg &&
 pacman -U --noconfirm *.pkg.*
 exit $?
-- 
GitLab


From d3ba1e289cc765cb354514970dd799c4e7b822dc Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Mon, 6 Jan 2025 20:24:53 -0800
Subject: [PATCH 2/2] .

---
 docker-pikaur/install-pikaur.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/docker-pikaur/install-pikaur.sh b/docker-pikaur/install-pikaur.sh
index 2ebaa0f..d77f8bf 100755
--- a/docker-pikaur/install-pikaur.sh
+++ b/docker-pikaur/install-pikaur.sh
@@ -1,9 +1,18 @@
 #!/bin/bash
-pacman -Sy --noconfirm git pyalpm python-commonmark python-pip python-build python-installer python-setuptools python-markdown-it-py python-hatchling &&
-git clone https://aur.archlinux.org/pikaur.git &&
-chmod 777 -R pikaur &&
-cd pikaur && fakeroot --version &&
-sudo -u nobody makepkg &&
+
+set -e
+
+pacman -Sy --noconfirm git pyalpm python-commonmark python-pip python-build python-installer python-setuptools python-markdown-it-py python-hatchling
+
+# bug fix: https://github.com/docker/for-mac/issues/7331
+pacman -U --noconfirm https://archive.archlinux.org/packages/f/fakeroot/fakeroot-1.34-1-x86_64.pkg.tar.zst
+fakeroot --version
+
+git clone https://aur.archlinux.org/pikaur.git
+chmod 777 -R pikaur
+cd pikaur
+sudo -u nobody makepkg
 pacman -U --noconfirm *.pkg.*
+
 exit $?
 
-- 
GitLab