diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-02-15 14:24:27 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-02-15 14:24:27 +0100 |
| commit | 8ba1a28fa5d4c782e0f2e2cac67d052d1b11481b (patch) | |
| tree | 4aaff5ce79d5f06daf724f2fef15d9ff282580e8 /scripts | |
| parent | 8fccc17bd846a3e00c4c3afaad29738800dc6b54 (diff) | |
| download | qutebrowser-8ba1a28fa5d4c782e0f2e2cac67d052d1b11481b.tar.gz qutebrowser-8ba1a28fa5d4c782e0f2e2cac67d052d1b11481b.zip | |
Revert "Revert "ci: Add workaround for Archlinux/Docker issue""
This reverts commit 8fccc17bd846a3e00c4c3afaad29738800dc6b54.
Still broken unfortunately (probably on GitHub's side)...
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 %} |