refactor: Upgraded glibc to 2.41

Author: frol

.github/workflows/build-and-push.yaml

@@ -30,6 +30,6 @@ jobs:
         with:
           pull: true
           push: true
-          tags: frolvlad/alpine-glibc:latest,frolvlad/alpine-glibc:alpine-3.20_glibc-2.34,frolvlad/alpine-glibc:alpine-3_glibc-2.34,frolvlad/alpine-glibc:alpine-3.20,frolvlad/alpine-glibc:alpine-3,frolvlad/alpine-glibc:glibc-2.34
+          tags: frolvlad/alpine-glibc:latest,frolvlad/alpine-glibc:alpine-3.20_glibc-2.41,frolvlad/alpine-glibc:alpine-3_glibc-2.41,frolvlad/alpine-glibc:alpine-3.20,frolvlad/alpine-glibc:alpine-3,frolvlad/alpine-glibc:glibc-2.41
           cache-from: type=registry,ref=frolvlad/alpine-glibc:latest
           cache-to: type=inline

APKBUILD

@@ -1,19 +1,19 @@
 # Maintainer: Sasha Gerrand <[email protected]>
 
 pkgname="glibc"
-pkgver="2.39"
+pkgver="2.41"
 pkgrel="1"
 pkgdesc="GNU C Library compatibility layer"
 arch="aarch64"
 url="https://github.com/sgerrand/alpine-pkg-glibc"
 license="LGPL"
-source="./glibc-bin-$pkgver.tar.gz
+source="./glibc-bin.tar.gz
 ld.so.conf"
 subpackages="$pkgname-bin $pkgname-dev $pkgname-i18n"
 triggers="$pkgname-bin.trigger=/lib:/usr/lib:/usr/glibc-compat/lib"
 
 package() {
-  mkdir -p "$pkgdir/lib" "$pkgdir/usr/glibc-compat/lib/locale" "$pkgdir"/usr/glibc-compat/lib64 "$pkgdir"/etc
+  mkdir -p "$pkgdir"/lib "$pkgdir"/usr/glibc-compat/lib/locale "$pkgdir"/usr/glibc-compat/lib64 "$pkgdir"/etc
   cp -a "$srcdir"/usr "$pkgdir"
   cp "$srcdir"/ld.so.conf "$pkgdir"/usr/glibc-compat/etc/ld.so.conf
   rm "$pkgdir"/usr/glibc-compat/etc/rpc
@@ -28,20 +28,20 @@ package() {
   # set up symbolic links based on architecture
   case "$arch" in
   x86_64)
-    ln -s /usr/glibc-compat/lib/ld-linux-x86_64.so.2 ${pkgdir}/lib/ld-linux-x86_64.so.2
-    ln -s /usr/glibc-compat/lib/ld-linux-x86_64.so.2 ${pkgdir}/usr/glibc-compat/lib64/ld-linux-x86_64.so.2
+    ln -s /usr/glibc-compat/lib/ld-linux-x86_64.so.2 "$pkgdir"/lib/ld-linux-x86_64.so.2
+    ln -s /usr/glibc-compat/lib/ld-linux-x86_64.so.2 "$pkgdir"/usr/glibc-compat/lib64/ld-linux-x86_64.so.2
     ;;
   aarch64)
-    ln -s /usr/glibc-compat/lib/ld-linux-aarch64.so.1 ${pkgdir}/lib/ld-linux-aarch64.so.1
-    ln -s /usr/glibc-compat/lib/ld-linux-aarch64.so.1 ${pkgdir}/usr/glibc-compat/lib64/ld-linux-aarch64.so.1
+    ln -s /usr/glibc-compat/lib/ld-linux-aarch64.so.1 "$pkgdir"/lib/ld-linux-aarch64.so.1
+    ln -s /usr/glibc-compat/lib/ld-linux-aarch64.so.1 "$pkgdir"/usr/glibc-compat/lib64/ld-linux-aarch64.so.1
     ;;
   *)
     echo "not support: $arch"
     exit 1
     ;;
   esac
 
