diff options
| author | sickcodes <[email protected]> | 2021-03-03 07:09:27 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-03 07:09:27 +0000 |
| commit | 2e185aa2c3849229d0aa6a100fc7ab545ef2c72a (patch) | |
| tree | d1ad9b80362fb6fa73dd1ea2bb5bc0d44b14b48f | |
| parent | Merge pull request #161 from edsonboldrini/patch-1 (diff) | |
| parent | Add ADDITIONAL_PORTS, -e ADDITIONAL_PORTS='hostfwd=tcp::23-:23,' (diff) | |
| download | docker-osx-2e185aa2c3849229d0aa6a100fc7ab545ef2c72a.tar.xz docker-osx-2e185aa2c3849229d0aa6a100fc7ab545ef2c72a.zip | |
Merge pull request #162 from sickcodes/additional-ports
Add ADDITIONAL_PORTS, -e ADDITIONAL_PORTS='hostfwd=tcp::10023-:80,'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | CREDITS.md | 1 | ||||
| -rw-r--r-- | Dockerfile | 6 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d9df2..9157591 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ |Version|Date|Notes| |---|---|---| +| |2021-03-02|Add ADDITIONAL_PORTS, for example `-e ADDITIONAL_PORTS='hostfwd=tcp::23-:23,'`| |4.0|2021-02-27|Add big-sur support. Use `sickcodes/docker-osx:big-sur` or build using `--build-arg VERSION=11`| | |2021-02-26|Change `-e NOPICKER=true` to simply do `sed -i '/^.*InstallMedia.*/d' Launch.sh` and `export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2`.| |3.2|2021-02-25|Add a script to generate unique machine serial numbers. Add a script to generate a bootdisk from given serial numbers. Add Linux for libguestfs which allows the docker container to make QEMU bootdisks with specific serial numbers.| @@ -56,3 +56,4 @@ These credits refer to the contributors to this repository: [@MrBenFTW](https://github.com/MrBenFTW) - Tempfix for arch #150 +[@edsonboldrini](https://github.com/edsonboldrini) - Update README.md #161 @@ -202,6 +202,10 @@ ARG BRANCH=master ARG REPO='https://github.com/sickcodes/Docker-OSX.git' RUN git clone --branch "${BRANCH}" "${REPO}" +# env -e ADDITIONAL_PORTS with a comma +# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23, +ENV ADDITIONAL_PORTS= + RUN touch Launch.sh \ && chmod +x ./Launch.sh \ && tee -a Launch.sh <<< '#!/bin/sh' \ @@ -225,7 +229,7 @@ RUN touch Launch.sh \ && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \ && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/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 <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900, \' \ + && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS} \' \ && tee -a Launch.sh <<< '-device ${NETWORKING:-vmxnet3},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \ && tee -a Launch.sh <<< '-monitor stdio \' \ && tee -a Launch.sh <<< '-vga vmware \' \ |