Skip to content

Commit 5e4a54a

Browse files
committed
make wayland default
1 parent de4a8a9 commit 5e4a54a

4 files changed

Lines changed: 120 additions & 92 deletions

File tree

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1111
LABEL maintainer="thelamer"
1212

1313
ENV TITLE="PyCharm" \
14-
NO_GAMEPAD="true"
14+
NO_GAMEPAD="true" \
15+
PIXELFLUX_WAYLAND=true
1516

1617
RUN \
1718
echo "**** add icon ****" && \

Jenkinsfile

Lines changed: 85 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ pipeline {
7575
'''
7676
script{
7777
env.EXIT_STATUS = ''
78+
env.CI_TEST_ATTEMPTED = ''
7879
env.LS_RELEASE = sh(
7980
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
8081
returnStdout: true).trim()
@@ -871,6 +872,7 @@ pipeline {
871872
script{
872873
env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
873874
env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
875+
env.CI_TEST_ATTEMPTED = 'true'
874876
}
875877
sh '''#! /bin/bash
876878
set -e
@@ -1073,98 +1075,13 @@ EOF
10731075
) '''
10741076
}
10751077
}
1076-
// If this is a Pull request send the CI link as a comment on it
1077-
stage('Pull Request Comment') {
1078-
when {
1079-
not {environment name: 'CHANGE_ID', value: ''}
1080-
environment name: 'EXIT_STATUS', value: ''
1081-
}
1082-
steps {
1083-
sh '''#! /bin/bash
1084-
# Function to retrieve JSON data from URL
1085-
get_json() {
1086-
local url="$1"
1087-
local response=$(curl -s "$url")
1088-
if [ $? -ne 0 ]; then
1089-
echo "Failed to retrieve JSON data from $url"
1090-
return 1
1091-
fi
1092-
local json=$(echo "$response" | jq .)
1093-
if [ $? -ne 0 ]; then
1094-
echo "Failed to parse JSON data from $url"
1095-
return 1
1096-
fi
1097-
echo "$json"
1098-
}
1099-
1100-
build_table() {
1101-
local data="$1"
1102-
1103-
# Get the keys in the JSON data
1104-
local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
1105-
1106-
# Check if keys are empty
1107-
if [ -z "$keys" ]; then
1108-
echo "JSON report data does not contain any keys or the report does not exist."
1109-
return 1
1110-
fi
1111-
1112-
# Build table header
1113-
local header="| Tag | Passed |\\n| --- | --- |\\n"
1114-
1115-
# Loop through the JSON data to build the table rows
1116-
local rows=""
1117-
for build in $keys; do
1118-
local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
1119-
if [ "$status" = "true" ]; then
1120-
status="✅"
1121-
else
1122-
status="❌"
1123-
fi
1124-
local row="| "$build" | "$status" |\\n"
1125-
rows="${rows}${row}"
1126-
done
1127-
1128-
local table="${header}${rows}"
1129-
local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
1130-
echo "$escaped_table"
1131-
}
1132-
1133-
if [[ "${CI}" = "true" ]]; then
1134-
# Retrieve JSON data from URL
1135-
data=$(get_json "$CI_JSON_URL")
1136-
# Create table from JSON data
1137-
table=$(build_table "$data")
1138-
echo -e "$table"
1139-
1140-
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
1141-
-H "Accept: application/vnd.github.v3+json" \
1142-
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
1143-
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
1144-
else
1145-
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
1146-
-H "Accept: application/vnd.github.v3+json" \
1147-
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
1148-
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
1149-
fi
1150-
'''
1151-
1152-
}
1153-
}
11541078
}
11551079
/* ######################
1156-
Send status to Discord
1080+
Comment on PR and Send status to Discord
11571081
###################### */
11581082
post {
11591083
always {
1160-
sh '''#!/bin/bash
1161-
rm -rf /config/.ssh/id_sign
1162-
rm -rf /config/.ssh/id_sign.pub
1163-
git config --global --unset gpg.format
1164-
git config --global --unset user.signingkey
1165-
git config --global --unset commit.gpgsign
1166-
'''
1167-
script{
1084+
script {
11681085
env.JOB_DATE = sh(
11691086
script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
11701087
returnStdout: true).trim()
@@ -1207,6 +1124,87 @@ EOF
12071124
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
12081125
}
12091126
}
1127+
script {
1128+
if (env.GITHUBIMAGE =~ /lspipepr/){
1129+
if (env.CI_TEST_ATTEMPTED == "true"){
1130+
sh '''#! /bin/bash
1131+
# Function to retrieve JSON data from URL
1132+
get_json() {
1133+
local url="$1"
1134+
local response=$(curl -s "$url")
1135+
if [ $? -ne 0 ]; then
1136+
echo "Failed to retrieve JSON data from $url"
1137+
return 1
1138+
fi
1139+
local json=$(echo "$response" | jq .)
1140+
if [ $? -ne 0 ]; then
1141+
echo "Failed to parse JSON data from $url"
1142+
return 1
1143+
fi
1144+
echo "$json"
1145+
}
1146+
1147+
build_table() {
1148+
local data="$1"
1149+
1150+
# Get the keys in the JSON data
1151+
local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
1152+
1153+
# Check if keys are empty
1154+
if [ -z "$keys" ]; then
1155+
echo "JSON report data does not contain any keys or the report does not exist."
1156+
return 1
1157+
fi
1158+
1159+
# Build table header
1160+
local header="| Tag | Passed |\\n| --- | --- |\\n"
1161+
1162+
# Loop through the JSON data to build the table rows
1163+
local rows=""
1164+
for build in $keys; do
1165+
local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
1166+
if [ "$status" = "true" ]; then
1167+
status="✅"
1168+
else
1169+
status="❌"
1170+
fi
1171+
local row="| "$build" | "$status" |\\n"
1172+
rows="${rows}${row}"
1173+
done
1174+
1175+
local table="${header}${rows}"
1176+
local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
1177+
echo "$escaped_table"
1178+
}
1179+
1180+
if [[ "${CI}" = "true" ]]; then
1181+
# Retrieve JSON data from URL
1182+
data=$(get_json "$CI_JSON_URL")
1183+
# Create table from JSON data
1184+
table=$(build_table "$data")
1185+
echo -e "$table"
1186+
1187+
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
1188+
-H "Accept: application/vnd.github.v3+json" \
1189+
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
1190+
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
1191+
else
1192+
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
1193+
-H "Accept: application/vnd.github.v3+json" \
1194+
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
1195+
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
1196+
fi
1197+
'''
1198+
}
1199+
}
1200+
}
1201+
sh '''#!/bin/bash
1202+
rm -rf /config/.ssh/id_sign
1203+
rm -rf /config/.ssh/id_sign.pub
1204+
git config --global --unset gpg.format
1205+
git config --global --unset user.signingkey
1206+
git config --global --unset commit.gpgsign
1207+
'''
12101208
}
12111209
cleanup {
12121210
sh '''#! /bin/bash

