fix(docker): Setup system locales in containers where it actually counts, not before

Author: alerque

Dockerfile

@@ -7,22 +7,11 @@ FROM docker.io/library/archlinux:base-devel$ARCHTAG AS builder
 ARG RUNTIME_DEPS
 ARG BUILD_DEPS
 
-# Enable system locales for everything we have localizations for so tools like
-# `date` will output matching localized strings. By default Arch Docker images
-# have almost all locale data stripped out. This also makes it easier to
-# rebuild custom Docker images with extra languages supported.
-RUN sed -i -e '/^NoExtract.*locale/d' /etc/pacman.conf
-
 # Freshen all base system packages
 RUN pacman-key --init
 RUN pacman --needed --noconfirm -Syq archlinux-keyring
 RUN pacman --needed --noconfirm -Suq
 
-# Make sure *at least* glibc actually got reinstalled after enabling
-# extraaction of locale files even if the version was fresh so we can use the
-# locale support out of it later.
-RUN pacman --noconfirm -Sq glibc && yes | pacman -Sccq
-
 # Install run-time dependencies
 RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS $BUILD_DEPS
 
@@ -32,10 +21,6 @@ ARG REVISION
 COPY ./ /src
 WORKDIR /src
 
-# Rebuild locale database after having added our supported locales.
-RUN ls i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/SUPPORTED > /etc/locale.gen
-RUN locale-gen
-
 # GitHub Actions builder stopped providing git history :(
 # See feature request at https://github.com/actions/runner/issues/767
 RUN build-aux/docker-bootstrap.sh
@@ -58,6 +43,12 @@ ARG REVISION
 # Allow `su` with no root password so non-priv users can install dependencies
 RUN sed -i -e '/.so$/s/$/ nullok/' /etc/pam.d/su
 
+# Enable system locales for everything we have localizations for so tools like
+# `date` will output matching localized strings. By default Arch Docker images
+# have almost all locale data stripped out. This also makes it easier to
+# rebuild custom Docker images with extra languages supported.
+RUN sed -i -e '/^NoExtract.*locale/d' /etc/pacman.conf
+
 # Set system locale to something other than 'C' that resolves to a real language
 ENV LANG=en_US.UTF-8
 
@@ -66,6 +57,11 @@ RUN pacman-key --init
 RUN pacman --needed --noconfirm -Syq archlinux-keyring && yes | pacman -Sccq
 RUN pacman --needed --noconfirm -Suq && yes | pacman -Sccq
 
+# Make sure *at least* glibc actually got reinstalled after enabling
+# extraction of locale files even if the version was fresh so we can use the
+# locale support out of it later.
+RUN pacman --noconfirm -Sq glibc && yes | pacman -Sccq
+
 # Install run-time dependencies
 RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS && yes | pacman -Sccq
 
@@ -82,6 +78,11 @@ COPY build-aux/docker-fontconfig.conf /etc/fonts/conf.d/99-docker.conf
 
 COPY --from=builder /pkgdir /
 COPY --from=builder /src/src/sile-entry.sh /usr/local/bin
+
+# Rebuild locale database after having added our supported locales.
+RUN ls /usr/local/share/sile/i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/SUPPORTED > /etc/locale.gen
+RUN locale-gen
+
 RUN sile --version
 
 WORKDIR /data