From ca92e33b206d9c006eaf3d359965326f415929d9 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Tue, 27 Jul 2021 21:00:18 +0000 Subject: [PATCH] Fix Dockerfile --- Dockerfile | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f18e66..75b13ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -163,6 +163,12 @@ 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 @@ -306,23 +312,6 @@ ENV HEIGHT=1080 ENV LIBGUESTFS_DEBUG=1 ENV LIBGUESTFS_TRACE=1 -# ### FIX LIBGUESTFS -# # downgrade file command for supermin sub environment -# RUN sudo pacman -Syyu \ -# && sudo pacman -R libguestfs \ -# && sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \ -# && git clone https://aur.archlinux.org/libguestfs-dev.git \ -# && cd libguestfs-dev \ -# && makepkg -si --syncdeps --noconfirm || exit 1 -# ### FIX LIBGUESTFS - -### FIX glibc & file -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}" \ - && sudo bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." -### FIX glibc & file - VOLUME ["/tmp/.X11-unix"] # check if /image is a disk image or a directory. This allows you to optionally use -v disk.img:/image