diff options
| author | sickcodes <[email protected]> | 2021-07-27 20:36:50 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-07-27 20:36:50 +0000 |
| commit | d910db6958a502d4e72dc234605729645ab99331 (patch) | |
| tree | c8874ed9c857cc2da3e2fa2220b14e5f7d4ac07d /Dockerfile | |
| parent | Add glibc patch once, remove Big Sur required fix for OpenCore as no longer r... (diff) | |
| download | docker-osx-d910db6958a502d4e72dc234605729645ab99331.tar.xz docker-osx-d910db6958a502d4e72dc234605729645ab99331.zip | |
Re-insert patched glib & downgraded file command.
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 31 |
1 files changed, 31 insertions, 0 deletions
@@ -67,6 +67,12 @@ ARG RANKMIRRORS ARG MIRROR_COUNTRY=US 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 \ { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \ ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \ @@ -93,6 +99,12 @@ RUN pacman -Syu git zip vim nano alsa-utils openssh --noconfirm \ && mkdir /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 RUN mkdir -m 700 /root/.ssh @@ -130,6 +142,15 @@ RUN touch enable-ssh.sh \ && tee -a enable-ssh.sh <<< 'sudo /usr/bin/ssh-keygen -A' \ && tee -a enable-ssh.sh <<< 'nohup sudo /usr/bin/sshd -D &' +# 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 virtlogd.service + # QEMU CONFIGURATOR # set optional ram at runtime -e RAM=16 # set optional cores at runtime -e SMP=4 -e CORES=2 @@ -171,8 +192,18 @@ ARG LINUX=true # required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly RUN if [[ "${LINUX}" == true ]]; then \ sudo pacman -Syu linux libguestfs --noconfirm \ + && 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." \ ; 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 \ + && 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 + # optional --build-arg to change branches for testing ARG BRANCH=master ARG REPO='https://github.com/sickcodes/Docker-OSX.git' |