From 8db77770b05157d24a40f5341dd0104ad0e7fd43 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Tue, 26 Jan 2021 21:25:45 +0000
Subject: [PATCH] Remove pointless VOLUME command. Replace curl with wget.

---
 Dockerfile       | 8 +++-----
 Dockerfile.auto  | 9 ++-------
 Dockerfile.naked | 2 --
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 790d666..5eff72a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -193,14 +193,12 @@ ENV DISPLAY=:0.0
 
 USER arch
 
-VOLUME ["/tmp/.X11-unix"]
-
-VOLUME /image
-
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
 
+VOLUME ["/tmp/.X11-unix"]
+
 CMD case "$(file --brief /image)" in \
-        QEMU*) export IMAGE_PATH=/image;; \
+        QEMU*) export IMAGE_PATH=/image && sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" 2>/dev/null || true;; \
         directory*) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img;; \
     esac \
     ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash
diff --git a/Dockerfile.auto b/Dockerfile.auto
index cdd3cf4..417bfec 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -96,17 +96,12 @@ ARG IMAGE_URL='https://images2.sick.codes/mac_hdd_ng_auto.img'
 # otherwise use your own image: -v "$PWD/disk.img":/image
 RUN if [[ "${COMPLETE}" ]]; then \
     echo "Downloading 20GB+ image... This step might take a while... Press Ctrl+C if you want to abort." \
-    ; wget --no-verbose \
-        --no-dns-cache \
-        --no-check-certificate \
-        --output-document=/home/arch/OSX-KVM/mac_hdd_ng.img \
-        "${IMAGE_URL}" \
+    ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \
+        && curl -k "${IMAGE_URL}" > /home/arch/OSX-KVM/mac_hdd_ng.img \
     ; fi
 
 RUN mv ./Launch-nopicker.sh ./Launch.sh
 
-VOLUME /image
-
 ENV DISPLAY=:99
 
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
diff --git a/Dockerfile.naked b/Dockerfile.naked
index 253b6e2..838e64c 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -83,8 +83,6 @@ ARG NOPICKER=true
 
 RUN [[ "${NOPICKER}" = true ]] && mv ./Launch-nopicker.sh ./Launch.sh
 
-VOLUME /image
-
 ENV DISPLAY=:99
 
 ENV IMAGE_PATH=/image