diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2020-04-04 01:35:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 01:35:17 -0400 |
| commit | 1aba4506be5e09c280df197e74582641d3c2c0d7 (patch) | |
| tree | 0397e57e284e4de2606b92a7f73df3e379391a30 | |
| parent | 8f8b5d2422896ea956e8ddb75fa15ffb08002fc0 (diff) | |
| parent | e0fdf6fa07459750959d53b857cf7a2ab9ef9127 (diff) | |
Merge pull request #2708 from ox0spy/master
Dockerfile: support for non-ASCII characters
| -rw-r--r-- | Dockerfile | 7 | ||||
| -rw-r--r-- | Dockerfile.arm | 8 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 8 |
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 |