Dockerfile aktualisiert

Dockerfile

@@ -5,15 +5,19 @@ FROM ${BASE_IMAGE}
 ARG MAINTAINER
 ARG TZ
 ARG APP_NAME
+ARG LANG
+ARG LANGUAGE
+ARG LC_ALL
+ARG COUNTRY
 
 LABEL maintainer="${MAINTAINER}"
 LABEL org.opencontainers.image.title="${APP_NAME}"
 
 ENV TZ=${TZ}
-ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG=${LANG}
-ENV LANG=de_DE.UTF-8
+ENV LANGUAGE=${LANGUAGE}
-ENV LANGUAGE=de_DE:de
+ENV LC_ALL=${LC_ALL}
-ENV LC_ALL=de_DE.UTF-8
+ENV COUNTRY=${COUNTRY}
 
 RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources && \
     apt-get update && apt-get install -y \
@@ -29,14 +33,13 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
     xfce4-terminal \
     sudo \
     firefox-esr \
-    firefox-esr-l10n-de \
+    firefox-esr-l10n-${COUNTRY} \
     thunderbird \
-    thunderbird-l10n-de \
+    thunderbird-l10n-${COUNTRY} \
     locales \
     tzdata \
     keyboard-configuration \
-    x11-xkb-utils && \
+    x11-xkb-utils \
-    apt-get install -y \
     pulseaudio \
     build-essential \
     dpkg-dev \
@@ -75,12 +78,12 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
     dpkg-reconfigure -f noninteractive tzdata && \
     cat > /etc/default/keyboard <<'EOF'
 XKBMODEL="pc105"
-XKBLAYOUT="de"
+XKBLAYOUT="${COUNTRY}"
 XKBVARIANT=""
 XKBOPTIONS=""
 BACKSPACE="guess"
-EOF && \
+EOF \
-    dpkg-reconfigure -f noninteractive keyboard-configuration
+    && dpkg-reconfigure -f noninteractive keyboard-configuration
 
 COPY config/pam/ /etc/pam.d/
 COPY config/nsswitch.conf /etc/nsswitch.conf
@@ -101,7 +104,7 @@ RUN chmod 440 /etc/sudoers && \
     sed -i '1i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}' /etc/xrdp/startwm.sh && \
     chmod +x /etc/xrdp/startwm.sh && \
     mkdir -p /etc/xdg/xfce4 && \
-    echo "setxkbmap de" >> /etc/xdg/xfce4/xinitrc
+    echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
 
 EXPOSE 3389