aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorox0spy <ox0spy@gmail.com>2020-03-29 14:05:22 +0000
committerox0spy <ox0spy@gmail.com>2020-03-29 14:05:22 +0000
commite0fdf6fa07459750959d53b857cf7a2ab9ef9127 (patch)
treec2bf9c36c82eca6d76593770bc89cc0a01e8c42a
parentbd4269cb5914bd9e90aaa508fa63f4d7e47e7397 (diff)
Dockerfile: support for non-ASCII characters
-rw-r--r--Dockerfile7
-rw-r--r--Dockerfile.arm8
-rw-r--r--Dockerfile.arm648
3 files changed, 20 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 01b3dd1c2..caac7500a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,15 +45,20 @@ RUN apt-get update \
ca-certificates \
vainfo \
i965-va-driver \
+ locales \
&& apt-get clean autoclean -y\
&& apt-get autoremove -y\
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /cache /config /media \
&& chmod 777 /cache /config /media \
&& ln -s /opt/ffmpeg/bin/ffmpeg /usr/local/bin \
- && ln -s /opt/ffmpeg/bin/ffprobe /usr/local/bin
+ && ln -s /opt/ffmpeg/bin/ffprobe /usr/local/bin \
+ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
EXPOSE 8096
VOLUME /cache /config /media
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 434280855..c5189d6aa 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -52,16 +52,22 @@ RUN apt-get update \
libraspberrypi0 \
vainfo \
libva2 \
+ locales \
&& apt-get remove curl gnupg -y \
&& apt-get clean autoclean -y \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /cache /config /media \
- && chmod 777 /cache /config /media
+ && chmod 777 /cache /config /media \
+ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
+
COPY --from=builder /jellyfin /jellyfin
COPY --from=web-builder /dist /jellyfin/jellyfin-web
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
EXPOSE 8096
VOLUME /cache /config /media
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 15421a889..1a691b572 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -42,15 +42,21 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
libfreetype6 \
libomxil-bellagio0 \
libomxil-bellagio-bin \
+ locales \
&& apt-get clean autoclean -y \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /cache /config /media \
- && chmod 777 /cache /config /media
+ && chmod 777 /cache /config /media \
+ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
+
COPY --from=builder /jellyfin /jellyfin
COPY --from=web-builder /dist /jellyfin/jellyfin-web
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
EXPOSE 8096
VOLUME /cache /config /media