From 42b8f4bd22ebb5bb50bd984120eef8db505a9194 Mon Sep 17 00:00:00 2001 From: Tuschl Date: Sun, 8 Jan 2023 19:27:20 +0100 Subject: [PATCH] Regroup commands in Dockerfile --- Dockerfile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a9d457..0d5a248 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ FROM ubuntu:latest -LABEL version="1.0" maintainer="John Stucklen " +LABEL version="1.1" maintainer="John Stucklen " +ENV LC_ALL en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en ENV SUBSONIC_UID 1000 ENV SUBSONIC_GID 1000 @@ -11,21 +14,16 @@ RUN apt update \ && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - locale-gen -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en + locale-gen && \ + localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -RUN mkdir -p /opt/subsonic \ - && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - -RUN wget --no-check-certificate https://s3-eu-west-1.amazonaws.com/subsonic-public/download/subsonic-6.1.6-standalone.tar.gz \ - && tar xvzf subsonic-6.1.6-standalone.tar.gz -C /opt/subsonic \ - && rm -rf subsonic-6.1.6-standalone.tar.gz +RUN mkdir -p /opt/subsonic && \ + wget --no-check-certificate https://s3-eu-west-1.amazonaws.com/subsonic-public/download/subsonic-6.1.6-standalone.tar.gz && \ + tar xvzf subsonic-6.1.6-standalone.tar.gz -C /opt/subsonic && \ + rm -rf subsonic-6.1.6-standalone.tar.gz COPY mikmod_stdout /opt/subsonic COPY timidity_stdout /opt/subsonic - COPY entrypoint.sh /opt/subsonic/entrypoint.sh WORKDIR /opt/subsonic