mirror of
https://github.com/sickcodes/Docker-OSX.git
synced 2024-09-20 05:36:05 +00:00
Remove glibc patches, introduce libguestfs test
This commit is contained in:
sickcodes
parent
5e294d35c1
commit
9a8239f8ec
38
Dockerfile
38
Dockerfile
@ -67,12 +67,6 @@ ARG RANKMIRRORS
|
||||
ARG MIRROR_COUNTRY=US
|
||||
ARG MIRROR_COUNT=10
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
|
||||
RUN if [[ "${RANKMIRRORS}" ]]; then \
|
||||
{ pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
|
||||
; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
|
||||
@ -99,12 +93,6 @@ RUN pacman -Syu git zip vim nano alsa-utils openssh --noconfirm \
|
||||
&& mkdir /home/arch \
|
||||
&& chown arch:arch /home/arch
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
|
||||
# allow ssh to container
|
||||
RUN mkdir -m 700 /root/.ssh
|
||||
|
||||
@ -143,15 +131,6 @@ RUN touch enable-ssh.sh \
|
||||
&& tee -a enable-ssh.sh <<< 'sudo /usr/bin/ssh-keygen -A' \
|
||||
&& tee -a enable-ssh.sh <<< 'nohup sudo /usr/bin/sshd -D &'
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
|
||||
# RUN sudo systemctl enable libvirtd.service
|
||||
# RUN sudo systemctl enable virtlogd.service
|
||||
|
||||
# QEMU CONFIGURATOR
|
||||
# set optional ram at runtime -e RAM=16
|
||||
# set optional cores at runtime -e SMP=4 -e CORES=2
|
||||
@ -164,12 +143,6 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
|
||||
&& yes | sudo pacman -Scc
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
|
||||
WORKDIR /home/arch/OSX-KVM
|
||||
|
||||
RUN wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/fetch-macOS.py
|
||||
@ -199,18 +172,8 @@ ARG LINUX=true
|
||||
# required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
|
||||
RUN if [[ "${LINUX}" == true ]]; then \
|
||||
sudo pacman -Syu linux libguestfs --noconfirm \
|
||||
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." \
|
||||
; fi
|
||||
|
||||
# TEMP-FIX for file 5.40 libguestfs issue
|
||||
RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
|
||||
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for file 5.40 libguestfs issue
|
||||
|
||||
# optional --build-arg to change branches for testing
|
||||
ARG BRANCH=master
|
||||
ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
|
||||
@ -259,7 +222,6 @@ RUN grep -v InstallMedia ./Launch.sh > ./Launch-nopicker.sh \
|
||||
|
||||
|
||||
# 5.13 problem
|
||||
|
||||
ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
|
||||
|
||||
ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
|
||||
|
||||
@ -71,12 +71,6 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
|
||||
; fi \
|
||||
; yes | pacman -Scc
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
|
||||
RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
|
||||
&& if [[ "${SCROT}" ]]; then \
|
||||
pacman -Syu scrot base-devel --noconfirm \
|
||||
@ -94,19 +88,20 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
|
||||
; fi \
|
||||
; yes | pacman -Scc
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
# 5.13 problem
|
||||
ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
|
||||
|
||||
# TEMP-FIX for file 5.40 libguestfs issue
|
||||
RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
|
||||
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for file 5.40 libguestfs issue
|
||||
ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
|
||||
|
||||
ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
|
||||
|
||||
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-* \
|
||||
; libguestfs-test-tool
|
||||
|
||||
USER arch
|
||||
|
||||
WORKDIR /home/arch/OSX-KVM
|
||||
|
||||
@ -56,12 +56,6 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu
|
||||
&& tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
|
||||
&& cat /etc/pacman.d/mirrorlist ; fi
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
|
||||
# For taking screenshots of the Xfvb screen, useful during development.
|
||||
ARG SCROT
|
||||
|
||||
@ -82,19 +76,19 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
|
||||
; fi \
|
||||
; yes | pacman -Scc
|
||||
|
||||
# TEMP-FIX for pacman issue
|
||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for pacman issue
|
||||
# 5.13 problem
|
||||
ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
|
||||
|
||||
# TEMP-FIX for file 5.40 libguestfs issue
|
||||
RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
|
||||
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||
# TEMP-FIX for file 5.40 libguestfs issue
|
||||
ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
|
||||
|
||||
ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
|
||||
|
||||
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-* \
|
||||
; libguestfs-test-tool
|
||||
|
||||
USER arch
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user