Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
785883c6f5 | ||
|
|
f6cced1d7c | ||
|
|
b2aff37a44 | ||
|
|
93debacc30 | ||
|
|
d670acddec | ||
|
|
c1a13835e6 | ||
|
|
19a52d20fc | ||
|
|
c84790ec5a | ||
|
|
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" \
|
||||
"${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[@]}"
|
||||
|
||||
+12
-5
@@ -63,17 +63,24 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
||||
|
||||
RUN chmod 440 /etc/sudoers && \
|
||||
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 && \
|
||||
chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
|
||||
chmod 644 /etc/xrdp/cert.pem && \
|
||||
echo "LANG=${LANG}" >> /etc/environment && \
|
||||
echo "LANGUAGE=${LANGUAGE}" >> /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 && \
|
||||
chmod +x /etc/xrdp/startwm.sh && \
|
||||
mkdir -p /etc/xdg/xfce4 && \
|
||||
echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
|
||||
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 mate-session" >> /etc/xrdp/startwm.sh && \
|
||||
chmod +x /etc/xrdp/startwm.sh
|
||||
|
||||
EXPOSE 3389
|
||||
|
||||
|
||||
+12
-5
@@ -63,17 +63,24 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
|
||||
|
||||
RUN chmod 440 /etc/sudoers && \
|
||||
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 && \
|
||||
chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
|
||||
chmod 644 /etc/xrdp/cert.pem && \
|
||||
echo "LANG=${LANG}" >> /etc/environment && \
|
||||
echo "LANGUAGE=${LANGUAGE}" >> /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 && \
|
||||
chmod +x /etc/xrdp/startwm.sh && \
|
||||
mkdir -p /etc/xdg/xfce4 && \
|
||||
echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
|
||||
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 mate-session" >> /etc/xrdp/startwm.sh && \
|
||||
chmod +x /etc/xrdp/startwm.sh
|
||||
|
||||
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:trixie | 10.10.2026 11:38 |
|
||||
| aarch64 (arm64) | ✅ Active | debian:trixie | 10.10.2026 11:38 |
|
||||
| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 14:48 |
|
||||
| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 14:48 |
|
||||
|
||||
---
|
||||
|
||||
@@ -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:trixie-xfce-de
|
||||
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-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:trixie-xfce-de
|
||||
docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||
```
|
||||
### 🚀 2. Run the container directly
|
||||
```bash
|
||||
@@ -73,18 +73,13 @@ 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:trixie-xfce-de
|
||||
git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||
|
||||
```
|
||||
|
||||
*Last updated on: 10.10.2026 11:38*
|
||||
*Last updated on: 10.10.2026 14:48*
|
||||
|
||||
### 📜 Version History
|
||||
| Version | Date | Status |
|
||||
| :--- | :--- | :--- |
|
||||
| **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 | ✅ |
|
||||
| **bookworm-mate-de** | 10.10.2026 14:48 | ✅ |
|
||||
+1
-6
@@ -1,6 +1 @@
|
||||
| **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 | ✅ |
|
||||
| **bookworm-mate-de** | 10.10.2026 14:48 | ✅ |
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
## BASE CONFIG
|
||||
DEBIAN_CODENAME=trixie
|
||||
DEBIAN_CODENAME=bookworm
|
||||
BUILD_COUNTRY=de
|
||||
|
||||
## BUILD STAGE
|
||||
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_LANG=de_DE.UTF-8
|
||||
BUILD_LANGUAGE=de_DE:de
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
services:
|
||||
base-image-debian-rdp-ldap:
|
||||
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:trixie-xfce-de
|
||||
image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
|
||||
container_name: base-image-debian-rdp-ldap
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
|
||||
@@ -30,6 +30,7 @@ ldap_default_authtok = ${LDAP_BIND_PASSWORD}
|
||||
|
||||
ldap_schema = rfc2307bis
|
||||
ldap_group_member = uniqueMember
|
||||
|
||||
ldap_auth_disable_tls_never_use_in_production = true
|
||||
ldap_id_use_start_tls = false
|
||||
ldap_tls_reqcert = never
|
||||
|
||||
+3
-2
@@ -9,8 +9,9 @@ xrdp
|
||||
xorgxrdp
|
||||
dbus
|
||||
dbus-x11
|
||||
xfce4
|
||||
xfce4-terminal
|
||||
mate-desktop-environment
|
||||
mate-terminal
|
||||
pluma
|
||||
xdg-user-dirs
|
||||
desktop-base
|
||||
sudo
|
||||
|
||||
Reference in new issue
Block a user