README.md

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ To use hardware acceleration in Wayland mode, we distinguish between the card us
104104
* `DRINODE`: The path to the GPU used for **Rendering** (EGL).
105105
* `DRI_NODE`: The path to the GPU used for **Encoding** (VAAPI/NVENC).
106106

107-
If both variables point to the same device, the container will automatically enable **Zero Copy** encoding, significantly reducing CPU usage and latency.
107+
If both variables point to the same device, the container will automatically enable **Zero Copy** encoding, significantly reducing CPU usage and latency. If they are set to different devices one will be used for **Rendering** and one for **Encoding** with a cpu readback.
108+
109+
You can also use the environment variable `AUTO_GPU=true`, with this set the first card detected in the container (IE `/dev/dri/renderD128`) will be used and configured for **Zero Copy**.
108110

109111
##### Intel & AMD (Open Source Drivers)
110112

@@ -122,13 +124,34 @@ For Intel and AMD GPUs.
122124
123125
##### Nvidia (Proprietary Drivers)
124126
127+
**Note: Nvidia support is currently considered experimental, driver changes can break it at any time.**
128+
125129
**Note: Nvidia support is not available for Alpine-based images.**
126130
131+
**Note: Nvidia frames have issues with hardware decoders in Chromium browsers you need to navigate to `chrome://flags/#disable-accelerated-video-decode` and toggle it to `Disabled` for smooth playback**
132+
127133
**Prerequisites:**
128134

