diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-02-18 10:15:43 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-02-18 10:15:43 +0100 |
| commit | 30d54c8da4a8e091dbe439770d4e1796dc7c78dc (patch) | |
| tree | c8610daadf49abf93eaf011ff3036151d682b987 /scripts | |
| parent | c7d7e192329c7e354d5639f5275b2b494141217e (diff) | |
| download | qutebrowser-30d54c8da4a8e091dbe439770d4e1796dc7c78dc.tar.gz qutebrowser-30d54c8da4a8e091dbe439770d4e1796dc7c78dc.zip | |
Revert "ci: Use different workaround for Archlinux docker"
This reverts commit 545e37b913f9db7efaff22074372ebba4c794986.
Doesn't actually seem to work...
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index d3fc82793..03e5684ad 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -1,5 +1,12 @@ 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 %} |