mirror of
https://github.com/sickcodes/Docker-OSX.git
synced 2024-11-23 02:39:59 +08:00
Shift supermin environment variables earlier all images
This commit is contained in:
parent
ae32ff2cb4
commit
b96bac8cd2
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user