chore(docker): Remove obsolete glibc workaround, fixed upstream

theleagueof · Apr 18, 2021 · 7020d67 · 7020d67
1 parent b4820cb
commit 7020d67
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 46 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,9 +4,6 @@ ARG ARCHTAG
 
 FROM docker.io/library/archlinux:base-$ARCHTAG AS base
 
-# Monkey patch glibc to avoid issues with old kernels on hosts
-RUN --mount=type=bind,target=/mp,source=build-aux/docker-glibc-workaround.sh /mp
-
 # Setup Caleb’s hosted Arch repository with prebuilt dependencies
 RUN pacman-key --init && pacman-key --populate
 RUN sed -i  /etc/pacman.conf -e \

diff --git a/Makefile.am b/Makefile.am
@@ -26,7 +26,7 @@ fontship_SOURCES = Cargo.toml build.rs src/main.rs $(_fontship_libs) $(_fontship
 EXTRA_fontship_SOURCES = Cargo.lock
 EXTRA_DIST = requirements.txt
 EXTRA_DIST += build-aux/cargo-updater.js build-aux/git-version-gen
-EXTRA_DIST += Dockerfile build-aux/bootstrap-docker.sh build-aux/docker-glibc-workaround.sh hooks/build
+EXTRA_DIST += Dockerfile build-aux/bootstrap-docker.sh hooks/build
 
 BUILT_SOURCES = .version
 CLEANFILES = $(BUILT_SOURCES) .version-prev $(bin_PROGRAMS) fontship-$(VERSION).md

diff --git a/build-aux/docker-glibc-workaround.sh b/build-aux/docker-glibc-workaround.sh