129-
1. **Driver:** Proprietary drivers **580 or higher** are required.
130-
2. **Kernel Parameter:** Set `nvidia-drm.modeset=1` in your host bootloader (GRUB/systemd-boot).
131-
3. **Initialization:** On headless systems, run `nvidia-modprobe --modeset` on the host (once per boot) to initialize the card.
135+
1. **Driver:** Proprietary drivers **580 or higher** are required. **Crucially, you should install the driver using the `.run` file downloaded directly from the Nvidia website.**
136+
* **Unraid:** Use the production branch from the Nvidia Driver Plugin.
137+
138+
2. **Kernel Parameter:** You must set `nvidia-drm.modeset=1 nvidia_drm.fbdev=1` in your host bootloader.
139+
* **Standard Linux (GRUB):** Edit `/etc/default/grub` and add the parameter to your existing `GRUB_CMDLINE_LINUX_DEFAULT` line:
140+
141+
```text
142+
GRUB_CMDLINE_LINUX_DEFAULT="<other existing options> nvidia-drm.modeset=1 nvidia_drm.fbdev=1"
143+
```
144+
145+
Then apply the changes by running:
146+
147+
```bash
148+
sudo update-grub
149+
```
150+
151+
* **Unraid (Syslinux):** Edit the file `/boot/syslinux/syslinux.cfg` and add `nvidia-drm.modeset=1 nvidia_drm.fbdev=1` to the end of the `append` line for the Unraid OS boot entry.
152+
153+
3. **Hardware Initialization:** **On headless systems, the Nvidia video card requires a physical dummy plug inserted into the GPU so that DRM initializes properly.**
154+
132155
4. **Docker Runtime:** Configure the host docker daemon to use the Nvidia runtime:
133156

134157
```bash
@@ -157,6 +180,8 @@ services:
157180
capabilities: [compute,video,graphics,utility]
158181
```
159182

183+
* **Unraid:** Ensure you're properly setting the DRINODE/DRI_NODE and adding `--gpus all --runtime nvidia` to your extra parameters.
184+
160185
### SealSkin Compatibility
161186

162187
This container is compatible with [SealSkin](https://sealskin.app).
@@ -177,12 +202,14 @@ This container is based on [Docker Baseimage Selkies](https://github.com/linuxse
177202
| Variable | Description |
178203
| :----: | --- |
179204
| PIXELFLUX_WAYLAND | **Experimental** If set to true the container will initialize in Wayland mode running [Smithay](https://github.com/Smithay/smithay) and Labwc while enabling zero copy encoding with a GPU |
205+
| SELKIES_DESKTOP | If set to true and in Wayland mode, a simple panel will be initialized with labwc |
180206
| CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default `3000` |
181207
| CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default `3001` |
182208
| CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082 |
183209
| CUSTOM_USER | HTTP Basic auth username, abc is default. |
184210
| DRI_NODE | **Encoding GPU**: Enable VAAPI/NVENC stream encoding and use the specified device IE `/dev/dri/renderD128` |
185211
| DRINODE | **Rendering GPU**: Specify which GPU to use for EGL/3D acceleration IE `/dev/dri/renderD129` |
212+
| AUTO_GPU | If set to true and in Wayland mode, we will automatically use the first GPU available for encoding and rendering IE `/dev/dri/renderD128` |
186213
| PASSWORD | HTTP Basic auth password, abc is default. If unset there will be no auth |
187214
| SUBFOLDER | Subfolder for the application if running a subfolder reverse proxy, need both slashes IE `/subfolder/` |
188215
| TITLE | The page title displayed on the web browser, default "Selkies" |
@@ -612,5 +639,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
612639

613640
## Versions
614641

642+
* **04.04.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
615643
* **28.12.25:** - Add Wayland init logic.
616644
* **02.12.25:** - Initial Version.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,6 @@ init_diagram: |
102102
"pycharm:latest" <- Base Images
103103
# changelog
104104
changelogs:
105+
- {date: "04.04.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
105106
- {date: "28.12.25:", desc: "Add Wayland init logic."}
106107
- {date: "02.12.25:", desc: "Initial Version."}

0 commit comments

Comments
 (0)