public_git
/
Docker-OSX
mirror of https://github.com/sickcodes/Docker-OSX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #77 from MrBenFTW/master 

Improvments
This commit is contained in:
sickcodes 2020-08-29 17:27:25 +00:00 committed by GitHub
parent aa846f8576 4a5ee5e744
commit 9d599d51e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -38,7 +38,7 @@
# Optargs: # Optargs:
# #
# SIZE=200G # SIZE=200G
# VERSION=10.15.5 # VERSION=10.15.6
# ENV RAM=5 # ENV RAM=5
# ENV SMP=4 # ENV SMP=4
# ENV CORES=4 # ENV CORES=4
@ -61,7 +61,7 @@ MAINTAINER 'https://sick.codes' <https://sick.codes>
# change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G # change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G
ARG SIZE=200G ARG SIZE=200G
ARG VERSION=10.15.5 ARG VERSION=10.15.6
# This fails on hub.docker.com, useful for debugging in cloud # This fails on hub.docker.com, useful for debugging in cloud
# RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; } # RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; }
@ -159,18 +159,19 @@ RUN touch Launch.sh \
&& tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=BaseSystem.img,format=raw \' \ && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=BaseSystem.img,format=raw \' \
&& tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=/home/arch/OSX-KVM/mac_hdd_ng.img,format=qcow2 \' \ && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=/home/arch/OSX-KVM/mac_hdd_ng.img,format=qcow2 \' \
&& tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \ && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
&& tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT}-:22, -device e1000-82545em,netdev=net0,id=net0,mac=52:54:00:09:49:17 \' \ && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT}-:5900, -device e1000-82545em,netdev=net0,id=net0,mac=52:54:00:09:49:17 \' \
&& tee -a Launch.sh <<< '-monitor stdio \' \ && tee -a Launch.sh <<< '-monitor stdio \' \
&& tee -a Launch.sh <<< '-vga vmware \' \ && tee -a Launch.sh <<< '-vga vmware \' \
&& tee -a Launch.sh <<< '${EXTRA}' && tee -a Launch.sh <<< '${EXTRA}'
ENV USER arch ENV USER arch
ENV RAM=5 ENV RAM=8
ENV SMP=4 ENV SMP=4
ENV CORES=4 ENV CORES=4
ENV EXTRA= ENV EXTRA=
ENV INTERNAL_SSH_PORT=10022 ENV INTERNAL_SSH_PORT=10022
ENV SCREEN_SHARE_PORT=5900
# if you're in the shell, export these variables to use then in envsubst # if you're in the shell, export these variables to use then in envsubst
# export RAM=5 # export RAM=5
@ -178,6 +179,7 @@ ENV INTERNAL_SSH_PORT=10022
# export CORES=4 # export CORES=4
# export EXTRA= # export EXTRA=
# export INTERNAL_SSH_PORT=10022 # export INTERNAL_SSH_PORT=10022
# export SCREEN_SHARE_PORT=5900
USER arch USER arch
VOLUME ["/tmp/.X11-unix"] VOLUME ["/tmp/.X11-unix"]

16
README.md
View File

@ -80,14 +80,24 @@ docker start abc123xyz567
# Click Disk Utility # Click Disk Utility
# Erase the biggest disk # Erase the biggest disk (around 200gb default), DO NOT MODIFY THE SMALLER DISKS.
# Partition that disk and subtract 1GB and press Apply
# Click Reinstall macOS # Click Reinstall macOS
``` ```
## Creating images:
```
# You can create an image of a already configured and setup container. This allows you to effectively duplicate a system.
# To do this, run the following commands
$ docker ps --all #make note of your container id
$ docker commit containerID newImageName
# To run this image do the following
$ docker run --privileged -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix newImageName
```
# Troubleshooting # Troubleshooting
libgtk permissions denied error, thanks @raoulh + @arsham libgtk permissions denied error, thanks @raoulh + @arsham