clean VERSION.history

[skip ci]
2026-10-10 12:14:52 +00:00 · 2026-10-10 09:38:01 +00:00 · 2026-10-10 02:14:16 +00:00 · 2026-10-10 00:21:21 +00:00 · 2026-10-09 23:43:40 +00:00 · 2026-10-09 23:17:36 +00:00
8 changed files with 31 additions and 69 deletions
@@ -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[@]}"
@@ -59,14 +59,7 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s

 RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
    echo "sudoers: files sss" >> /etc/nsswitch.conf && \
-    echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0077" >> /etc/pam.d/common-session && \
-    mkdir -p /etc/skel/.config/lxqt && \
-    cat <<'EOF' > /etc/skel/.config/lxqt/lxqt.conf
-[General]
-__userfile__=true
-icon_theme=Adwaita
-theme=KDE-Plasma
-EOF
+    echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0077" >> /etc/pam.d/common-session

 RUN chmod 440 /etc/sudoers && \
    mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
@@ -77,17 +70,10 @@ RUN chmod 440 /etc/sudoers && \
    echo "LANG=${LANG}" >> /etc/environment && \
    echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
    echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
-    echo "#!/bin/sh" > /etc/xrdp/startwm.sh && \
-    echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
-    echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
-    echo "export LC_ALL=${LC_ALL}" >> /etc/xrdp/startwm.sh && \
-    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 startlxqt" >> /etc/xrdp/startwm.sh && \
-    chmod +x /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 && \
+    chmod +x /etc/xrdp/startwm.sh && \
+    mkdir -p /etc/xdg/xfce4 && \
+    echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc

 EXPOSE 3389

@@ -59,14 +59,7 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s

 RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
    echo "sudoers: files sss" >> /etc/nsswitch.conf && \
-    echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0077" >> /etc/pam.d/common-session && \
-    mkdir -p /etc/skel/.config/lxqt && \
-    cat <<'EOF' > /etc/skel/.config/lxqt/lxqt.conf
-[General]
-__userfile__=true
-icon_theme=Adwaita
-theme=KDE-Plasma
-EOF
+    echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0077" >> /etc/pam.d/common-session

 RUN chmod 440 /etc/sudoers && \
    mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
@@ -77,17 +70,10 @@ RUN chmod 440 /etc/sudoers && \
    echo "LANG=${LANG}" >> /etc/environment && \
    echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
    echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
-    echo "#!/bin/sh" > /etc/xrdp/startwm.sh && \
-    echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
-    echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
-    echo "export LC_ALL=${LC_ALL}" >> /etc/xrdp/startwm.sh && \
-    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 startlxqt" >> /etc/xrdp/startwm.sh && \
-    chmod +x /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 && \
+    chmod +x /etc/xrdp/startwm.sh && \
+    mkdir -p /etc/xdg/xfce4 && \
+    echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc

 EXPOSE 3389

@@ -15,8 +15,8 @@ This repository is built and pushed automatically.
 ### 🏗️ Platform Support
 | Architecture | Status | Base Image | Build Date |
 | :--- | :--- | :--- | :--- |
-| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 23:50 |
-| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 23:50 |
+| x86_64 (amd64) | ✅ Active | debian:trixie | 10.10.2026 11:38 |
+| aarch64 (arm64) | ✅ Active | debian:trixie | 10.10.2026 11:38 |

 ---

@@ -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:bookworm-lxqt-de
+    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-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:bookworm-lxqt-de
+docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-xfce-de
 ```
 ### 🚀 2. Run the container directly
 ```bash
