diff options
| -rw-r--r-- | .github/workflows/docker.yml | 7 | ||||
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eb19e2547..d4023d57c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,13 +16,6 @@ jobs: - archlinux-webengine - archlinux-webengine-unstable steps: - - name: Build latest runc to work around actions/virtual-environments#2698 - run: | - sudo apt-get install libseccomp-dev - git clone https://github.com/opencontainers/runc - cd runc - make - sudo make install - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: 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 %} |