-  ln -s /usr/glibc-compat/etc/ld.so.cache ${pkgdir}/etc/ld.so.cache
+  ln -s /usr/glibc-compat/etc/ld.so.cache "${pkgdir}"/etc/ld.so.cache
 }
 
 bin() {

Dockerfile

@@ -1,56 +1,6 @@
-FROM alpine:3.20 AS remote-builder
-
-ENV LANG=C.UTF-8
-
-# NOTE: Glibc 2.35 package is broken: https://github.com/sgerrand/alpine-pkg-glibc/issues/176, so we stick to 2.34 for now
-RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \
-    ALPINE_GLIBC_PACKAGE_VERSION="2.34-r0" && \
-    ALPINE_GLIBC_BASE_PACKAGE_FILENAME="glibc-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
-    ALPINE_GLIBC_BIN_PACKAGE_FILENAME="glibc-bin-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
-    ALPINE_GLIBC_I18N_PACKAGE_FILENAME="glibc-i18n-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
-    apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
-    echo \
-    "-----BEGIN PUBLIC KEY-----\
-    MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m\
-    y70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu\
-    tOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp\
-    m2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY\
-    KXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc\
-    Zvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m\
-    1QIDAQAB\
-    -----END PUBLIC KEY-----" | sed 's/   */\n/g' > "/etc/apk/keys/sgerrand.rsa.pub" && \
-    wget \
-    "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-    "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-    "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-    mv /etc/nsswitch.conf /etc/nsswitch.conf.bak && \
-    apk add --no-cache --force-overwrite \
-    "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-    "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-    "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-    \
-    mv /etc/nsswitch.conf.bak /etc/nsswitch.conf && \
-    rm "/etc/apk/keys/sgerrand.rsa.pub" && \
-    (/usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true) && \
-    echo "export LANG=$LANG" > /etc/profile.d/locale.sh && \
-    \
-    apk del glibc-i18n && \
-    \
-    rm "/root/.wget-hsts" && \
-    apk del .build-dependencies && \
-    rm \
-    "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
-    "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
-    "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
-
-
 # Stage 1: use docker-glibc-builder build glibc.tar.gz
 FROM ubuntu:22.04 AS builder
 LABEL maintainer="Sasha Gerrand <[email protected]>"
-ARG GLIBC_VERSION=2.39
-ENV DEBIAN_FRONTEND=noninteractive \
-    GLIBC_VERSION=${GLIBC_VERSION} \
-    PREFIX_DIR=/usr/glibc-compat
 RUN apt-get -q update \
     && apt-get -qy install \
     bison \
@@ -61,15 +11,13 @@ RUN apt-get -q update \
     python3 \
     texinfo \
     wget
-COPY configparams /glibc-build/configparams 
+COPY configparams /glibc-build/configparams
 COPY builder /builder
-RUN /builder
+ARG GLIBC_VERSION=2.41
+RUN env PREFIX_DIR=/usr/glibc-compat /builder
 
 # Stage 2: use docker-alpine-abuild package apk and keys
 FROM alpine:3.20 AS packager
-ARG GLIBC_VERSION=2.39
-ARG ALPINE_VERSION=3.20
-ARG TARGETARCH
 RUN apk --no-cache add alpine-sdk coreutils cmake sudo bash \
     && adduser -G abuild -g "Alpine Package Builder" -s /bin/ash -D builder \
     && echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
@@ -79,42 +27,35 @@ COPY ./abuilder /bin/
 USER builder
 ENV PACKAGER="[email protected]" 
 RUN abuild-keygen -na && sudo cp /home/builder/.abuild/${PACKAGER}-*.rsa.pub /etc/apk/keys/
+
 WORKDIR /home/builder/package
-COPY --from=builder /glibc-bin-${GLIBC_VERSION}.tar.gz /home/builder/package/
+COPY --from=builder /glibc-bin.tar.gz /home/builder/package/
 COPY . /home/builder/package/
 
-ENV REPODEST=/packages
+ARG GLIBC_VERSION=2.41
+ARG TARGETARCH
 RUN case "$TARGETARCH" in \
     amd64)   export TARGET_ARCH="x86_64" ;; \
     arm64)   export TARGET_ARCH="aarch64" ;; \
     *)       echo "Unsupported architecture: $TARGETARCH" && exit 1 ;; \
     esac && \
     sed -i "s/^pkgver=.*/pkgver=${GLIBC_VERSION}/" APKBUILD && \
     sed -i "s/^arch=.*$/arch=\"${TARGET_ARCH}\"/" APKBUILD && \
-    abuild checksum && abuilder -r && cp /packages/builder/${TARGET_ARCH}/*.apk /tmp/
+    abuild checksum && \
+    env REPODEST=/packages abuilder -r && \
+    cp /packages/builder/${TARGET_ARCH}/*.apk /tmp/
 
 # Stage 3: apk add apk, build alpine-glibc 
-FROM alpine:3.20
-ARG GLIBC_VERSION=2.39
+FROM alpine:3.21
+ARG GLIBC_VERSION=2.41
 ARG TARGETARCH
-ENV GLIBC_VERSION=${GLIBC_VERSION}
-ENV PACKAGER="[email protected]"
-
-RUN case "$TARGETARCH" in \
+RUN --mount=from=packager,src=/tmp/,dst=/tmp/ \
+    --mount=from=packager,src=/etc/apk/keys,dst=/etc/apk/keys/ \
+    case "$TARGETARCH" in \
     amd64)   export LD_LINUX_PATH="/lib/ld-linux-x86_64.so.2" ;; \
     arm64)   export LD_LINUX_PATH="/lib/ld-linux-aarch64.so.1" ;; \
     *)       echo "Unsupported architecture: $TARGETARCH" && exit 1 ;; \
-    esac
-
-# use the key used during the build process
-COPY --from=packager /tmp/*.apk /tmp/
-COPY --from=packager /home/builder/.abuild/${PACKAGER}-*.pub /etc/apk/keys/
-
-# install glibc APK
-RUN apk add --no-cache gcompat && rm -rf ${LD_LINUX_PATH} && \
+    esac && \
+    apk add --no-cache gcompat && rm ${LD_LINUX_PATH} && \
     apk add --no-cache --force-overwrite /tmp/glibc-${GLIBC_VERSION}-*.apk && \
-    apk add --no-cache /tmp/glibc-bin-${GLIBC_VERSION}-*.apk && \
-    apk add --no-cache /tmp/glibc-i18n-${GLIBC_VERSION}-*.apk && \
-    rm -rf /tmp/*.apk
-
-CMD ["/bin/sh"]
+    apk add --no-cache /tmp/glibc-bin-${GLIBC_VERSION}-*.apk

abuilder

@@ -1,6 +1,6 @@
 #!/usr/bin/env ash
 
-set -e
+set -ex
 
 main() {
   RSA_FILE=$(ls /home/builder/.abuild/${PACKAGER}-*.rsa | head -n 1)

builder

@@ -19,10 +19,8 @@ main() {
 			--enable-multi-arch \
 			--enable-stack-protector=strong
 		make --jobs=4 && make install
-		tar --dereference --hard-dereference -zcf "/glibc-bin-$version.tar.gz" "$prefix"
+		tar --dereference --hard-dereference -zcf "/glibc-bin.tar.gz" "$prefix"
 	} >&2
-
-	# [[ $STDOUT ]] && cat "/glibc-bin-$version.tar.gz"
 }
 
 main "$@"