diff options
| author | sickcodes <[email protected]> | 2021-07-28 18:59:03 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-07-28 18:59:03 +0000 |
| commit | d12612bb35dbbde5a94a3423c687ede4be35b9e6 (patch) | |
| tree | d808f242abb3f2d3991531ff1824eb383a30bbff /Dockerfile.auto | |
| parent | SUPERMIN_KERNEL downgrade to 5.12 due to zstd issue (diff) | |
| parent | Shift supermin environment variables earlier all images (diff) | |
| download | docker-osx-d12612bb35dbbde5a94a3423c687ede4be35b9e6.tar.xz docker-osx-d12612bb35dbbde5a94a3423c687ede4be35b9e6.zip | |
Merge pull request #325 from sickcodes/glibc-patch-retire
Remove glibc patches, introduce libguestfs test
Diffstat (limited to 'Dockerfile.auto')
| -rw-r--r-- | Dockerfile.auto | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/Dockerfile.auto b/Dockerfile.auto index 9e4ac04..0a58725 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -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,20 +88,23 @@ 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 +USER arch -# 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 USER arch -USER arch +# 5.13 problem +ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux + +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 \ + ; sudo rm -rf /var/tmp/.guestfs-* \ + ; libguestfs-test-tool WORKDIR /home/arch/OSX-KVM |