Compare commits
47
Commits
dev
...
trixie-xfce
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f360ee3fe6 | ||
|
|
988330dcda | ||
|
|
e78b05d79f | ||
|
|
89aff65487 | ||
|
|
46c78fd02b | ||
|
|
928f361958 | ||
|
|
6d9bb155dc | ||
|
|
bb2fae505b | ||
|
|
3eb7ced4a2 | ||
|
|
529f3efe33 | ||
|
|
c28d77618f | ||
|
|
3dfb797c7f | ||
|
|
63e5f1a6b9 | ||
|
|
231b1472f4 | ||
|
|
87521be183 | ||
|
|
2c201f5811 | ||
|
|
25189f800b | ||
|
|
2b8b8260b1 | ||
|
|
a2f1c987f8 | ||
|
|
2be18e6fd2 | ||
|
|
0970dbefae | ||
|
|
246e5e85d9 | ||
|
|
694b13f01c | ||
|
|
8786971d24 | ||
|
|
c20986cf6c | ||
|
|
d16175d16b | ||
|
|
516ff1a0fa | ||
|
|
901e9c94f4 | ||
|
|
835ca055c2 | ||
|
|
b5fbadd560 | ||
|
|
b6ed37f3b4 | ||
|
|
ab19e63e94 | ||
|
|
0609225281 | ||
|
|
9afb1e0794 | ||
|
|
5f0b994768 | ||
|
|
0be6135e52 | ||
|
|
ec21aa2b9e | ||
|
|
b27c3e257b | ||
|
|
284ee7462e | ||
|
|
4c6c8df7af | ||
|
|
05d51481d7 | ||
|
|
d5a99d0f88 | ||
|
|
b6a8bc1f61 | ||
|
|
eaf568bb9e | ||
|
|
d5d9a5d07c | ||
|
|
a8870999a7 | ||
|
|
9c795a58ee |
No files matched your search
@@ -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[@]}"
|
||||
|
||||
+2
-1
@@ -11,4 +11,5 @@ Thumbs.db
|
||||
config/*
|
||||
!config/.gitkeep
|
||||
home/*
|
||||
!home/.gitkeep
|
||||
!home/.gitkeep
|
||||
.vscode/*
|
||||
+1
-1
@@ -59,7 +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=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 && \
|
||||
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
|
||||
|
||||
+2
-6
@@ -55,15 +55,11 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
|
||||
dpkg-reconfigure -f noninteractive tzdata && \
|
||||
printf 'XKBMODEL="pc105"\nXKBLAYOUT="%s"\nXKBVARIANT=""\nXKBOPTIONS=""\nBACKSPACE="guess"\n' "${COUNTRY}" > /etc/default/keyboard && \
|
||||
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 && \
|
||||
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 && \
|
||||
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
|
||||
|
||||
@@ -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 | 08.10.2026 23:12 |
|
||||
| aarch64 (arm64) | ✅ Active | debian:bookworm | 08.10.2026 23:12 |
|
||||
| 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-de-dev
|
||||
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-de-dev
|
||||
docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-xfce-de
|
||||
```
|
||||
### 🚀 2. Run the container directly
|
||||
```bash
|
||||
@@ -73,27 +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-de-dev
|
||||
git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-xfce-de
|
||||
|
||||
```
|
||||
|
||||
*Last updated on: 08.10.2026 23:12*
|
||||
*Last updated on: 10.10.2026 11:38*
|
||||
|
||||
### 📜 Version History
|
||||
| Version | Date | Status |
|
||||
| :--- | :--- | :--- |
|
||||
| **bookworm-de-dev** | 08.10.2026 23:12 | ✅ |
|
||||
| **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 | ✅ |
|
||||
| **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 | ✅ |
|
||||
+1
-15
@@ -1,15 +1 @@
|
||||
| **bookworm-de-dev** | 08.10.2026 23:12 | ✅ |
|
||||
| **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 | ✅ |
|
||||
|
||||
+2
-5
@@ -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}-${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,9 +15,6 @@ 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
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
services:
|
||||
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:trixie-xfce-de
|
||||
container_name: base-image-debian-rdp-ldap
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
|
||||
+18
-1
@@ -65,4 +65,21 @@ sssd -D --debug-level=${SSSD_DEBUG}
|
||||
|
||||
echo ">>> Starte XRDP..."
|
||||
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
|
||||
Reference in new issue
Block a user