feat: moved locales from steam to base-app

games-on-whales · Aug 24, 2024 · 9ee5f89 · 9ee5f89
1 parent a536351
commit 9ee5f89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/images/base-app/Dockerfile b/images/base-app/Dockerfile
@@ -48,13 +48,19 @@ ARG REQUIRED_PACKAGES="\
     mesa-vulkan-drivers libgbm1 libgles2 libegl1 libgl1-mesa-dri \
     libnvidia-egl-wayland1 libnvidia-egl-gbm1 \
     fonts-noto-cjk \
+    locales \
     "
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
     $REQUIRED_PACKAGES && \
     rm -rf /var/lib/apt/lists/*
 
+# Some games with native Linux ports require en_US.UTF-8
+# to be generated regardless of user locale settings
+# see: https://github.com/games-on-whales/gow/pull/185
+RUN locale-gen en_US.UTF-8
+
 #################################
 # GAMESCOPE
 ####

diff --git a/images/steam/Dockerfile b/images/steam/Dockerfile
@@ -49,7 +49,6 @@ ARG REQUIRED_PACKAGES=" \
     dbus-daemon dbus-system-bus-common dbus-session-bus-common whoopsie network-manager bluez \
     mangoapp ibus curl pkexec xz-utils zenity file xdg-user-dirs xdg-utils lsof pciutils lsb-release mesa-utils \
     libfontconfig1:i386 libfontconfig1:amd64 libfreetype6 libfreetype6:i386 \
-    locales \
 "
 
 RUN apt-get update -y && \
@@ -77,10 +76,6 @@ RUN rm /usr/bin/zenity && ln -s /usr/bin/true /usr/bin/zenity
 # refresh system font cache. For font warnings on startup see: https://github.com/ValveSoftware/steam-runtime/issues/482
 RUN fc-cache -f -v
 
-# Some games with native Linux ports require en_US.UTF-8
-# to be generated regardless of user locale settings
-RUN locale-gen en_US.UTF-8
-
 COPY --chmod=777 scripts/startup.sh /opt/gow/startup-app.sh
 COPY --chmod=777 scripts/system-services.sh /etc/cont-init.d/system-services.sh
 COPY --chmod=777 steamos-update /usr/bin/steamos-update