[skip ci]

revert add archive-tools

.gitea/workflows/build-and-push.yaml

@@ -198,12 +198,14 @@ jobs:
             --annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
             "${GITEA_MANIFEST_TAGS[@]}" "${GITEA_SOURCES[@]}"
 
+          # 2. Manifest auf Docker Hub erstellen (aus Docker Hub Temp-Tags!)
           if [[ "$PUSH" == *"dockerhub"* ]]; then
             DH_MANIFEST_TAGS=("-t" "$DOCKERHUB_REPO:$TAG")
             if [[ "$BUILD_TAG_LATEST" == "y" ]]; then
               DH_MANIFEST_TAGS+=("-t" "$DOCKERHUB_REPO:latest")
             fi
 
+            # WICHTIG: Hier werden jetzt als Quelle die Docker Hub Temp-Tags genutzt!
             docker buildx imagetools create \
               --annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
               "${DH_MANIFEST_TAGS[@]}" "${DH_SOURCES[@]}"

Dockerfile

@@ -63,24 +63,17 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
 
 RUN chmod 440 /etc/sudoers && \
     mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
-    mkdir -p /home && chmod 777 /home && \
+    mkdir -p /home && chmod 755 /home && \
     chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \
     chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
     chmod 644 /etc/xrdp/cert.pem && \
     echo "LANG=${LANG}" >> /etc/environment && \
     echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
     echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
-    echo "#!/bin/sh" > /etc/xrdp/startwm.sh && \
+    sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\npulseaudio --start\npactl load-module module-xrdp-sink.so\npactl load-module module-xrdp-source.so' /etc/xrdp/startwm.sh && \
-    echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
+    chmod +x /etc/xrdp/startwm.sh && \
-    echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
+    mkdir -p /etc/xdg/xfce4 && \
-    echo "export LC_ALL=${LC_ALL}" >> /etc/xrdp/startwm.sh && \
+    echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
-    echo "export XDG_SESSION_TYPE=x11" >> /etc/xrdp/startwm.sh && \
-    echo "setxkbmap ${COUNTRY}" >> /etc/xrdp/startwm.sh && \
-    echo "pulseaudio --start" >> /etc/xrdp/startwm.sh && \
-    echo "pactl load-module module-xrdp-sink.so" >> /etc/xrdp/startwm.sh && \
-    echo "pactl load-module module-xrdp-source.so" >> /etc/xrdp/startwm.sh && \
-    echo "exec dbus-launch --exit-with-session mate-session" >> /etc/xrdp/startwm.sh && \
-    chmod +x /etc/xrdp/startwm.sh
 
 EXPOSE 3389
 

Dockerfile.aarch64

@@ -63,24 +63,17 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
 
 RUN chmod 440 /etc/sudoers && \
     mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
-    mkdir -p /home && chmod 777 /home && \
+    mkdir -p /home && chmod 755 /home && \
     chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \
     chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
     chmod 644 /etc/xrdp/cert.pem && \
     echo "LANG=${LANG}" >> /etc/environment && \
     echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
     echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
-    echo "#!/bin/sh" > /etc/xrdp/startwm.sh && \
+    sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\npulseaudio --start\npactl load-module module-xrdp-sink.so\npactl load-module module-xrdp-source.so' /etc/xrdp/startwm.sh && \
-    echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
+    chmod +x /etc/xrdp/startwm.sh && \
-    echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
+    mkdir -p /etc/xdg/xfce4 && \
-    echo "export LC_ALL=${LC_ALL}" >> /etc/xrdp/startwm.sh && \
+    echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
-    echo "export XDG_SESSION_TYPE=x11" >> /etc/xrdp/startwm.sh && \
-    echo "setxkbmap ${COUNTRY}" >> /etc/xrdp/startwm.sh && \
-    echo "pulseaudio --start" >> /etc/xrdp/startwm.sh && \
-    echo "pactl load-module module-xrdp-sink.so" >> /etc/xrdp/startwm.sh && \
-    echo "pactl load-module module-xrdp-source.so" >> /etc/xrdp/startwm.sh && \
-    echo "exec dbus-launch --exit-with-session mate-session" >> /etc/xrdp/startwm.sh && \
-    chmod +x /etc/xrdp/startwm.sh
 
 EXPOSE 3389
 

README.md

@@ -15,8 +15,8 @@ This repository is built and pushed automatically.
 ### 🏗️ Platform Support
 | Architecture | Status | Base Image | Build Date |
 | :--- | :--- | :--- | :--- |
