Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f5ce4fece | ||
|
|
89c0d53507 | ||
|
|
465f2027f7 | ||
|
|
0bbf28e240 | ||
|
|
0de572f637 | ||
|
|
518c671d2b | ||
|
|
a8e270ba1d | ||
|
|
3e8957da1a | ||
|
|
dbf4b71151 | ||
|
|
359a537a61 | ||
|
|
258a6e072f | ||
|
|
9050c7baf3 | ||
|
|
3dc20ced31 | ||
|
|
73bb575d79 | ||
|
|
37528f087a | ||
|
|
9a447a8166 | ||
|
|
923abce325 | ||
|
|
1296b2a484 | ||
|
|
15812c1c08 | ||
|
|
862e9f24b3 | ||
|
|
a1cd9ef1c4 |
No files matched your search
@@ -198,14 +198,12 @@ 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/*
|
||||||
+12
-5
@@ -63,17 +63,24 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
|||||||
|
|
||||||
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
|
||||||
|
|
||||||
|
|||||||
+12
-5
@@ -63,17 +63,24 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
|||||||
|
|
||||||
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 | 10.10.2026 14:31 |
|
| x86_64 (amd64) | ✅ Active | debian:trixie | 27.10.2026 23:42 |
|
||||||
| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 14:31 |
|
| aarch64 (arm64) | ✅ Active | debian:trixie | 27.10.2026 23:42 |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -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-xfce-de
|
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-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-xfce-de
|
docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
|
||||||
```
|
```
|
||||||
### 🚀 2. Run the container directly
|
### 🚀 2. Run the container directly
|
||||||
```bash
|
```bash
|
||||||
@@ -73,13 +73,14 @@ 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-xfce-de
|
git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
*Last updated on: 10.10.2026 14:31*
|
*Last updated on: 27.10.2026 23:42*
|
||||||
|
|
||||||
### 📜 Version History
|
### 📜 Version History
|
||||||
| Version | Date | Status |
|
| Version | Date | Status |
|
||||||
| :--- | :--- | :--- |
|
| :--- | :--- | :--- |
|
||||||
| **bookworm-xfce-de** | 10.10.2026 14:31 | ✅ |
|
| **trixie-mate-de** | 27.10.2026 23:42 | ✅ |
|
||||||
|
| **trixie-mate-de** | 27.10.2026 23:35 | ✅ |
|
||||||
+2
-1
@@ -1 +1,2 @@
|
|||||||
| **bookworm-xfce-de** | 10.10.2026 14:31 | ✅ |
|
| **trixie-mate-de** | 27.10.2026 23:42 | ✅ |
|
||||||
|
| **trixie-mate-de** | 27.10.2026 23:35 | ✅ |
|
||||||
+2
-5
@@ -1,10 +1,10 @@
|
|||||||
## BASE CONFIG
|
## BASE CONFIG
|
||||||
DEBIAN_CODENAME=bookworm
|
DEBIAN_CODENAME=trixie
|
||||||
BUILD_COUNTRY=de
|
BUILD_COUNTRY=de
|
||||||
|
|
||||||
## BUILD STAGE
|
## BUILD STAGE
|
||||||
BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
|
BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
|
||||||
BUILD_TAG="${DEBIAN_CODENAME}-xfce-${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-xfce-de
|
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-mate-de
|
||||||
container_name: base-image-debian-rdp-ldap
|
container_name: base-image-debian-rdp-ldap
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
+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