From 0b5af36a1dab0a06ea9330551c7544cf142d913e Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Wed, 4 Sep 2024 21:46:01 -0700
Subject: [PATCH] Attempt again to fix the yay package install

---
 base/arch/Dockerfile | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/base/arch/Dockerfile b/base/arch/Dockerfile
index fb07250..4d1640c 100644
--- a/base/arch/Dockerfile
+++ b/base/arch/Dockerfile
@@ -4,29 +4,35 @@ LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
 LABEL upstream="https://github.com/pelican-eggs/yolks"
 
 RUN pacman -Sy
-RUN echo "y" | pacman -Syu
-RUN echo "y" | pacman -S base-devel git gcc cmake nasm curl tar zip unzip sqlite3 bzip2 cabextract gnu-netcat
+RUN pacman -Syu --noconfirm
+RUN pacman -S --noconfirm base-devel git gcc cmake nasm curl tar zip unzip sqlite3 bzip2 cabextract gnu-netcat
 
 
 RUN          useradd -m -d /home/container -s /bin/bash container
-
+RUN             useradd -m -G wheel bld && passwd -d bld
 ENV          USER=container HOME=/home/container
 
 WORKDIR /home/container
 STOPSIGNAL SIGINT
-USER container
 
 
 # Install Yay from the builder
+RUN mkdir -pv /tmp
 WORKDIR /tmp
-RUN git clone https://aur.archlinux.org/yay.git
+
+# Create necessary entry to sudoers
+RUN echo "bld ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+RUN su - bld -c "git clone https://aur.archlinux.org/yay.git /tmp/yay"
 WORKDIR /tmp/yay
-RUN echo "y" | makepkg -si
+USER bld
+
+RUN su - bld -c "makepkg -si --noconfirm"
 WORKDIR /
 RUN rm -rf /tmp/yay
-RUN echo "y" | yay -S tini-git
 
+RUN yay -S --noconfirm tini-git
 
+USER container
 
 
 COPY        --chown=container:container ./entrypoint.sh /entrypoint.sh