summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-02-15 14:22:18 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-02-15 14:22:18 +0100
commit8fccc17bd846a3e00c4c3afaad29738800dc6b54 (patch)
tree602fe541240bb8f87351a86e27b3bada76ba6854 /scripts
parent7bf76237fddfb142a37918dd26ef148601c668b9 (diff)
downloadqutebrowser-8fccc17bd846a3e00c4c3afaad29738800dc6b54.tar.gz
qutebrowser-8fccc17bd846a3e00c4c3afaad29738800dc6b54.zip
Revert "ci: Add workaround for Archlinux/Docker issue"
This reverts commit 478e4de7bd1f26bebdcdc166d5369b2b5142c3e2. Maybe not needed anymore after https://bugs.archlinux.org/task/69563#comment196734
Diffstat (limited to 'scripts')
-rw-r--r--scripts/dev/ci/docker/Dockerfile.j27
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2
index 03e5684ad..d3fc82793 100644
--- a/scripts/dev/ci/docker/Dockerfile.j2
+++ b/scripts/dev/ci/docker/Dockerfile.j2
@@ -1,12 +1,5 @@
FROM archlinux:latest
-# WORKAROUND for glibc 2.33 and old Docker
-# See https://github.com/actions/virtual-environments/issues/2658
-# Thanks to https://github.com/lxqt/lxqt-panel/pull/1562
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
- curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
- bsdtar -C / -xvf "$patched_glibc"
-
{% if unstable %}
RUN sed -i '/^# after the header/a[kde-unstable]\nInclude = /etc/pacman.d/mirrorlist\n\n[testing]\nInclude = /etc/pacman.d/mirrorlist' /etc/pacman.conf
{% endif %}