From dbeddd89be6bdb04c7e859a30e9e80d7e7175cba Mon Sep 17 00:00:00 2001 From: surtur Date: Mon, 8 Mar 2021 21:37:12 +0100 Subject: [PATCH] dockerfile: revert new-glibc-old-docker fix * the issue that manifested itself when new glibc has been used with older docker was temporarily worked around for this image in bd4c5abe4dca475965548cb8332ef9b9d2a4953c. if you still need this workaround, feel free to revert. ref: https://git.dotya.ml/wanderer/docker-archlinux/commit/bd4c5abe4dca475965548cb8332ef9b9d2a4953c --- Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92edced..6ffe065 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,15 +10,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.license=GPL-3.0 -# 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 -ENV patched_glibc glibc-linux4-2.33-4-x86_64.pkg.tar.zst -RUN curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \ - bsdtar -C / -xvf "$patched_glibc" +# if you need the WORKAROUND for glibc 2.33 and old Docker +# have a look at https://git.dotya.ml/wanderer/docker-archlinux/commit/bd4c5abe4dca475965548cb8332ef9b9d2a4953c + RUN pacman --version -RUN pacman -Syu --ignore glibc --noconfirm --needed +RUN pacman -Syu --noconfirm --needed RUN pacman --noconfirm -Rn $(pacman -Qdtq) || true RUN pacman -Scc && rm -rf /var/cache/pacman/* /var/lib/pacman/sync/* \ rm -rv /tmp/* || true