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

Revert glibc patch when applicable.

Browse Source
pull/159/head
sickcodes 4 years ago
parent 275b27ef8f
commit b79f26a508
3 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File

21
Dockerfile
Unescape View File

@ -66,12 +66,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" \
@ -98,12 +92,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
@ -153,12 +141,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
@ -192,9 +174,6 @@ 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 \
&& 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 ; fi
# optional --build-arg to change branches for testing # optional --build-arg to change branches for testing

12
Dockerfile.auto
Unescape View File

@ -69,12 +69,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 \
@ -92,12 +86,6 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
; 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
USER arch USER arch
WORKDIR /home/arch/OSX-KVM WORKDIR /home/arch/OSX-KVM

12
Dockerfile.naked
Unescape View File

@ -55,12 +55,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
@ -81,12 +75,6 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
; 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
USER arch USER arch
WORKDIR /home/arch/OSX-KVM WORKDIR /home/arch/OSX-KVM

Write Preview
Loading…
Cancel
Save