You've already forked Docker-OSX
mirror of
https://github.com/sickcodes/Docker-OSX.git
synced 2025-07-03 03:03:31 -05:00
Compare commits
20 Commits
osx-serial
...
glibc-reve
Author | SHA1 | Date | |
---|---|---|---|
57f1532dd1 | |||
77307c7b24 | |||
e5f4d6cc12 | |||
9ccb93101d | |||
5dc2f4fd04 | |||
e102d8c3c7 | |||
c5a2a5539d | |||
869b5fafd6 | |||
309ff1cd51 | |||
17631b47ef | |||
15cb15e153 | |||
1d3a12a9c6 | |||
5542eafad7 | |||
19439bf2bd | |||
aac1017c40 | |||
d77b5cfcf2 | |||
6e134e763d | |||
0925c6e1b2 | |||
bbb38349b1 | |||
b79f26a508 |
@ -1,5 +1,6 @@
|
|||||||
|Version|Date|Notes|
|
|Version|Date|Notes|
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
|
| |2021-04-18|Add LIBGUESTFS debug & trace commands, exit on fail when creating bootdisks. Silence touch errors.|
|
||||||
|4.3|2021-03-24|Enable interactive QEMU again. Remove envsubst since we are already using bash... Add set -x flag|
|
|4.3|2021-03-24|Enable interactive QEMU again. Remove envsubst since we are already using bash... Add set -x flag|
|
||||||
|4.2|2021-03-24|Add all ENV variables to each dockerfile for readability. Add RAM allocation buffer and cache drop bug fix. Add kvm and libvirt groups. Add `IMAGE_FORMAT=qcow2` to allow `IMAGE_FORMAT=raw` too.|
|
|4.2|2021-03-24|Add all ENV variables to each dockerfile for readability. Add RAM allocation buffer and cache drop bug fix. Add kvm and libvirt groups. Add `IMAGE_FORMAT=qcow2` to allow `IMAGE_FORMAT=raw` too.|
|
||||||
| |2021-03-19|Use RAM=3 as the default RAM allocation. Add instructions to clear buff/cache.|
|
| |2021-03-19|Use RAM=3 as the default RAM allocation. Add instructions to clear buff/cache.|
|
||||||
|
12
CREDITS.md
12
CREDITS.md
@ -2,7 +2,11 @@
|
|||||||
|
|
||||||
## Upstream Acknowledgements:
|
## Upstream Acknowledgements:
|
||||||
|
|
||||||
This project uses OSX-KVM from https://github.com/kholia/OSX-KVM/ and fully appreciates the work done by [@Kholia](https://github.com/Kholia) and all the contributors who are listed: [https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md](https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md)
|
This project uses OSX-KVM from https://github.com/kholia/OSX-KVM and fully appreciates the work done by [@Kholia](https://github.com/Kholia) and all the contributors who are listed: [https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md](https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md)
|
||||||
|
|
||||||
|
This project also uses KVM-OpenCore from https://github.com/Leoyzen/KVM-Opencore and fully appreciates the work done by [@Leoyzen](https://github.com/Leoyzen).
|
||||||
|
|
||||||
|
We use a special fork by [Nicholas Sherlock](https://www.nicksherlock.com/) of KVM-Opencore https://github.com/thenickdude/KVM-Opencore and thank Nick for his awesome upstream work!
|
||||||
|
|
||||||
This project now uses the fantastic OpenCore bootloader from the community OpenCore project: https://github.com/acidanthera/OpenCorePkg. You can join their [Subreddit here](https://www.reddit.com/r/hackintosh/)!
|
This project now uses the fantastic OpenCore bootloader from the community OpenCore project: https://github.com/acidanthera/OpenCorePkg. You can join their [Subreddit here](https://www.reddit.com/r/hackintosh/)!
|
||||||
|
|
||||||
@ -69,3 +73,9 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC
|
|||||||
[@ggjulio](https://github.com/ggjulio) - Restarting an "auto" container #216
|
[@ggjulio](https://github.com/ggjulio) - Restarting an "auto" container #216
|
||||||
|
|
||||||
[@panos](https://github.com/panos) - Made further improvements to the README #219
|
[@panos](https://github.com/panos) - Made further improvements to the README #219
|
||||||
|
|
||||||
|
[@a10kiloham](https://github.com/a10kiloham) - Dockerfile for :naked image with VNC support #245
|
||||||
|
|
||||||
|
[@a10kiloham](https://github.com/a10kiloham) - Adding Bluebubbles as an example use case #250
|
||||||
|
|
||||||
|
[@aronzvi](https://github.com/aronzvi) - Fixed Failed to boot OSX with GENERATE_UNIQUE #244
|
||||||
|
38
Dockerfile
38
Dockerfile
@ -67,12 +67,6 @@ ARG RANKMIRRORS
|
|||||||
ARG MIRROR_COUNTRY=US
|
ARG MIRROR_COUNTRY=US
|
||||||
ARG MIRROR_COUNT=10
|
ARG MIRROR_COUNT=10
|
||||||
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|
||||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
|
||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
|
|
||||||
RUN if [[ "${RANKMIRRORS}" ]]; then \
|
RUN if [[ "${RANKMIRRORS}" ]]; then \
|
||||||
{ pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
|
{ pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
|
||||||
; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
|
; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
|
||||||
@ -99,12 +93,6 @@ RUN pacman -Syu git zip vim nano alsa-utils openssh --noconfirm \
|
|||||||
&& mkdir /home/arch \
|
&& mkdir /home/arch \
|
||||||
&& chown arch:arch /home/arch
|
&& chown arch:arch /home/arch
|
||||||
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|
||||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
|
||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
|
|
||||||
# allow ssh to container
|
# allow ssh to container
|
||||||
RUN mkdir -m 700 /root/.ssh
|
RUN mkdir -m 700 /root/.ssh
|
||||||
|
|
||||||
@ -154,12 +142,6 @@ RUN touch enable-ssh.sh \
|
|||||||
RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
|
RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
|
||||||
&& yes | sudo pacman -Scc
|
&& yes | sudo pacman -Scc
|
||||||
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|
||||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
|
||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
|
|
||||||
# RUN sudo systemctl enable libvirtd.service
|
# RUN sudo systemctl enable libvirtd.service
|
||||||
# RUN sudo systemctl enable virtlogd.service
|
# RUN sudo systemctl enable virtlogd.service
|
||||||
|
|
||||||
@ -185,9 +167,6 @@ RUN [[ "${VERSION%%.*}" -ge 11 ]] && { wget "${FETCH_MAC_OS_RAW}" \
|
|||||||
&& rm -f BaseSystem.dmg \
|
&& rm -f BaseSystem.dmg \
|
||||||
; } || true
|
; } || true
|
||||||
|
|
||||||
# > Launch.sh
|
|
||||||
# > Docker-OSX.xml
|
|
||||||
|
|
||||||
WORKDIR /home/arch/OSX-KVM
|
WORKDIR /home/arch/OSX-KVM
|
||||||
|
|
||||||
ARG LINUX=true
|
ARG LINUX=true
|
||||||
@ -195,10 +174,14 @@ ARG LINUX=true
|
|||||||
# required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
|
# required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
|
||||||
RUN if [[ "${LINUX}" == true ]]; then \
|
RUN if [[ "${LINUX}" == true ]]; then \
|
||||||
sudo pacman -Syu linux libguestfs --noconfirm \
|
sudo pacman -Syu linux libguestfs --noconfirm \
|
||||||
|
; fi
|
||||||
|
|
||||||
|
# TEMP-FIX for file 5.40 libguestfs issue
|
||||||
|
RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
|
||||||
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." \
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
; fi
|
# TEMP-FIX for file 5.40 libguestfs issue
|
||||||
|
|
||||||
# optional --build-arg to change branches for testing
|
# optional --build-arg to change branches for testing
|
||||||
ARG BRANCH=master
|
ARG BRANCH=master
|
||||||
@ -289,6 +272,9 @@ ENV RAM=3
|
|||||||
ENV WIDTH=1920
|
ENV WIDTH=1920
|
||||||
ENV HEIGHT=1080
|
ENV HEIGHT=1080
|
||||||
|
|
||||||
|
# libguestfs verbose
|
||||||
|
ENV LIBGUESTFS_DEBUG=1
|
||||||
|
ENV LIBGUESTFS_TRACE=1
|
||||||
|
|
||||||
VOLUME ["/tmp/.X11-unix"]
|
VOLUME ["/tmp/.X11-unix"]
|
||||||
|
|
||||||
@ -311,7 +297,7 @@ VOLUME ["/tmp/.X11-unix"]
|
|||||||
# the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
|
# the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
|
||||||
# And the default serial numbers
|
# And the default serial numbers
|
||||||
|
|
||||||
CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
|
||||||
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
||||||
; [[ "${NOPICKER}" == true ]] && { \
|
; [[ "${NOPICKER}" == true ]] && { \
|
||||||
sed -i '/^.*InstallMedia.*/d' Launch.sh \
|
sed -i '/^.*InstallMedia.*/d' Launch.sh \
|
||||||
@ -328,7 +314,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true
|
|||||||
--height "${HEIGHT:-1080}" \
|
--height "${HEIGHT:-1080}" \
|
||||||
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
--output-env "${ENV:=/env}" \
|
--output-env "${ENV:=/env}" \
|
||||||
; } \
|
|| exit 1 ; } \
|
||||||
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
||||||
source "${ENV:=/env}" 2>/dev/null \
|
source "${ENV:=/env}" 2>/dev/null \
|
||||||
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
||||||
@ -341,7 +327,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true
|
|||||||
--width "${WIDTH:-1920}" \
|
--width "${WIDTH:-1920}" \
|
||||||
--height "${HEIGHT:-1080}" \
|
--height "${HEIGHT:-1080}" \
|
||||||
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
; } \
|
|| exit 1 ; } \
|
||||||
; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
|
; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
|
||||||
|
|
||||||
# virt-manager mode: eta son
|
# virt-manager mode: eta son
|
||||||
|
@ -70,12 +70,6 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
|
|||||||
; fi \
|
; fi \
|
||||||
; yes | pacman -Scc
|
; yes | pacman -Scc
|
||||||
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|
||||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
|
||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
|
|
||||||
RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
|
RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
|
||||||
&& if [[ "${SCROT}" ]]; then \
|
&& if [[ "${SCROT}" ]]; then \
|
||||||
pacman -Syu scrot base-devel --noconfirm \
|
pacman -Syu scrot base-devel --noconfirm \
|
||||||
@ -99,6 +93,13 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
# TEMP-FIX for pacman issue
|
# TEMP-FIX for pacman issue
|
||||||
|
|
||||||
|
# TEMP-FIX for file 5.40 libguestfs issue
|
||||||
|
RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
|
||||||
|
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||||
|
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||||
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
|
# TEMP-FIX for file 5.40 libguestfs issue
|
||||||
|
|
||||||
USER arch
|
USER arch
|
||||||
|
|
||||||
WORKDIR /home/arch/OSX-KVM
|
WORKDIR /home/arch/OSX-KVM
|
||||||
@ -170,6 +171,10 @@ ENV RAM=3
|
|||||||
ENV WIDTH=1920
|
ENV WIDTH=1920
|
||||||
ENV HEIGHT=1080
|
ENV HEIGHT=1080
|
||||||
|
|
||||||
|
# libguestfs verbose
|
||||||
|
ENV LIBGUESTFS_DEBUG=1
|
||||||
|
ENV LIBGUESTFS_TRACE=1
|
||||||
|
|
||||||
ENV TERMS_OF_USE=i_agree
|
ENV TERMS_OF_USE=i_agree
|
||||||
|
|
||||||
ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a security reseacher or developer and agree to use this Dockerfile to make the world a safer place. Examples include: making your apps safer, finding your mobile phone, compiling security products, etc. You understand that Docker-OSX is an Open Source project, which is released to the public under the GNU Pulic License version 3 and above. You acknowledge that the Open Source project is absolutely unaffiliated with any third party, in any form whatsoever. Any trademarks or intelectual property which happen to be mentioned anywhere in or around the project are owned by their respective owners. By using this Dockerfile, you agree to agree to the EULA of each piece of upstream or downstream software. The following code is released for the sole purpose of security research, under the GNU Public License version 3. If you are concerned about the licensing, please note that this project is not AGPL. A copy of the license is available online: https://github.com/sickcodes/Docker-OSX/blob/master/LICENSE. In order to use the following Dockerfile you must read and understand the terms. Once you have read the terms, use the -e TERMS_OF_USE=i_agree or -e TERMS_OF_USE=i_disagree"
|
ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a security reseacher or developer and agree to use this Dockerfile to make the world a safer place. Examples include: making your apps safer, finding your mobile phone, compiling security products, etc. You understand that Docker-OSX is an Open Source project, which is released to the public under the GNU Pulic License version 3 and above. You acknowledge that the Open Source project is absolutely unaffiliated with any third party, in any form whatsoever. Any trademarks or intelectual property which happen to be mentioned anywhere in or around the project are owned by their respective owners. By using this Dockerfile, you agree to agree to the EULA of each piece of upstream or downstream software. The following code is released for the sole purpose of security research, under the GNU Public License version 3. If you are concerned about the licensing, please note that this project is not AGPL. A copy of the license is available online: https://github.com/sickcodes/Docker-OSX/blob/master/LICENSE. In order to use the following Dockerfile you must read and understand the terms. Once you have read the terms, use the -e TERMS_OF_USE=i_agree or -e TERMS_OF_USE=i_disagree"
|
||||||
@ -177,7 +182,7 @@ ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a secur
|
|||||||
CMD echo "${BOILERPLATE}" \
|
CMD echo "${BOILERPLATE}" \
|
||||||
; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
|
; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
|
||||||
; echo "Disk is being copied between layers... Please wait a minute..." \
|
; echo "Disk is being copied between layers... Please wait a minute..." \
|
||||||
; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
|
||||||
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
||||||
; [[ "${NOPICKER}" == true ]] && { \
|
; [[ "${NOPICKER}" == true ]] && { \
|
||||||
sed -i '/^.*InstallMedia.*/d' Launch.sh \
|
sed -i '/^.*InstallMedia.*/d' Launch.sh \
|
||||||
@ -194,7 +199,7 @@ CMD echo "${BOILERPLATE}" \
|
|||||||
--height "${HEIGHT:-1080}" \
|
--height "${HEIGHT:-1080}" \
|
||||||
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
--output-env "${ENV:=/env}" \
|
--output-env "${ENV:=/env}" \
|
||||||
; } \
|
|| exit 1 ; } \
|
||||||
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
||||||
source "${ENV:=/env}" 2>/dev/null \
|
source "${ENV:=/env}" 2>/dev/null \
|
||||||
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
||||||
@ -207,7 +212,7 @@ CMD echo "${BOILERPLATE}" \
|
|||||||
--width "${WIDTH:-1920}" \
|
--width "${WIDTH:-1920}" \
|
||||||
--height "${HEIGHT:-1080}" \
|
--height "${HEIGHT:-1080}" \
|
||||||
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
; } \
|
|| exit 1 ; } \
|
||||||
; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
|
; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
|
||||||
nohup Xvfb :99 -screen 0 1920x1080x16 \
|
nohup Xvfb :99 -screen 0 1920x1080x16 \
|
||||||
& until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
|
& until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
|
||||||
|
@ -56,12 +56,6 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu
|
|||||||
&& tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
|
&& tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
|
||||||
&& cat /etc/pacman.d/mirrorlist ; fi
|
&& cat /etc/pacman.d/mirrorlist ; fi
|
||||||
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|
||||||
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
|
||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
|
||||||
# TEMP-FIX for pacman issue
|
|
||||||
|
|
||||||
# For taking screenshots of the Xfvb screen, useful during development.
|
# For taking screenshots of the Xfvb screen, useful during development.
|
||||||
ARG SCROT
|
ARG SCROT
|
||||||
|
|
||||||
@ -88,6 +82,13 @@ RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
|||||||
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
# TEMP-FIX for pacman issue
|
# TEMP-FIX for pacman issue
|
||||||
|
|
||||||
|
# TEMP-FIX for file 5.40 libguestfs issue
|
||||||
|
RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
|
||||||
|
&& patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||||
|
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||||
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
|
# TEMP-FIX for file 5.40 libguestfs issue
|
||||||
|
|
||||||
USER arch
|
USER arch
|
||||||
|
|
||||||
WORKDIR /home/arch/OSX-KVM
|
WORKDIR /home/arch/OSX-KVM
|
||||||
@ -142,7 +143,11 @@ ENV RAM=3
|
|||||||
ENV WIDTH=1920
|
ENV WIDTH=1920
|
||||||
ENV HEIGHT=1080
|
ENV HEIGHT=1080
|
||||||
|
|
||||||
CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
# libguestfs verbose
|
||||||
|
ENV LIBGUESTFS_DEBUG=1
|
||||||
|
ENV LIBGUESTFS_TRACE=1
|
||||||
|
|
||||||
|
CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
|
||||||
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
||||||
; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
|
; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
|
||||||
nohup Xvfb :99 -screen 0 1920x1080x16 \
|
nohup Xvfb :99 -screen 0 1920x1080x16 \
|
||||||
@ -163,7 +168,7 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true
|
|||||||
--height "${HEIGHT:-1080}" \
|
--height "${HEIGHT:-1080}" \
|
||||||
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
--output-env "${ENV:=/env}" \
|
--output-env "${ENV:=/env}" \
|
||||||
; } \
|
|| exit 1 ; } \
|
||||||
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
||||||
source "${ENV:=/env}" 2>/dev/null \
|
source "${ENV:=/env}" 2>/dev/null \
|
||||||
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
||||||
@ -176,5 +181,5 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true
|
|||||||
--width "${WIDTH:-1920}" \
|
--width "${WIDTH:-1920}" \
|
||||||
--height "${HEIGHT:-1080}" \
|
--height "${HEIGHT:-1080}" \
|
||||||
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
; } \
|
|| exit 1 ; } \
|
||||||
; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
|
; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
|
||||||
|
21
README.md
21
README.md
@ -18,6 +18,8 @@ Big thanks to the OpenCore team over at: https://github.com/acidanthera/OpenCore
|
|||||||
|
|
||||||
If you like this project, consider contributing here or upstream!
|
If you like this project, consider contributing here or upstream!
|
||||||
|
|
||||||
|
[](https://hub.docker.com/r/sickcodes/docker-osx)
|
||||||
|
|
||||||
## Quick Start Docker-OSX
|
## Quick Start Docker-OSX
|
||||||
|
|
||||||
First time here? try [initial setup](#initial-setup), otherwise try the instructions below to use either Catalina or Big Sur.
|
First time here? try [initial setup](#initial-setup), otherwise try the instructions below to use either Catalina or Big Sur.
|
||||||
@ -61,7 +63,6 @@ The images (excluding `:naked`) launch a container with an existing installation
|
|||||||
- username: `user`, password: `alpine`
|
- username: `user`, password: `alpine`
|
||||||
- SSH enabled (`localhost:50922`)
|
- SSH enabled (`localhost:50922`)
|
||||||
- VNC enabled (`localhost:8888`) if using ./vnc version
|
- VNC enabled (`localhost:8888`) if using ./vnc version
|
||||||
- VNC enabled (`localhost:8888`) if using ./vnc version
|
|
||||||
- auto-updates disabled
|
- auto-updates disabled
|
||||||
- [serial number generator!](https://github.com/sickcodes/osx-serial-generator)
|
- [serial number generator!](https://github.com/sickcodes/osx-serial-generator)
|
||||||
- X11 forwarding is enabled
|
- X11 forwarding is enabled
|
||||||
@ -129,6 +130,7 @@ Docker-OSX is licensed under the [GPL v3+](LICENSE). Contributions are welcomed
|
|||||||
### Other cool Docker/QEMU based projects
|
### Other cool Docker/QEMU based projects
|
||||||
|
|
||||||
- [Run iOS in a Docker container with Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS) - [https://github.com/sickcodes/Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS)
|
- [Run iOS in a Docker container with Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS) - [https://github.com/sickcodes/Docker-eyeOS](https://github.com/sickcodes/Docker-eyeOS)
|
||||||
|
- [Run iMessage relayer in Docker with Bluebubbles.app](https://bluebubbles.app/) - [Getting started wiki](https://github.com/BlueBubblesApp/BlueBubbles-Server/wiki/Running-via-Docker)
|
||||||
|
|
||||||
## Disclaimer
|
## Disclaimer
|
||||||
|
|
||||||
@ -883,6 +885,23 @@ Here's a few other resolutions! If you resolution is invalid, it will default to
|
|||||||
-e HEIGHT=1600 \
|
-e HEIGHT=1600 \
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### This example shows how to change resolution after the container is created.
|
||||||
|
|
||||||
|
First step is to stop the docker daemon
|
||||||
|
```
|
||||||
|
sudo systemctl stop docker
|
||||||
|
```
|
||||||
|
The second step is to change container config in
|
||||||
|
```
|
||||||
|
/var/lib/docker/containers/[container-id]/config.v2.json
|
||||||
|
```
|
||||||
|
(Suppose your original WIDTH is 1024 and HEIGHT is 768, you can search 1024 and replace it with the new value. Same for 768.)
|
||||||
|
|
||||||
|
The last step is to restart the docker daemon
|
||||||
|
```
|
||||||
|
sudo systemctl restart docker
|
||||||
|
```
|
||||||
|
|
||||||
### Mounting physical disks in Mac OSX
|
### Mounting physical disks in Mac OSX
|
||||||
|
|
||||||
Pass the disk into the container as a volume and then pass the disk again into QEMU command line extras with.
|
Pass the disk into the container as a volume and then pass the disk again into QEMU command line extras with.
|
||||||
|
208
vnc-version/Dockerfile.nakedvnc
Normal file
208
vnc-version/Dockerfile.nakedvnc
Normal file
@ -0,0 +1,208 @@
|
|||||||
|
#!/usr/bin/docker
|
||||||
|
# ____ __ ____ ______ __
|
||||||
|
# / __ \____ _____/ /_____ _____/ __ \/ ___/ |/ /
|
||||||
|
# / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \| /
|
||||||
|
# / /_/ / /_/ / /__/ ,< / __/ / / /_/ /___/ / |
|
||||||
|
# /_____/\____/\___/_/|_|\___/_/ \____//____/_/|_| :NAKED
|
||||||
|
#
|
||||||
|
# Title: Docker-OSX (Mac on Docker)
|
||||||
|
# Author: Sick.Codes https://twitter.com/sickcodes
|
||||||
|
# Version: 4.3
|
||||||
|
# License: GPLv3+
|
||||||
|
# Repository: https://github.com/sickcodes/Docker-OSX
|
||||||
|
# Website: https://sick.codes
|
||||||
|
#
|
||||||
|
# This image won't run unless you supply a disk image using:
|
||||||
|
# -v ${PWD}/mac_hdd_ng.img:/image
|
||||||
|
#
|
||||||
|
# Take screenshots in the Arch container and display in terminal: scrotcat
|
||||||
|
#
|
||||||
|
# Build:
|
||||||
|
#
|
||||||
|
# docker build -t docker-osx:naked -f Dockerfile.naked .
|
||||||
|
#
|
||||||
|
# Run headless:
|
||||||
|
#
|
||||||
|
# docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image docker-osx:naked
|
||||||
|
#
|
||||||
|
# Run with display:
|
||||||
|
#
|
||||||
|
# docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix docker-osx:naked
|
||||||
|
#
|
||||||
|
|
||||||
|
FROM sickcodes/docker-osx:latest
|
||||||
|
|
||||||
|
MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
WORKDIR /root
|
||||||
|
|
||||||
|
RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img
|
||||||
|
|
||||||
|
# OPTIONAL: Arch Linux server mirrors for super fast builds
|
||||||
|
# set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
|
||||||
|
ARG RANKMIRRORS
|
||||||
|
ARG MIRROR_COUNTRY=US
|
||||||
|
ARG MIRROR_COUNT=10
|
||||||
|
RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
|
||||||
|
; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
|
||||||
|
; wget -O- "https://www.archlinux.org/mirrorlist/?country=${MIRROR_COUNTRY:-US}&protocol=https&use_mirror_status=on" \
|
||||||
|
| sed -e 's/^#Server/Server/' -e '/^#/d' \
|
||||||
|
| head -n "$((${MIRROR_COUNT:-10}+1))" \
|
||||||
|
| bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
|
||||||
|
&& tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' \
|
||||||
|
&& tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' \
|
||||||
|
&& tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
|
||||||
|
&& cat /etc/pacman.d/mirrorlist ; fi
|
||||||
|
|
||||||
|
# TEMP-FIX for pacman issue
|
||||||
|
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||||
|
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||||
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
|
# TEMP-FIX for pacman issue
|
||||||
|
|
||||||
|
# For taking screenshots of the Xfvb screen, useful during development.
|
||||||
|
ARG SCROT
|
||||||
|
|
||||||
|
RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
|
||||||
|
&& if [[ "${SCROT}" ]]; then \
|
||||||
|
pacman -Syu scrot base-devel --noconfirm \
|
||||||
|
&& git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
|
||||||
|
&& cd imcat \
|
||||||
|
&& make \
|
||||||
|
&& sudo cp imcat /usr/bin/imcat \
|
||||||
|
&& touch /usr/bin/scrotcat \
|
||||||
|
&& tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)' \
|
||||||
|
&& chmod +x /usr/bin/scrotcat \
|
||||||
|
; else \
|
||||||
|
touch /usr/bin/scrotcat \
|
||||||
|
&& echo echo >> /usr/bin/scrotcat \
|
||||||
|
&& chmod +x /usr/bin/scrotcat \
|
||||||
|
; fi \
|
||||||
|
; yes | pacman -Scc
|
||||||
|
|
||||||
|
# TEMP-FIX for pacman issue
|
||||||
|
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
|
||||||
|
&& curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
|
||||||
|
&& bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
|
||||||
|
# TEMP-FIX for pacman issue
|
||||||
|
|
||||||
|
USER arch
|
||||||
|
|
||||||
|
WORKDIR /home/arch/OSX-KVM
|
||||||
|
|
||||||
|
RUN mkdir -p ~/.ssh \
|
||||||
|
&& touch ~/.ssh/authorized_keys \
|
||||||
|
&& touch ~/.ssh/config \
|
||||||
|
&& chmod 700 ~/.ssh \
|
||||||
|
&& chmod 600 ~/.ssh/config \
|
||||||
|
&& chmod 600 ~/.ssh/authorized_keys \
|
||||||
|
&& tee -a ~/.ssh/config <<< 'Host *' \
|
||||||
|
&& tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no' \
|
||||||
|
&& tee -a ~/.ssh/config <<< ' UserKnownHostsFile=/dev/null'
|
||||||
|
|
||||||
|
#### SPECIAL RUNTIME ARGUMENTS BELOW
|
||||||
|
|
||||||
|
ENV ADDITIONAL_PORTS=
|
||||||
|
|
||||||
|
ENV BOOTDISK=
|
||||||
|
|
||||||
|
ENV DISPLAY=:99
|
||||||
|
|
||||||
|
ENV HEADLESS=false
|
||||||
|
|
||||||
|
ENV ENV=/env
|
||||||
|
|
||||||
|
# Boolean for generating a bootdisk with new random serials.
|
||||||
|
ENV GENERATE_UNIQUE=false
|
||||||
|
|
||||||
|
# Boolean for generating a bootdisk with specific serials.
|
||||||
|
ENV GENERATE_SPECIFIC=false
|
||||||
|
|
||||||
|
ENV IMAGE_PATH=/image
|
||||||
|
ENV IMAGE_FORMAT=qcow2
|
||||||
|
|
||||||
|
ENV KVM='accel=kvm:tcg'
|
||||||
|
|
||||||
|
# ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist"
|
||||||
|
|
||||||
|
# ENV NETWORKING=e1000-82545em
|
||||||
|
ENV NETWORKING=vmxnet3
|
||||||
|
|
||||||
|
ENV NOPICKER=true
|
||||||
|
|
||||||
|
# dynamic RAM options for runtime
|
||||||
|
ENV RAM=8
|
||||||
|
# ENV RAM=max
|
||||||
|
# ENV RAM=half
|
||||||
|
|
||||||
|
# The x and y coordinates for resolution.
|
||||||
|
# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
|
||||||
|
ENV WIDTH=1920
|
||||||
|
ENV HEIGHT=1080
|
||||||
|
|
||||||
|
CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
||||||
|
; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
|
||||||
|
; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
|
||||||
|
nohup Xvfb :99 -screen 0 1920x1080x16 \
|
||||||
|
& until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
|
||||||
|
; } \
|
||||||
|
; [[ "${NOPICKER}" == true ]] && { \
|
||||||
|
sed -i '/^.*InstallMedia.*/d' Launch.sh \
|
||||||
|
&& export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
|
||||||
|
; } \
|
||||||
|
|| export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
|
; [[ "${GENERATE_UNIQUE}" == true ]] && { \
|
||||||
|
./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
|
||||||
|
--master-plist-url="${MASTER_PLIST_URL}" \
|
||||||
|
--count 1 \
|
||||||
|
--tsv ./serial.tsv \
|
||||||
|
--bootdisks \
|
||||||
|
--width "${WIDTH:-1920}" \
|
||||||
|
--height "${HEIGHT:-1080}" \
|
||||||
|
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
|
--output-env "${ENV:=/env}" \
|
||||||
|
; } \
|
||||||
|
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
|
||||||
|
source "${ENV:=/env}" 2>/dev/null \
|
||||||
|
; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
|
||||||
|
--master-plist-url="${MASTER_PLIST_URL}" \
|
||||||
|
--model "${DEVICE_MODEL}" \
|
||||||
|
--serial "${SERIAL}" \
|
||||||
|
--board-serial "${BOARD_SERIAL}" \
|
||||||
|
--uuid "${UUID}" \
|
||||||
|
--mac-address "${MAC_ADDRESS}" \
|
||||||
|
--width "${WIDTH:-1920}" \
|
||||||
|
--height "${HEIGHT:-1080}" \
|
||||||
|
--output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
|
||||||
|
; } \
|
||||||
|
# ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
|
||||||
|
|
||||||
|
WORKDIR /home/arch/OSX-KVM
|
||||||
|
|
||||||
|
RUN sudo pacman -Syyuu --noconfirm \
|
||||||
|
&& sudo pacman -S tigervnc xterm xorg-xhost xdotool ufw --noconfirm \
|
||||||
|
&& mkdir -p ${HOME}/.vnc \
|
||||||
|
&& touch ~/.vnc/config \
|
||||||
|
&& tee -a ~/.vnc/config <<< 'geometry=1920x1080' \
|
||||||
|
&& tee -a ~/.vnc/config <<< 'localhost' \
|
||||||
|
&& tee -a ~/.vnc/config <<< 'alwaysshared'
|
||||||
|
|
||||||
|
RUN printf '\n%s\n' \
|
||||||
|
'sudo rm -f /tmp/.X99-lock' \
|
||||||
|
'export DISPLAY=:99' \
|
||||||
|
'/usr/bin/Xvnc -geometry 1920x1080 -rfbauth "${HOME}/.vnc/passwd" :99 &' > vnc.sh
|
||||||
|
|
||||||
|
RUN cat vnc.sh Launch.sh > Launch_custom.sh
|
||||||
|
|
||||||
|
RUN chmod +x Launch_custom.sh
|
||||||
|
|
||||||
|
RUN tee vncpasswd_file <<< "${VNC_PASSWORD:="$(tr -dc '[:graph:]' </dev/urandom | head -c8)"}"
|
||||||
|
RUN vncpasswd -f < vncpasswd_file > ${HOME}/.vnc/passwd
|
||||||
|
|
||||||
|
RUN chmod 600 ~/.vnc/passwd
|
||||||
|
RUN printf '\n\n\n\n%s\n%s\n\n\n\n' '===========VNC_PASSWORD========== ' "$(<vncpasswd_file)"
|
||||||
|
|
||||||
|
CMD ./enable-ssh.sh && envsubst < ./Launch_custom.sh | bash
|
||||||
|
|
Reference in New Issue
Block a user