@@ -73,24 +73,18 @@ 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:bookworm-lxqt-de
+  git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-xfce-de

 ```

-*Last updated on: 10.10.2026 23:50*
+*Last updated on: 10.10.2026 11:38*

 ### 📜 Version History
 | Version | Date | Status |
 | :--- | :--- | :--- |
-| **bookworm-lxqt-de** | 10.10.2026 23:50 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 19:45 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 19:30 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 18:27 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 17:46 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 17:26 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 17:24 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 17:03 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 16:32 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 15:59 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 15:36 |  ✅ |
-| **bookworm-de-dev** | 10.10.2026 15:29 |  ✅ |
+| **trixie-xfce-de** | 10.10.2026 11:38 |  ✅ |
+| **trixie-xfce-de** | 10.10.2026 04:14 |  ✅ |
+| **bookworm-de** | 10.10.2026 01:08 |  ✅ |
+| **bookworm-de** | 10.10.2026 00:57 |  ✅ |
+| **bookworm-de** | 08.10.2026 23:33 |  ✅ |
+| **trixie-de** | 08.10.2026 22:50 |  ✅ |
@@ -0,0 +1 @@
+
@@ -1,10 +1,10 @@
 ## BASE CONFIG
-DEBIAN_CODENAME=bookworm
+DEBIAN_CODENAME=trixie
 BUILD_COUNTRY=de

 ## BUILD STAGE
 BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
-BUILD_TAG="${DEBIAN_CODENAME}-lxqt-${BUILD_COUNTRY}"
+BUILD_TAG="${DEBIAN_CODENAME}-xfce-${BUILD_COUNTRY}"
 BUILD_TAG_LATEST=n
 BUILD_LANG=de_DE.UTF-8
 BUILD_LANGUAGE=de_DE:de
@@ -1,6 +1,6 @@
 services:
  base-image-debian-rdp-ldap:
-    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-lxqt-de
+    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-xfce-de
    container_name: base-image-debian-rdp-ldap
    restart: unless-stopped
    ports:
@@ -9,16 +9,8 @@ xrdp
 xorgxrdp
 dbus
 dbus-x11
-lxqt-core
-openbox
-papirus-icon-theme
-adwaita-icon-theme
-libqt5svg5
-gvfs
-qterminal
-featherpad
-pcmanfm-qt
-lxqt-sudo
+xfce4
+xfce4-terminal
 xdg-user-dirs
 desktop-base
 sudo
@@ -39,6 +31,7 @@ ninja-build
 pkg-config
 autoconf
 libtool
+thunar-archive-plugin
 xarchiver
 unzip
 zip
Author	SHA1	Message	Date
pi-farm	f360ee3fe6	clean VERSION.history	2026-10-10 12:14:52 +00:00
Gitea Action	988330dcda	[skip ci]	2026-10-10 09:38:01 +00:00
Gitea Action	e78b05d79f	[skip ci]	2026-10-10 02:14:16 +00:00
pi-farm	89aff65487	fix permissions for users-homeshares	2026-10-10 00:21:21 +00:00
pi-farm	46c78fd02b	fix permissions for users-homeshares	2026-10-09 23:43:40 +00:00
pi-farm	928f361958	buildargs.env aktualisiert	2026-10-09 23:17:36 +00:00
pi-farm	6d9bb155dc	buildargs.env aktualisiert	2026-10-09 23:15:10 +00:00
pi-farm	bb2fae505b	trixie-xfce	2026-10-09 23:09:14 +00:00
pi-farm	3eb7ced4a2	add log-output of sssd and xrdp to docker-log	2026-10-09 23:07:10 +00:00
Gitea Action	529f3efe33	[skip ci]	2026-10-09 22:57:33 +00:00
Pi-Farm	c28d77618f	add .vscode/* to .gitignore	2026-10-08 23:47:41 +02:00
Gitea Action	3dfb797c7f	[skip ci]	2026-10-08 21:33:12 +00:00
Pi-Farm	63e5f1a6b9	Merge branch 'dev'	2026-10-08 23:32:06 +02:00
Gitea Action	231b1472f4	[skip ci]	2026-10-08 20:50:30 +00:00
pi-farm	87521be183	VERSION.history aktualisiert	2026-10-08 20:49:25 +00:00
Pi-Farm	2c201f5811	Merge branch 'dev'	2026-10-08 22:47:20 +02:00
pi-farm	25189f800b	revert `2b8b8260b1` build-and-push.yaml / release-and-build (push) Canceled after 5s Details revert add archive-tools	2026-10-07 10:05:39 +00:00
pi-farm	2b8b8260b1	add archive-tools build-and-push.yaml / release-and-build (push) Canceled after 1m48s Details	2026-10-07 10:00:02 +00:00
pi-farm	a2f1c987f8	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Successful in 25m5s Details	2026-10-06 15:59:13 +00:00
pi-farm	2be18e6fd2	README.md aktualisiert build-and-push.yaml / release-and-build (push) Canceled after 16s Details	2026-10-06 15:39:04 +00:00
Gitea Action	0970dbefae	.gitea/workflows/build-and-push.yaml aktualisiert [skip ci]	2026-10-06 15:30:06 +00:00
pi-farm	246e5e85d9	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Successful in 24m23s Details	2026-10-06 15:05:55 +00:00
pi-farm	694b13f01c	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Canceled after 1m11s Details	2026-10-06 15:04:53 +00:00
pi-farm	8786971d24	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Failing after 16s Details	2026-10-06 13:42:43 +00:00
pi-farm	c20986cf6c	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Failing after 2s Details	2026-10-06 13:33:55 +00:00
pi-farm	d16175d16b	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Failing after 2s Details	2026-10-06 13:27:34 +00:00
pi-farm	516ff1a0fa	.gitea/workflows/build-and-push.yaml aktualisiert build-and-push.yaml / release-and-build (push) Failing after 3s Details	2026-10-06 13:24:32 +00:00
Gitea Action	901e9c94f4	[skip ci]	2026-08-09 05:29:22 +00:00
Gitea Action	835ca055c2	[skip ci]	2026-07-19 05:26:02 +00:00
Gitea Action	b5fbadd560	[skip ci]	2026-06-28 05:27:55 +00:00
Gitea Action	b6ed37f3b4	[skip ci]	2026-06-14 05:25:18 +00:00
Gitea Action	ab19e63e94	build trixie-de latest [skip ci]	2026-06-04 11:41:44 +00:00
pi-farm	0609225281	build trixie-de latest / release-and-build (push) Successful in 24m1s Details	2026-06-04 11:17:51 +00:00
Gitea Action	9afb1e0794	Trixie build [skip ci]	2026-06-04 10:25:48 +00:00
pi-farm	5f0b994768	Trixie build / release-and-build (push) Successful in 24m19s Details	2026-06-04 10:01:36 +00:00
Gitea Action	0be6135e52	.gitea/workflows/build-and-push.yaml aktualisiert [skip ci]	2026-06-02 16:17:26 +00:00
pi-farm	ec21aa2b9e	.gitea/workflows/build-and-push.yaml aktualisiert / release-and-build (push) Successful in 18m35s Details	2026-06-02 15:58:56 +00:00
Gitea Action	b27c3e257b	[skip ci]	2026-06-02 15:04:59 +00:00
Gitea Action	284ee7462e	[skip ci]	2026-05-24 05:22:59 +00:00
Gitea Action	4c6c8df7af	[skip ci]	2026-05-10 05:21:05 +00:00
Gitea Action	05d51481d7	[skip ci]	2026-04-26 05:23:16 +00:00
Gitea Action	d5a99d0f88	build for bookworm [skip ci]	2026-04-09 15:19:55 +00:00
pi-farm	b6a8bc1f61	build for bookworm / release-and-build (push) Successful in 18m41s Details	2026-04-09 15:01:17 +00:00
Gitea Action	eaf568bb9e	build for trixie-de [skip ci]	2026-04-09 14:44:37 +00:00
pi-farm	d5d9a5d07c	build for trixie-de / release-and-build (push) Successful in 26m30s Details	2026-04-09 14:18:14 +00:00
Gitea Action	a8870999a7	Merge pull request dev (#2 ) from dev into main Reviewed-on: #2 [skip ci]	2026-04-09 14:15:24 +00:00
pi-farm	9c795a58ee	Merge pull request 'dev' (#2 ) from dev into main / release-and-build (push) Successful in 19m9s Details Reviewed-on: #2	2026-04-09 13:56:20 +00:00