Compare commits
48
Commits
dev
..
bookworm-xfce
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8742addf3d | ||
|
|
f0252a0b9b | ||
|
|
03f65c7695 | ||
|
|
f637e30fa2 | ||
|
|
f004800174 | ||
|
|
baf11e3eed | ||
|
|
7af58a2738 | ||
|
|
dfa2e5a1ae | ||
|
|
22b8e68ca8 | ||
|
|
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" \
|
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
||||||
"${GITEA_MANIFEST_TAGS[@]}" "${GITEA_SOURCES[@]}"
|
"${GITEA_MANIFEST_TAGS[@]}" "${GITEA_SOURCES[@]}"
|
||||||
|
|
||||||
|
# 2. Manifest auf Docker Hub erstellen (aus Docker Hub Temp-Tags!)
|
||||||
if [[ "$PUSH" == *"dockerhub"* ]]; then
|
if [[ "$PUSH" == *"dockerhub"* ]]; then
|
||||||
DH_MANIFEST_TAGS=("-t" "$DOCKERHUB_REPO:$TAG")
|
DH_MANIFEST_TAGS=("-t" "$DOCKERHUB_REPO:$TAG")
|
||||||
if [[ "$BUILD_TAG_LATEST" == "y" ]]; then
|
if [[ "$BUILD_TAG_LATEST" == "y" ]]; then
|
||||||
DH_MANIFEST_TAGS+=("-t" "$DOCKERHUB_REPO:latest")
|
DH_MANIFEST_TAGS+=("-t" "$DOCKERHUB_REPO:latest")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# WICHTIG: Hier werden jetzt als Quelle die Docker Hub Temp-Tags genutzt!
|
||||||
docker buildx imagetools create \
|
docker buildx imagetools create \
|
||||||
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
||||||
"${DH_MANIFEST_TAGS[@]}" "${DH_SOURCES[@]}"
|
"${DH_MANIFEST_TAGS[@]}" "${DH_SOURCES[@]}"
|
||||||
|
|||||||
+1
-1
@@ -12,4 +12,4 @@ config/*
|
|||||||
!config/.gitkeep
|
!config/.gitkeep
|
||||||
home/*
|
home/*
|
||||||
!home/.gitkeep
|
!home/.gitkeep
|
||||||
.vscode/*
|
.vscode/*
|
||||||
+5
-19
@@ -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 && \
|
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=0077" >> /etc/pam.d/common-session && \
|
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
|
|
||||||
|
|
||||||
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 && \
|
||||||
@@ -77,17 +70,10 @@ RUN chmod 440 /etc/sudoers && \
|
|||||||
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 && \
|
||||||
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 startlxqt" >> /etc/xrdp/startwm.sh && \
|
|
||||||
chmod +x /etc/xrdp/startwm.sh
|
|
||||||
|
|
||||||
EXPOSE 3389
|
EXPOSE 3389
|
||||||
|
|
||||||
|
|||||||
+5
-19
@@ -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 && \
|
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=0077" >> /etc/pam.d/common-session && \
|
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
|
|
||||||
|
|
||||||
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 && \
|
||||||
@@ -77,17 +70,10 @@ RUN chmod 440 /etc/sudoers && \
|
|||||||
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 && \
|
||||||
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 startlxqt" >> /etc/xrdp/startwm.sh && \
|
|
||||||
chmod +x /etc/xrdp/startwm.sh
|
|
||||||
|
|
||||||
EXPOSE 3389
|
EXPOSE 3389
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,13 @@ Debian Desktop with LDAP Authentication and PulseAudio. To use behind Guacamole
|
|||||||
|
|
||||||
This repository is built and pushed automatically.
|
This repository is built and pushed automatically.
|
||||||
|
|
||||||
|
<a href="https://hub.docker.com/r/pifarm/base-image-debian-rdp-ldap" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/badge/docker-hub-blue?logo=docker&logoColor=white" alt="Docker Hub"></a>
|
||||||
|
|
||||||
### 🏗️ Platform Support
|
### 🏗️ Platform Support
|
||||||
| Architecture | Status | Base Image | Build Date |
|
| Architecture | Status | Base Image | Build Date |
|
||||||
| :--- | :--- | :--- | :--- |
|
| :--- | :--- | :--- | :--- |
|
||||||
| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 19:45 |
|
| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 14:31 |
|
||||||
| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 19:45 |
|
| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 14:31 |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -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-xfce-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-xfce-de
|
||||||
```
|
```
|
||||||
### 🚀 2. Run the container directly
|
### 🚀 2. Run the container directly
|
||||||
```bash
|
```bash
|
||||||
@@ -73,23 +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-xfce-de
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
*Last updated on: 10.10.2026 19:45*
|
*Last updated on: 10.10.2026 14:31*
|
||||||
|
|
||||||
### 📜 Version History
|
### 📜 Version History
|
||||||
| Version | Date | Status |
|
| Version | Date | Status |
|
||||||
| :--- | :--- | :--- |
|
| :--- | :--- | :--- |
|
||||||
| **bookworm-de-dev** | 10.10.2026 19:45 | ✅ |
|
| **bookworm-xfce-de** | 10.10.2026 14:31 | ✅ |
|
||||||
| **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 | ✅ |
|
|
||||||
+1
-11
@@ -1,11 +1 @@
|
|||||||
| **bookworm-de-dev** | 10.10.2026 19:45 | ✅ |
|
| **bookworm-xfce-de** | 10.10.2026 14:31 | ✅ |
|
||||||
| **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 | ✅ |
|
|
||||||
+5
-2
@@ -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}-xfce-${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
|
||||||
@@ -13,7 +13,10 @@ BUILD_TZ=Europe/Berlin
|
|||||||
BUILD_MAINTAINER=pi-farm
|
BUILD_MAINTAINER=pi-farm
|
||||||
BUILD_APP_NAME=base-image-debian-rdp-ldap
|
BUILD_APP_NAME=base-image-debian-rdp-ldap
|
||||||
BUILD_APP_VERSION=1.0.0
|
BUILD_APP_VERSION=1.0.0
|
||||||
PUSH=gitea
|
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
|
||||||
|
|||||||
+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-xfce-de
|
||||||
container_name: base-image-debian-rdp-ldap
|
container_name: base-image-debian-rdp-ldap
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
+3
-10
@@ -9,16 +9,8 @@ xrdp
|
|||||||
xorgxrdp
|
xorgxrdp
|
||||||
dbus
|
dbus
|
||||||
dbus-x11
|
dbus-x11
|
||||||
lxqt-core
|
xfce4
|
||||||
openbox
|
xfce4-terminal
|
||||||
papirus-icon-theme
|
|
||||||
adwaita-icon-theme
|
|
||||||
libqt5svg5
|
|
||||||
gvfs
|
|
||||||
qterminal
|
|
||||||
featherpad
|
|
||||||
pcmanfm-qt
|
|
||||||
lxqt-sudo
|
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
desktop-base
|
desktop-base
|
||||||
sudo
|
sudo
|
||||||
@@ -39,6 +31,7 @@ ninja-build
|
|||||||
pkg-config
|
pkg-config
|
||||||
autoconf
|
autoconf
|
||||||
libtool
|
libtool
|
||||||
|
thunar-archive-plugin
|
||||||
xarchiver
|
xarchiver
|
||||||
unzip
|
unzip
|
||||||
zip
|
zip
|
||||||
|
|||||||
Reference in new issue
Block a user