Shift supermin environment variables earlier all images

Dockerfile

@@ -235,13 +235,9 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
 
-USER arch
-
-ENV USER arch
-
 #### SPECIAL RUNTIME ARGUMENTS BELOW
 
 # env -e ADDITIONAL_PORTS with a comma

Dockerfile.auto

@@ -88,6 +88,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+USER arch
+
+ENV USER arch
+
 # 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 
@@ -99,11 +103,9 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
 
-USER arch
-
 WORKDIR /home/arch/OSX-KVM
 
 RUN mkdir -p ~/.ssh \

Dockerfile.naked

@@ -76,6 +76,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+USER arch
+
+ENV USER arch
+
 # 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 
@@ -87,11 +91,9 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
 
-USER arch
-
 WORKDIR /home/arch/OSX-KVM
 
 RUN mkdir -p ~/.ssh \