Shrink the Docker containers, significantly.

This commit is contained in:
sickcodes 2021-11-29 04:15:44 +00:00
parent abce04d6fe
commit bc79a1fffb
2 changed files with 14 additions and 7 deletions

View file

@ -145,7 +145,7 @@ WORKDIR /home/arch/OSX-KVM
# RUN wget https://raw.githubusercontent.com/kholia/OSX-KVM/master/fetch-macOS-v2.py # RUN wget https://raw.githubusercontent.com/kholia/OSX-KVM/master/fetch-macOS-v2.py
ARG SHORTNAME ARG SHORTNAME=catalina
RUN make RUN make
@ -226,7 +226,8 @@ RUN sudo pacman -Syy \
&& sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \ && sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
&& sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
&& rm -rf /var/tmp/.guestfs-* \ && rm -rf /var/tmp/.guestfs-* \
; libguestfs-test-tool || exit 1 ; libguestfs-test-tool || exit 1 \
; rm -rf /var/tmp/.guestfs-*
#### ####
@ -260,7 +261,8 @@ RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
--mac-address "${STOCK_MAC_ADDRESS}" \ --mac-address "${STOCK_MAC_ADDRESS}" \
--width "${STOCK_WIDTH}" \ --width "${STOCK_WIDTH}" \
--height "${STOCK_HEIGHT}" \ --height "${STOCK_HEIGHT}" \
--output-bootdisk "${STOCK_BOOTDISK}" || exit 1 --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 \
; rm -rf /var/tmp/.guestfs-*
RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \ RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
--master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \ --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \
@ -271,7 +273,8 @@ RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
--mac-address "${STOCK_MAC_ADDRESS}" \ --mac-address "${STOCK_MAC_ADDRESS}" \
--width "${STOCK_WIDTH}" \ --width "${STOCK_WIDTH}" \
--height "${STOCK_HEIGHT}" \ --height "${STOCK_HEIGHT}" \
--output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 \
; rm -rf /var/tmp/.guestfs-*
### symlink the old directory as upstream has renamed a directory. Symlinking purely for backwards compatability! ### symlink the old directory as upstream has renamed a directory. Symlinking purely for backwards compatability!
RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true

View file

@ -217,7 +217,8 @@ RUN sudo pacman -Syy \
&& sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \ && sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
&& rm -rf /var/tmp/.guestfs-* \ && rm -rf /var/tmp/.guestfs-* \
&& yes | sudo pacman -Scc \ && yes | sudo pacman -Scc \
; libguestfs-test-tool || exit 1 ; libguestfs-test-tool || exit 1 \
&& rm -rf /var/tmp/.guestfs-*
#### ####
@ -251,7 +252,8 @@ ARG STOCK_BOOTDISK_NOPICKER=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2
# --mac-address "${STOCK_MAC_ADDRESS}" \ # --mac-address "${STOCK_MAC_ADDRESS}" \
# --width "${STOCK_WIDTH}" \ # --width "${STOCK_WIDTH}" \
# --height "${STOCK_HEIGHT}" \ # --height "${STOCK_HEIGHT}" \
# --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 # --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 \
# ; rm -rf /var/tmp/.guestfs-*
# RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \ # RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
# --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \ # --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \
@ -262,7 +264,9 @@ ARG STOCK_BOOTDISK_NOPICKER=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2
# --mac-address "${STOCK_MAC_ADDRESS}" \ # --mac-address "${STOCK_MAC_ADDRESS}" \
# --width "${STOCK_WIDTH}" \ # --width "${STOCK_WIDTH}" \
# --height "${STOCK_HEIGHT}" \ # --height "${STOCK_HEIGHT}" \
# --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 # --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 \
# ; rm -rf /var/tmp/.guestfs-*
WORKDIR /home/arch/OSX-KVM WORKDIR /home/arch/OSX-KVM