Remove pointless VOLUME command. Replace curl with wget.
This commit is contained in:
		
							parent
							
								
									fc3df53d0b
								
							
						
					
					
						commit
						8db77770b0
					
				|  | @ -193,14 +193,12 @@ ENV DISPLAY=:0.0 | ||||||
| 
 | 
 | ||||||
| USER arch | USER arch | ||||||
| 
 | 
 | ||||||
| VOLUME ["/tmp/.X11-unix"] |  | ||||||
| 
 |  | ||||||
| VOLUME /image |  | ||||||
| 
 |  | ||||||
| ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img | ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img | ||||||
| 
 | 
 | ||||||
|  | VOLUME ["/tmp/.X11-unix"] | ||||||
|  | 
 | ||||||
| CMD case "$(file --brief /image)" in \ | 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;; \ |         directory*) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img;; \ | ||||||
|     esac \ |     esac \ | ||||||
|     ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash |     ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash | ||||||
|  |  | ||||||
|  | @ -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 | # otherwise use your own image: -v "$PWD/disk.img":/image | ||||||
| RUN if [[ "${COMPLETE}" ]]; then \ | RUN if [[ "${COMPLETE}" ]]; then \ | ||||||
|     echo "Downloading 20GB+ image... This step might take a while... Press Ctrl+C if you want to abort." \ |     echo "Downloading 20GB+ image... This step might take a while... Press Ctrl+C if you want to abort." \ | ||||||
|     ; wget --no-verbose \ |     ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \ | ||||||
|         --no-dns-cache \ |         && curl -k "${IMAGE_URL}" > /home/arch/OSX-KVM/mac_hdd_ng.img \ | ||||||
|         --no-check-certificate \ |  | ||||||
|         --output-document=/home/arch/OSX-KVM/mac_hdd_ng.img \ |  | ||||||
|         "${IMAGE_URL}" \ |  | ||||||
|     ; fi |     ; fi | ||||||
| 
 | 
 | ||||||
| RUN mv ./Launch-nopicker.sh ./Launch.sh | RUN mv ./Launch-nopicker.sh ./Launch.sh | ||||||
| 
 | 
 | ||||||
| VOLUME /image |  | ||||||
| 
 |  | ||||||
| ENV DISPLAY=:99 | ENV DISPLAY=:99 | ||||||
| 
 | 
 | ||||||
| ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img | ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img | ||||||
|  |  | ||||||
|  | @ -83,8 +83,6 @@ ARG NOPICKER=true | ||||||
| 
 | 
 | ||||||
| RUN [[ "${NOPICKER}" = true ]] && mv ./Launch-nopicker.sh ./Launch.sh | RUN [[ "${NOPICKER}" = true ]] && mv ./Launch-nopicker.sh ./Launch.sh | ||||||
| 
 | 
 | ||||||
| VOLUME /image |  | ||||||
| 
 |  | ||||||
| ENV DISPLAY=:99 | ENV DISPLAY=:99 | ||||||
| 
 | 
 | ||||||
| ENV IMAGE_PATH=/image | ENV IMAGE_PATH=/image | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue