dev #2

Merged
pi-farm merged 66 commits from dev into main 2026-04-09 13:56:20 +00:00
Showing only changes of commit 6d2e6aab61 - Show all commits

View File

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