-| x86_64 (amd64) | ✅ Active | debian:trixie | 27.10.2026 23:42 |
+| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 14:31 |
-| aarch64 (arm64) | ✅ Active | debian:trixie | 27.10.2026 23:42 |
+| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 14:31 |
 
 ---
 
@@ -26,7 +26,7 @@ This repository is built and pushed automatically.
 ```yaml
 services:
   base-image-debian-rdp-ldap:
-    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
+    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-xfce-de
     container_name: base-image-debian-rdp-ldap
     restart: unless-stopped
     ports:
@@ -58,7 +58,7 @@ docker compose up -d
 ## 🐳 Method 2: Standalone Container (Docker Run / CLI)
 ### 🚀 1. Pull the image manually
 ```bash
-docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
+docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-xfce-de
 ```
 ### 🚀 2. Run the container directly
 ```bash
@@ -73,14 +73,13 @@ docker run -d \
   -e LDAP_SUDO_GROUP=YOUR-SUDO-USERS-GROUP \
   -v ./YOUR-PERSISTENT-FOLDER:/home \
   -p 3389:3389 \
-  git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
+  git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-xfce-de
 
 ```
 
-*Last updated on: 27.10.2026 23:42*
+*Last updated on: 10.10.2026 14:31*
 
 ### 📜 Version History
 | Version | Date | Status |
 | :--- | :--- | :--- |
-| **trixie-mate-de** | 27.10.2026 23:42 |  ✅ |
+| **bookworm-xfce-de** | 10.10.2026 14:31 |  ✅ |
-| **trixie-mate-de** | 27.10.2026 23:35 |  ✅ |

VERSION.history

@@ -1,2 +1 @@
-| **trixie-mate-de** | 27.10.2026 23:42 |  ✅ |
+| **bookworm-xfce-de** | 10.10.2026 14:31 |  ✅ |
-| **trixie-mate-de** | 27.10.2026 23:35 |  ✅ |

buildargs.env

@@ -1,10 +1,10 @@
 ## BASE CONFIG
-DEBIAN_CODENAME=trixie
+DEBIAN_CODENAME=bookworm
 BUILD_COUNTRY=de
 
 ## BUILD STAGE
 BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
-BUILD_TAG="${DEBIAN_CODENAME}-mate-${BUILD_COUNTRY}"
+BUILD_TAG="${DEBIAN_CODENAME}-xfce-${BUILD_COUNTRY}"
 BUILD_TAG_LATEST=n
 BUILD_LANG=de_DE.UTF-8
 BUILD_LANGUAGE=de_DE:de
@@ -15,6 +15,9 @@ BUILD_APP_NAME=base-image-debian-rdp-ldap
 BUILD_APP_VERSION=1.0.0
 PUSH=dockerhub
 
+## BASE PACKAGES
+BUILD_BASE_PACKAGES="xrdp sssd sssd-tools libpam-sss libnss-sss libsss-sudo ldap-utils ca-certificates dbus-x11 xfce4 xfce4-terminal sudo firefox-esr firefox-esr-l10n-${BUILD_COUNTRY} thunderbird thunderbird-l10n-${BUILD_COUNTRY} locales tzdata keyboard-configuration x11-xkb-utils pulseaudio build-essential dpkg-dev git libpulse-dev meson ninja-build pkg-config autoconf libtool thunar-archive-plugin xarchiver unzip zip p7zip-full tar gzip bzip2 dialog whiptail"
+
 ## ENV STAGE
 ENV_SSSD_DEBUG_LEVEL=5
 ENV_LDAP_URI=ldap://YOUR-LDAP-SERVER:389

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   base-image-debian-rdp-ldap:
-    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
+    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-xfce-de
     container_name: base-image-debian-rdp-ldap
     restart: unless-stopped
     ports:

entrypoint.sh

@@ -30,7 +30,6 @@ ldap_default_authtok = ${LDAP_BIND_PASSWORD}
 
 ldap_schema = rfc2307bis
 ldap_group_member = uniqueMember
-
 ldap_auth_disable_tls_never_use_in_production = true
 ldap_id_use_start_tls = false
 ldap_tls_reqcert = never

packages.txt

@@ -9,9 +9,8 @@ xrdp
 xorgxrdp
 dbus
 dbus-x11
-mate-desktop-environment
+xfce4
-mate-terminal
+xfce4-terminal
-pluma
 xdg-user-dirs
 desktop-base
 sudo