diff --git a/Dockerfile b/Dockerfile index 6d50a67..7a376e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -222,14 +222,18 @@ ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12 ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-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 +# fixe ad hoc errors from using the arch museum to get libguestfs +RUN tee -a /etc/pacman.conf <<< "RemoteFileSigLevel = Optional" + RUN sudo pacman -Syy \ && sudo pacman -Rns linux --noconfirm \ ; sudo pacman -S mkinitcpio --noconfirm \ - && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \ - && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ + && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \ + && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \ && rm -rf /var/tmp/.guestfs-* \ - ; libguestfs-test-tool || exit 1 \ - ; rm -rf /var/tmp/.guestfs-* + && yes | sudo pacman -Scc \ + && libguestfs-test-tool || exit 1 \ + && rm -rf /var/tmp/.guestfs-* #### diff --git a/Dockerfile.auto b/Dockerfile.auto index f9ee9b9..5c7c6bd 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -104,16 +104,22 @@ ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12 ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-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 +# fixe ad hoc errors from using the arch museum to get libguestfs +RUN tee -a /etc/pacman.conf <<< "RemoteFileSigLevel = Optional" + RUN sudo pacman -Syy \ && sudo pacman -Rns linux --noconfirm \ ; sudo pacman -S mkinitcpio --noconfirm \ - && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \ - && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ + && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \ + && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \ && rm -rf /var/tmp/.guestfs-* \ - ; libguestfs-test-tool || exit 1 + && yes | sudo pacman -Scc \ + && libguestfs-test-tool || exit 1 \ + && rm -rf /var/tmp/.guestfs-* #### + WORKDIR /home/arch/OSX-KVM RUN mkdir -p ~/.ssh \ diff --git a/Dockerfile.naked b/Dockerfile.naked index 469976f..0c318b5 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -217,14 +217,17 @@ ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12 ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-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 +# fixe ad hoc errors from using the arch museum to get libguestfs +RUN tee -a /etc/pacman.conf <<< "RemoteFileSigLevel = Optional" + RUN sudo pacman -Syy \ && sudo pacman -Rns linux --noconfirm \ ; sudo pacman -S mkinitcpio --noconfirm \ - && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \ - && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ + && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \ + && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \ && rm -rf /var/tmp/.guestfs-* \ && yes | sudo pacman -Scc \ - ; libguestfs-test-tool || exit 1 \ + && libguestfs-test-tool || exit 1 \ && rm -rf /var/tmp/.guestfs-* #### diff --git a/Dockerfile.naked-auto b/Dockerfile.naked-auto index 13edc0a..aef3482 100644 --- a/Dockerfile.naked-auto +++ b/Dockerfile.naked-auto @@ -84,13 +84,18 @@ ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12 ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-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 +# fixe ad hoc errors from using the arch museum to get libguestfs +RUN tee -a /etc/pacman.conf <<< "RemoteFileSigLevel = Optional" + RUN sudo pacman -Syy \ && sudo pacman -Rns linux --noconfirm \ ; sudo pacman -S mkinitcpio --noconfirm \ - && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \ - && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ + && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm || exit 1 \ + && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm || exit 1 \ && rm -rf /var/tmp/.guestfs-* \ - ; libguestfs-test-tool || exit 1 + && yes | sudo pacman -Scc \ + && libguestfs-test-tool || exit 1 \ + && rm -rf /var/tmp/.guestfs-* ####