Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
785883c6f5 | ||
|
|
f6cced1d7c | ||
|
|
b2aff37a44 | ||
|
|
93debacc30 | ||
|
|
d670acddec | ||
|
|
c1a13835e6 | ||
|
|
19a52d20fc | ||
|
|
c84790ec5a | ||
|
|
359a537a61 | ||
|
|
258a6e072f | ||
|
|
9050c7baf3 | ||
|
|
3dc20ced31 | ||
|
|
73bb575d79 | ||
|
|
37528f087a | ||
|
|
9a447a8166 | ||
|
|
923abce325 | ||
|
|
1296b2a484 | ||
|
|
15812c1c08 | ||
|
|
862e9f24b3 |
No files matched your search
+13
-6
@@ -59,21 +59,28 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
|
|||||||
|
|
||||||
RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
||||||
echo "sudoers: files sss" >> /etc/nsswitch.conf && \
|
echo "sudoers: files sss" >> /etc/nsswitch.conf && \
|
||||||
echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0022" >> /etc/pam.d/common-session
|
echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0077" >> /etc/pam.d/common-session
|
||||||
|
|
||||||
RUN chmod 440 /etc/sudoers && \
|
RUN chmod 440 /etc/sudoers && \
|
||||||
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
|
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
|
||||||
mkdir -p /home && chmod 755 /home && \
|
mkdir -p /home && chmod 777 /home && \
|
||||||
chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \
|
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 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
|
||||||
chmod 644 /etc/xrdp/cert.pem && \
|
chmod 644 /etc/xrdp/cert.pem && \
|
||||||
echo "LANG=${LANG}" >> /etc/environment && \
|
echo "LANG=${LANG}" >> /etc/environment && \
|
||||||
echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
|
echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
|
||||||
echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
|
echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
|
||||||
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 "#!/bin/sh" > /etc/xrdp/startwm.sh && \
|
||||||
chmod +x /etc/xrdp/startwm.sh && \
|
echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
|
||||||
mkdir -p /etc/xdg/xfce4 && \
|
echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
|
||||||
echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
|
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 mate-session" >> /etc/xrdp/startwm.sh && \
|
||||||
|
chmod +x /etc/xrdp/startwm.sh
|
||||||
|
|
||||||
EXPOSE 3389
|
EXPOSE 3389
|
||||||
|
|
||||||
|
|||||||
+14
-11
@@ -55,29 +55,32 @@ 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 && \
|
||||||
printf 'XKBMODEL="pc105"\nXKBLAYOUT="%s"\nXKBVARIANT=""\nXKBOPTIONS=""\nBACKSPACE="guess"\n' "${COUNTRY}" > /etc/default/keyboard && \
|
printf 'XKBMODEL="pc105"\nXKBLAYOUT="%s"\nXKBVARIANT=""\nXKBOPTIONS=""\nBACKSPACE="guess"\n' "${COUNTRY}" > /etc/default/keyboard && \
|
||||||
dpkg-reconfigure -f noninteractive keyboard-configuration && \
|
dpkg-reconfigure -f noninteractive keyboard-configuration && \
|
||||||
rm -rf /var/lib/apt/lists/* /tmp/packages.txt
|
rm -rf /var/lib/apt/lists/* /tmp/packages.txt
|
||||||
|
|
||||||
# NEU: Systemweite statische Konfigurationen für LDAP/PAM/Sudo
|
|
||||||
# 1. Entfernt die gefährliche %users Regel
|
|
||||||
# 2. Sagt nsswitch, dass Sudoers auch im SSS (LDAP) gesucht werden sollen
|
|
||||||
# 3. Aktiviert das automatische Erstellen von Home-Verzeichnissen (mkhomedir)
|
|
||||||
RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
||||||
echo "sudoers: files sss" >> /etc/nsswitch.conf && \
|
echo "sudoers: files sss" >> /etc/nsswitch.conf && \
|
||||||
echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0022" >> /etc/pam.d/common-session
|
echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0077" >> /etc/pam.d/common-session
|
||||||
|
|
||||||
RUN chmod 440 /etc/sudoers && \
|
RUN chmod 440 /etc/sudoers && \
|
||||||
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
|
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
|
||||||
mkdir -p /home && chmod 755 /home && \
|
mkdir -p /home && chmod 777 /home && \
|
||||||
chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \
|
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 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
|
||||||
chmod 644 /etc/xrdp/cert.pem && \
|
chmod 644 /etc/xrdp/cert.pem && \
|
||||||
echo "LANG=${LANG}" >> /etc/environment && \
|
echo "LANG=${LANG}" >> /etc/environment && \
|
||||||
echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
|
echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
|
||||||
echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
|
echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
|
||||||
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 "#!/bin/sh" > /etc/xrdp/startwm.sh && \
|
||||||
chmod +x /etc/xrdp/startwm.sh && \
|
echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
|
||||||
mkdir -p /etc/xdg/xfce4 && \
|
echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
|
||||||
echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
|
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 mate-session" >> /etc/xrdp/startwm.sh && \
|
||||||
|
chmod +x /etc/xrdp/startwm.sh
|
||||||
|
|
||||||
EXPOSE 3389
|
EXPOSE 3389
|
||||||
|
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ This repository is built and pushed automatically.
|
|||||||
### 🏗️ Platform Support
|
### 🏗️ Platform Support
|
||||||
| Architecture | Status | Base Image | Build Date |
|
| Architecture | Status | Base Image | Build Date |
|
||||||
| :--- | :--- | :--- | :--- |
|
| :--- | :--- | :--- | :--- |
|
||||||
| x86_64 (amd64) | ✅ Active | debian:bookworm | 08.10.2026 23:12 |
|
| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 14:48 |
|
||||||
| aarch64 (arm64) | ✅ Active | debian:bookworm | 08.10.2026 23:12 |
|
| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 14:48 |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ This repository is built and pushed automatically.
|
|||||||
```yaml
|
```yaml
|
||||||
services:
|
services:
|
||||||
base-image-debian-rdp-ldap:
|
base-image-debian-rdp-ldap:
|
||||||
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
|
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||||
container_name: base-image-debian-rdp-ldap
|
container_name: base-image-debian-rdp-ldap
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
@@ -58,7 +58,7 @@ docker compose up -d
|
|||||||
## 🐳 Method 2: Standalone Container (Docker Run / CLI)
|
## 🐳 Method 2: Standalone Container (Docker Run / CLI)
|
||||||
### 🚀 1. Pull the image manually
|
### 🚀 1. Pull the image manually
|
||||||
```bash
|
```bash
|
||||||
docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
|
docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||||
```
|
```
|
||||||
### 🚀 2. Run the container directly
|
### 🚀 2. Run the container directly
|
||||||
```bash
|
```bash
|
||||||
@@ -73,27 +73,13 @@ docker run -d \
|
|||||||
-e LDAP_SUDO_GROUP=YOUR-SUDO-USERS-GROUP \
|
-e LDAP_SUDO_GROUP=YOUR-SUDO-USERS-GROUP \
|
||||||
-v ./YOUR-PERSISTENT-FOLDER:/home \
|
-v ./YOUR-PERSISTENT-FOLDER:/home \
|
||||||
-p 3389:3389 \
|
-p 3389:3389 \
|
||||||
git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
|
git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
*Last updated on: 08.10.2026 23:12*
|
*Last updated on: 10.10.2026 14:48*
|
||||||
|
|
||||||
### 📜 Version History
|
### 📜 Version History
|
||||||
| Version | Date | Status |
|
| Version | Date | Status |
|
||||||
| :--- | :--- | :--- |
|
| :--- | :--- | :--- |
|
||||||
| **bookworm-de-dev** | 08.10.2026 23:12 | ✅ |
|
| **bookworm-mate-de** | 10.10.2026 14:48 | ✅ |
|
||||||
| **trixie-de-dev** | 08.10.2026 22:15 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 20:57 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 17:56 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 17:30 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 17:04 | entrypoint.sh aktualisiert ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 15:39 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 15:20 | fix typo ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 15:17 | fix dbus container-restart ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 14:21 | ✅ |
|
|
||||||
| **bookworm-de-dev** | 08.10.2026 14:01 | ✅ |
|
|
||||||
| **bookworm-de-dev** | 08.10.2026 13:52 | ✅ |
|
|
||||||
| **bookworm-de-dev** | 08.10.2026 12:51 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 12:32 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 12:27 | ✅ |
|
|
||||||
+1
-15
@@ -1,15 +1 @@
|
|||||||
| **bookworm-de-dev** | 08.10.2026 23:12 | ✅ |
|
| **bookworm-mate-de** | 10.10.2026 14:48 | ✅ |
|
||||||
| **trixie-de-dev** | 08.10.2026 22:15 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 20:57 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 17:56 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 17:30 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 17:04 | entrypoint.sh aktualisiert ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 15:39 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 15:20 | fix typo ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 15:17 | fix dbus container-restart ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 14:21 | ✅ |
|
|
||||||
| **bookworm-de-dev** | 08.10.2026 14:01 | ✅ |
|
|
||||||
| **bookworm-de-dev** | 08.10.2026 13:52 | ✅ |
|
|
||||||
| **bookworm-de-dev** | 08.10.2026 12:51 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 12:32 | ✅ |
|
|
||||||
| **trixie-de-dev** | 08.10.2026 12:27 | ✅ |
|
|
||||||
+1
-4
@@ -4,7 +4,7 @@ BUILD_COUNTRY=de
|
|||||||
|
|
||||||
## BUILD STAGE
|
## BUILD STAGE
|
||||||
BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
|
BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
|
||||||
BUILD_TAG="${DEBIAN_CODENAME}-${BUILD_COUNTRY}"
|
BUILD_TAG="${DEBIAN_CODENAME}-mate-${BUILD_COUNTRY}"
|
||||||
BUILD_TAG_LATEST=n
|
BUILD_TAG_LATEST=n
|
||||||
BUILD_LANG=de_DE.UTF-8
|
BUILD_LANG=de_DE.UTF-8
|
||||||
BUILD_LANGUAGE=de_DE:de
|
BUILD_LANGUAGE=de_DE:de
|
||||||
@@ -15,9 +15,6 @@ BUILD_APP_NAME=base-image-debian-rdp-ldap
|
|||||||
BUILD_APP_VERSION=1.0.0
|
BUILD_APP_VERSION=1.0.0
|
||||||
PUSH=dockerhub
|
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 STAGE
|
||||||
ENV_SSSD_DEBUG_LEVEL=5
|
ENV_SSSD_DEBUG_LEVEL=5
|
||||||
ENV_LDAP_URI=ldap://YOUR-LDAP-SERVER:389
|
ENV_LDAP_URI=ldap://YOUR-LDAP-SERVER:389
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
base-image-debian-rdp-ldap:
|
base-image-debian-rdp-ldap:
|
||||||
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
|
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||||
container_name: base-image-debian-rdp-ldap
|
container_name: base-image-debian-rdp-ldap
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
+19
-1
@@ -30,6 +30,7 @@ ldap_default_authtok = ${LDAP_BIND_PASSWORD}
|
|||||||
|
|
||||||
ldap_schema = rfc2307bis
|
ldap_schema = rfc2307bis
|
||||||
ldap_group_member = uniqueMember
|
ldap_group_member = uniqueMember
|
||||||
|
|
||||||
ldap_auth_disable_tls_never_use_in_production = true
|
ldap_auth_disable_tls_never_use_in_production = true
|
||||||
ldap_id_use_start_tls = false
|
ldap_id_use_start_tls = false
|
||||||
ldap_tls_reqcert = never
|
ldap_tls_reqcert = never
|
||||||
@@ -65,4 +66,21 @@ sssd -D --debug-level=${SSSD_DEBUG}
|
|||||||
|
|
||||||
echo ">>> Starte XRDP..."
|
echo ">>> Starte XRDP..."
|
||||||
xrdp-sesman
|
xrdp-sesman
|
||||||
exec xrdp -n
|
xrdp
|
||||||
|
|
||||||
|
echo ">>> Leite Logs an Docker weiter..."
|
||||||
|
mkdir -p /var/log/sssd /var/log/xrdp
|
||||||
|
|
||||||
|
touch /var/log/xrdp.log \
|
||||||
|
/var/log/xrdp-sesman.log \
|
||||||
|
/var/log/sssd/sssd.log \
|
||||||
|
/var/log/sssd/sssd_LDAP.log \
|
||||||
|
/var/log/sssd/sssd_nss.log \
|
||||||
|
/var/log/sssd/sssd_pam.log
|
||||||
|
|
||||||
|
exec tail -F /var/log/xrdp.log \
|
||||||
|
/var/log/xrdp-sesman.log \
|
||||||
|
/var/log/sssd/sssd.log \
|
||||||
|
/var/log/sssd/sssd_LDAP.log \
|
||||||
|
/var/log/sssd/sssd_nss.log \
|
||||||
|
/var/log/sssd/sssd_pam.log
|
||||||
+3
-2
@@ -9,8 +9,9 @@ xrdp
|
|||||||
xorgxrdp
|
xorgxrdp
|
||||||
dbus
|
dbus
|
||||||
dbus-x11
|
dbus-x11
|
||||||
xfce4
|
mate-desktop-environment
|
||||||
xfce4-terminal
|
mate-terminal
|
||||||
|
pluma
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
desktop-base
|
desktop-base
|
||||||
sudo
|
sudo
|
||||||
|
|||||||
Reference in new issue
Block a user