amass/Docker-OSX
1
0
Fork 0
mirror of https://github.com/sickcodes/Docker-OSX.git synced 2024-11-23 02:39:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add glibc patch once, remove Big Sur required fix for OpenCore as no longer required.

Browse Source
This commit is contained in:
sickcodes 2021-07-27 02:30:29 +00:00
parent d2dadeea4d
commit 87efcbb6f6
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -275,6 +275,23 @@ ENV HEIGHT=1080
ENV LIBGUESTFS_DEBUG=1
ENV LIBGUESTFS_TRACE=1
# ### FIX LIBGUESTFS
# # downgrade file command for supermin sub environment
# RUN sudo pacman -Syyu \
# && sudo pacman -R libguestfs \
# && sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
# && git clone https://aur.archlinux.org/libguestfs-dev.git \
# && cd libguestfs-dev \
# && makepkg -si --syncdeps --noconfirm || exit 1
# ### FIX LIBGUESTFS
### FIX glibc & file
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}" \
&& sudo bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
### FIX glibc & file
VOLUME ["/tmp/.X11-unix"]
# check if /image is a disk image or a directory. This allows you to optionally use -v disk.img:/image

17
README.md
View File

@ -44,8 +44,6 @@ docker run -it \
-p 50922:10022 \
-v /tmp/.X11-unix:/tmp/.X11-unix \
-e "DISPLAY=${DISPLAY:-:0.0}" \
-e GENERATE_UNIQUE=true \
-e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist \
sickcodes/docker-osx:big-sur
```
@ -60,20 +58,7 @@ SEE commands in [https://github.com/sickcodes/osx-optimizer](https://github.com/
## Important notices:
**2021-05-04:** Big Sur requires an updated OpenCore.qcow2 image, simply add:
```
# this will not be required after OSX-KVM integrates the changes. No effect if you were already using this method.
-e GENERATE_UNIQUE=true \
-e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist \
```
**2021-05-08:** QEMU 6 VNC changes:
For Docker-OSX users who are using [VNC over QEMU using](#building-a-headless-container-which-allows-insecure-vnc-on-localhost-for-local-use-only) `-e EXTRA=...`
- `password` is now `password=on`
- `change vnc password` now need a username at the end, `change vnc password someuser`
**2021-07-27:** Bug in libguestfs currently preventing `GENERATE_UNIQUE` and `GENERATE_TRUE`
## Technical details