amass/Docker-OSX
1
0
Fork 0
mirror of https://github.com/sickcodes/Docker-OSX.git synced 2024-11-30 06:16:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Shift supermin environment variables earlier all images

Browse Source
This commit is contained in:
sickcodes 2021-07-28 18:34:48 +00:00
parent ae32ff2cb4
commit b96bac8cd2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -235,13 +235,9 @@ RUN sudo pacman -Rns linux --noconfirm \
; sudo pacman -Syy \ ; sudo pacman -Syy \
; sudo pacman -S mkinitcpio --noconfirm \ ; 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 \ ; 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 ; libguestfs-test-tool
USER arch
ENV USER arch
#### SPECIAL RUNTIME ARGUMENTS BELOW #### SPECIAL RUNTIME ARGUMENTS BELOW
# env -e ADDITIONAL_PORTS with a comma # env -e ADDITIONAL_PORTS with a comma

8
Dockerfile.auto
View File

@ -88,6 +88,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
; fi \ ; fi \
; yes | pacman -Scc ; yes | pacman -Scc
USER arch
ENV USER arch
# 5.13 problem # 5.13 problem
ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
@ -99,11 +103,9 @@ RUN sudo pacman -Rns linux --noconfirm \
; sudo pacman -Syy \ ; sudo pacman -Syy \
; sudo pacman -S mkinitcpio --noconfirm \ ; 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 \ ; 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 ; libguestfs-test-tool
USER arch
WORKDIR /home/arch/OSX-KVM WORKDIR /home/arch/OSX-KVM
RUN mkdir -p ~/.ssh \ RUN mkdir -p ~/.ssh \

8
Dockerfile.naked
View File

@ -76,6 +76,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
; fi \ ; fi \
; yes | pacman -Scc ; yes | pacman -Scc
USER arch
ENV USER arch
# 5.13 problem # 5.13 problem
ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
@ -87,11 +91,9 @@ RUN sudo pacman -Rns linux --noconfirm \
; sudo pacman -Syy \ ; sudo pacman -Syy \
; sudo pacman -S mkinitcpio --noconfirm \ ; 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 \ ; 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 ; libguestfs-test-tool
USER arch
WORKDIR /home/arch/OSX-KVM WORKDIR /home/arch/OSX-KVM
RUN mkdir -p ~/.ssh \ RUN mkdir -p ~/.ssh \