diff options
| author | sickcodes <[email protected]> | 2021-07-27 20:36:50 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-07-27 20:36:50 +0000 |
| commit | d910db6958a502d4e72dc234605729645ab99331 (patch) | |
| tree | c8874ed9c857cc2da3e2fa2220b14e5f7d4ac07d /Dockerfile.auto | |
| parent | Add glibc patch once, remove Big Sur required fix for OpenCore as no longer r... (diff) | |
| download | docker-osx-d910db6958a502d4e72dc234605729645ab99331.tar.xz docker-osx-d910db6958a502d4e72dc234605729645ab99331.zip | |
Re-insert patched glib & downgraded file command.
Diffstat (limited to 'Dockerfile.auto')
| -rw-r--r-- | Dockerfile.auto | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Dockerfile.auto b/Dockerfile.auto index eebb535..9e4ac04 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -56,6 +56,7 @@ ARG SCROT ARG RANKMIRRORS ARG MIRROR_COUNTRY=US ARG MIRROR_COUNT=10 + RUN if [[ "${RANKMIRRORS}" ]]; then \ { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \ ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \ @@ -70,6 +71,12 @@ 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 \ @@ -87,6 +94,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 + +# 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 + USER arch WORKDIR /home/arch/OSX-KVM |