aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2021-03-01 11:32:23 +0000
committersickcodes <[email protected]>2021-03-01 11:32:23 +0000
commitb79f26a50877673890dabbce2552252d75b4c03e (patch)
treec96eb0ee70522c6c6a021f1b18a288faac093a2b /Dockerfile
parentDocumentation for Big Sur. v4.0 (diff)
downloaddocker-osx-b79f26a50877673890dabbce2552252d75b4c03e.tar.xz
docker-osx-b79f26a50877673890dabbce2552252d75b4c03e.zip
Revert glibc patch when applicable.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile21
1 files changed, 0 insertions, 21 deletions
diff --git a/Dockerfile b/Dockerfile
index 8033913..707f1ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,12 +66,6 @@ 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" \
@@ -98,12 +92,6 @@ 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
@@ -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 \
&& 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 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
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
# optional --build-arg to change branches for testing