diff options
| author | sickcodes <[email protected]> | 2021-07-28 18:06:03 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-07-28 18:06:03 +0000 |
| commit | 9a8239f8ecac3c0c891f9c12a52da16dfb63e979 (patch) | |
| tree | d9539c7dfe23052a81e49da6074fbf450e86167b /Dockerfile.naked | |
| parent | SUPERMIN_KERNEL downgrade to 5.12 due to zstd issue (diff) | |
| download | docker-osx-9a8239f8ecac3c0c891f9c12a52da16dfb63e979.tar.xz docker-osx-9a8239f8ecac3c0c891f9c12a52da16dfb63e979.zip | |
Remove glibc patches, introduce libguestfs test
Diffstat (limited to 'Dockerfile.naked')
| -rw-r--r-- | Dockerfile.naked | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/Dockerfile.naked b/Dockerfile.naked index 39373ce..8f91a4f 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -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 + +ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1 -# 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_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 |