diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-03-08 14:04:56 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-03-08 14:04:56 +0100 |
| commit | 76b03db20eac1d9b52156191656d4c2adb290911 (patch) | |
| tree | 18e484d7fe8d1f6aae6a8e2a57c86a362a460897 | |
| parent | aeb79680b9fffcf62a9ece2b2f200eed5f7042a7 (diff) | |
| download | qutebrowser-76b03db20eac1d9b52156191656d4c2adb290911.tar.gz qutebrowser-76b03db20eac1d9b52156191656d4c2adb290911.zip | |
Revert "ci: Add workaround for Archlinux/Docker issue"
This reverts commit 478e4de7bd1f26bebdcdc166d5369b2b5142c3e2.
Fixed according to https://github.com/actions/virtual-environments/issues/2658
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 7 |
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 %} |