Skip to content

Commit 61a16e9

Browse files
balasankarcRobert Marshall
andcommitted
Merge branch 'add-missing-locales' into 'master'
Add missing locales for compatibility See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7448 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Hossein Pursultani <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Robert Marshall <[email protected]>
2 parents e108dc7 + 76ea027 commit 61a16e9

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

docker/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,24 @@ SHELL ["/bin/sh", "-c"]
66
# Default to supporting utf-8
77
ENV LANG=C.UTF-8
88

9+
# Explicitly set supported locales
10+
COPY locale.gen /etc/locale.gen
11+
912
# Install required packages
1013
RUN apt-get update -q \
1114
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
1215
busybox \
1316
ca-certificates \
17+
locales \
1418
openssh-server \
1519
tzdata \
1620
wget \
1721
perl \
1822
libperl5.34 \
23+
&& locale-gen \
24+
&& cp -a /usr/lib/locale/locale-archive /tmp/locale-archive \
25+
&& DEBIAN_FRONTEND=noninteractive apt-get purge -yq locales \
26+
&& mv /tmp/locale-archive /usr/lib/locale/locale-archive \
1927
&& rm -rf /var/lib/apt/lists/*
2028

2129
# Use BusyBox

docker/locale.gen

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
C.UTF-8 UTF-8
2+
en_US.UTF-8 UTF-8

0 commit comments

Comments
 (0)