From d60234434db13549306a596dcdc95d4f81bdef0b Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 18 Jun 2024 12:22:05 +0000
Subject: [PATCH] add english locale, fixes #4321
Closes #4321
Merge request studip/studip!3120
---
docker/studip/Dockerfile | 6 ++++++
docker/studip/Dockerfile-Dev | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index fe9fc8cb086..92eb5b53365 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -12,9 +12,15 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libwebp-dev \
+ locales \
vim \
&& rm -rf /var/lib/apt/lists/*
+# Install locales
+RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
+ && dpkg-reconfigure --frontend=noninteractive locales \
+ && update-locale
+
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-webp
RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl
diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev
index 112825a8858..3c2b2c5b223 100644
--- a/docker/studip/Dockerfile-Dev
+++ b/docker/studip/Dockerfile-Dev
@@ -12,9 +12,15 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libwebp-dev \
+ locales \
vim \
&& rm -rf /var/lib/apt/lists/*
+# Install locales
+RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
+ && dpkg-reconfigure --frontend=noninteractive locales \
+ && update-locale
+
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-webp
RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
--
GitLab