wanderer/docker-archlinux
1
0
Fork 0
Code Issues 1 Pull Requests Releases 8 Activity

dockerfile: revert new-glibc-old-docker fix
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
* 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: bd4c5abe4d
This commit is contained in:
surtur 2021-03-08 21:37:12 +01:00
parent 2d15e3f2dc
commit dbeddd89be
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -10,15 +10,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.license=GPL-3.0 org.label-schema.license=GPL-3.0
# WORKAROUND for glibc 2.33 and old Docker # if you need the WORKAROUND for glibc 2.33 and old Docker
# See https://github.com/actions/virtual-environments/issues/2658 # have a look at https://git.dotya.ml/wanderer/docker-archlinux/commit/bd4c5abe4dca475965548cb8332ef9b9d2a4953c
# 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"
RUN pacman --version RUN pacman --version
RUN pacman -Syu --ignore glibc --noconfirm --needed RUN pacman -Syu --noconfirm --needed
RUN pacman --noconfirm -Rn $(pacman -Qdtq) || true RUN pacman --noconfirm -Rn $(pacman -Qdtq) || true
RUN pacman -Scc && rm -rf /var/cache/pacman/* /var/lib/pacman/sync/* \ RUN pacman -Scc && rm -rf /var/cache/pacman/* /var/lib/pacman/sync/* \
rm -rv /tmp/* || true rm -rv /tmp/* || true