Merge pull request #1159 from lfittl/use-locale-gen

Debian images: Use locale-gen instead of localdef
docker-library · Dec 7, 2023 · 018d576 · 018d576
2 parents 3a515c2 + a42b684
commit 018d576
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 13 deletions.
diff --git a/11/bookworm/Dockerfile b/11/bookworm/Dockerfile
diff --git a/11/bullseye/Dockerfile b/11/bullseye/Dockerfile
diff --git a/12/bookworm/Dockerfile b/12/bookworm/Dockerfile
diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile
diff --git a/13/bookworm/Dockerfile b/13/bookworm/Dockerfile
diff --git a/13/bullseye/Dockerfile b/13/bullseye/Dockerfile
diff --git a/14/bookworm/Dockerfile b/14/bookworm/Dockerfile
diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile
diff --git a/15/bookworm/Dockerfile b/15/bookworm/Dockerfile
diff --git a/15/bullseye/Dockerfile b/15/bullseye/Dockerfile
diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile
diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -49,7 +49,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \