diff options
| author | sickcodes <[email protected]> | 2022-03-27 14:06:55 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-27 14:06:55 +0000 |
| commit | 73d84d28ddda88da14ea2dd25568814cc5b9177b (patch) | |
| tree | 8474a48d38816ba046e2c205227d973329a079d3 | |
| parent | Update via @Error996 https://github.com/Error996 (diff) | |
| download | docker-osx-73d84d28ddda88da14ea2dd25568814cc5b9177b.tar.xz docker-osx-73d84d28ddda88da14ea2dd25568814cc5b9177b.zip | |
Fixes #470naked-vnc-legacy-patch
TEMP-FIX is breaking Dockerfile.nakedvnc build #470
| -rw-r--r-- | vnc-version/Dockerfile.nakedvnc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/vnc-version/Dockerfile.nakedvnc b/vnc-version/Dockerfile.nakedvnc index f1d0cf3..6fa5353 100644 --- a/vnc-version/Dockerfile.nakedvnc +++ b/vnc-version/Dockerfile.nakedvnc @@ -57,12 +57,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' \ && 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. ARG SCROT @@ -83,12 +77,6 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc ; fi \ ; 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 WORKDIR /home/arch/OSX-KVM @@ -200,13 +188,6 @@ RUN sudo pacman -Syyuu --noconfirm \ && tee -a ~/.vnc/config <<< 'localhost' \ && tee -a ~/.vnc/config <<< 'alwaysshared' -# 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 - RUN printf '\n%s\n' \ 'sudo rm -f /tmp/.X99-lock' \ 'export DISPLAY=:99' \ |