Merge upstream & Update to 16.9.2

.github/workflows/build.yml

@@ -21,11 +21,11 @@ jobs:
       matrix:
         include:
           - RELEASE_PACKAGE: gitlab-ce
-            RELEASE_VERSION: 16.9.1-ce.0
-            PUSH_TAGS: 16.9.1-ce.0,16.9.1-ce,16.9-ce,16-ce,ce,latest
+            RELEASE_VERSION: 16.9.2-ce.0
+            PUSH_TAGS: 16.9.2-ce.0,16.9.2-ce,16.9-ce,16-ce,ce,latest
           - RELEASE_PACKAGE: gitlab-ee
-            RELEASE_VERSION: 16.9.1-ee.0
-            PUSH_TAGS: 16.9.1-ee.0,16.9.1-ee,16.9-ee,16-ee,ee
+            RELEASE_VERSION: 16.9.2-ee.0
+            PUSH_TAGS: 16.9.2-ee.0,16.9.2-ee,16.9-ee,16-ee,ee
 
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -10,17 +10,25 @@ SHELL ["/bin/sh", "-c"]
 # Default to supporting utf-8
 ENV LANG=C.UTF-8
 
+# Explicitly set supported locales
+COPY locale.gen /etc/locale.gen
+
 # Install required packages
 RUN apt-get update -q \
     && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
       busybox \
       ca-certificates \
+      locales \
       openssh-server \
       tzdata \
       wget \
       perl \
       libperl5.34 \
       libatomic1 \
+    && locale-gen \
+    && cp -a /usr/lib/locale/locale-archive /tmp/locale-archive \
+    && DEBIAN_FRONTEND=noninteractive apt-get purge -yq locales \
+    && mv /tmp/locale-archive /usr/lib/locale/locale-archive \
     && rm -rf /var/lib/apt/lists/*
 
 # Use BusyBox

locale.gen

@@ -0,0 +1,2 @@
+C.UTF-8 UTF-8
+en_US.UTF-8 UTF-8