aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile.naked
diff options
context:
space:
mode:
Diffstat (limited to 'Dockerfile.naked')
-rw-r--r--Dockerfile.naked28
1 files changed, 19 insertions, 9 deletions
diff --git a/Dockerfile.naked b/Dockerfile.naked
index bcc69cd..56aa876 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -81,19 +81,29 @@ USER arch
ENV USER arch
-# 5.13 problem
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+#### libguestfs versioning
+
+# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
+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
+ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
+
+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 -U "${KERNEL_PACKAGE_URL}" --noconfirm \
+ ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+ ; sudo libguestfs-test-tool \
+ ; sudo rm -rf /var/tmp/.guestfs-* \
+ ; fi
+
+####
-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