From ee534e571496008875c27d1d19304605b91bb0f8 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 31 May 2026 14:11:13 -0400
Subject: [PATCH] rebase to resolute

---
 Dockerfile                      | 2 +-
 Jenkinsfile                     | 2 ++
 README.md                       | 1 +
 jenkins-vars.yml                | 1 +
 readme-vars.yml                 | 1 +
 root/defaults/autostart         | 2 +-
 root/defaults/autostart_wayland | 2 +-
 root/defaults/menu.xml          | 2 +-
 root/defaults/menu_wayland.xml  | 2 +-
 9 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5d62772..dd276ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
 
 # set version label
 ARG BUILD_DATE
diff --git a/Jenkinsfile b/Jenkinsfile
index 32f4fe2..6e69524 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,6 +35,7 @@ pipeline {
     CI_PORT = '3001'
     CI_SSL = 'true'
     CI_DELAY = '120'
+    CI_WEB_SCREENSHOT_DELAY = '30'
     CI_DOCKERENV = 'TZ=US/Pacific'
     CI_AUTH = 'user:password'
     CI_WEBPATH = ''
@@ -903,6 +904,7 @@ pipeline {
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
+                -e WEB_SCREENSHOT_DELAY=\"${CI_WEB_SCREENSHOT_DELAY}\" \
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
diff --git a/README.md b/README.md
index 72e037c..1cc8ab9 100644
--- a/README.md
+++ b/README.md
@@ -645,6 +645,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.26:** - Rebase to resolute.
 * **05.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **28.12.25:** - Add Wayland init logic.
 * **01.12.25:** - Initial release.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index a318bd6..89a22f6 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -23,6 +23,7 @@ repo_vars:
   - CI_PORT = '3001'
   - CI_SSL = 'true'
   - CI_DELAY = '120'
+  - CI_WEB_SCREENSHOT_DELAY = '30'
   - CI_DOCKERENV = 'TZ=US/Pacific'
   - CI_AUTH = 'user:password'
   - CI_WEBPATH = ''
diff --git a/readme-vars.yml b/readme-vars.yml
index 33bad9b..5c7f527 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -108,6 +108,7 @@ init_diagram: |
   "modrinth:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "31.05.26:", desc: "Rebase to resolute."}
   - {date: "05.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "28.12.25:", desc: "Add Wayland init logic."}
   - {date: "01.12.25:", desc: "Initial release."}
diff --git a/root/defaults/autostart b/root/defaults/autostart
index 060e682..f2ad6d5 100644
--- a/root/defaults/autostart
+++ b/root/defaults/autostart
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-xterm -e ModrinthApp
+ModrinthApp
diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland
index fb03245..f2ad6d5 100644
--- a/root/defaults/autostart_wayland
+++ b/root/defaults/autostart_wayland
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-foot -e ModrinthApp
+ModrinthApp
diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml
index 621d31d..5c2a039 100644
--- a/root/defaults/menu.xml
+++ b/root/defaults/menu.xml
@@ -2,6 +2,6 @@
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 <menu id="root-menu" label="MENU">
 <item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
-<item label="Modrinth" icon="/usr/share/icons/hicolor/128x128/apps/ModrinthApp.png"><action name="Execute"><command>xterm -e ModrinthApp</command></action></item>
+<item label="Modrinth" icon="/usr/share/icons/hicolor/128x128/apps/ModrinthApp.png"><action name="Execute"><command>ModrinthApp</command></action></item>
 </menu>
 </openbox_menu>
diff --git a/root/defaults/menu_wayland.xml b/root/defaults/menu_wayland.xml
index 3d8cb05..69ddd07 100644
--- a/root/defaults/menu_wayland.xml
+++ b/root/defaults/menu_wayland.xml
@@ -2,6 +2,6 @@
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 <menu id="root-menu" label="MENU">
 <item label="foot" icon="/usr/share/icons/hicolor/48x48/apps/foot.png"><action name="Execute"><command>/usr/bin/foot</command></action></item>
-<item label="Modrinth" icon="/usr/share/icons/hicolor/128x128/apps/ModrinthApp.png"><action name="Execute"><command>xterm -e ModrinthApp</command></action></item>
+<item label="Modrinth" icon="/usr/share/icons/hicolor/128x128/apps/ModrinthApp.png"><action name="Execute"><command>ModrinthApp</command></action></item>
 </menu>
 </openbox_menu>