Merge pull request #6 from linuxserver/resolute

Resolute

Author: thelamer

.github/workflows/external_trigger.yml

@@ -29,7 +29,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`pcsx2_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -s -L https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: pcsx2-stable' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'~' '{print $1}')
+          EXT_RELEASE=$(curl -s -L https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu/dists/resolute/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: pcsx2' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'~' '{print $1}')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^pcsx2_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
 
 # set version label
 ARG BUILD_DATE
@@ -19,18 +19,15 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/pcsx2-logo.png && \
   echo "**** install packages ****" && \
-  apt-key adv \
-    --keyserver hkp://keyserver.ubuntu.com:80 \
-    --recv-keys D7B449CFE17E659E5A12EE8EDD6EEEA2BD747717 && \
-  echo \
-    "deb https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu noble main" > \
-    /etc/apt/sources.list.d/pcsx2.list && \
+  add-apt-repository ppa:pcsx2-team/pcsx2-daily && \
   apt-get update && \
   DEBIAN_FRONTEND=noninteractive \
   apt-get install --no-install-recommends -y \
     libqt6svg6 \
-    pcsx2-stable && \
-  setcap -r \
+    pcsx2 \
+    qt6-wayland && \
+  ln -s \
+    /usr/games/pcsx2-qt \
     /usr/bin/pcsx2-qt && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \

Jenkinsfile

@@ -148,7 +148,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -s -L https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: pcsx2-stable' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'~' '{print $1}' ''',
+            script: ''' curl -s -L https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu/dists/resolute/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: pcsx2' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'~' '{print $1}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -60,6 +60,8 @@ The application can be accessed at:
 
 * https://yourhost:3001/
 
+**Make sure to set the proper graphics settings for your system, "Automatic" will not work and OpenGL is the most compatible**
+
 ### Strict reverse proxies
 
 This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
@@ -639,6 +641,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.04.26:** - Rebase to resolute.
 * **05.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **20.12.25:** - Add Wayland init logic.
 * **15.07.25:** - Switch to stable release for pcsx2.

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-pcsx2
 external_type: na
-custom_version_command: "curl -s -L https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: pcsx2-stable' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'~' '{print $1}'"
+custom_version_command: "curl -s -L https://ppa.launchpadcontent.net/pcsx2-team/pcsx2-daily/ubuntu/dists/resolute/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: pcsx2' | awk -F ': ' '/Version/{print $2;exit}' | awk -F'~' '{print $1}'"
 release_type: stable
 release_tag: latest
 ls_branch: master

readme-vars.yml

@@ -34,6 +34,8 @@ app_setup_block: |
   The application can be accessed at:
 
   * https://yourhost:3001/
+
+  **Make sure to set the proper graphics settings for your system, "Automatic" will not work and OpenGL is the most compatible**
 # init diagram
 init_diagram: |
   "pcsx2:latest": {
@@ -106,6 +108,7 @@ init_diagram: |
   "pcsx2:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "29.04.26:", desc: "Rebase to resolute."}
   - {date: "05.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "20.12.25:", desc: "Add Wayland init logic."}
   - {date: "15.07.25:", desc: "Switch to stable release for pcsx2."}

root/defaults/autostart

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Run pcsx2
-xterm -e /usr/bin/pcsx2-qt
+xterm -e /usr/games/pcsx2-qt

root/defaults/autostart_wayland

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Run pcsx2
-foot -e /usr/bin/pcsx2-qt
+foot -e /usr/games/pcsx2-qt

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="PCSX2" icon="/usr/share/icons/hicolor/256x256/apps/PCSX2.png"><action name="Execute"><command>xterm -e /usr/bin/pcsx2-qt</command></action></item>
+<item label="PCSX2" icon="/usr/share/pixmaps/pcsx2-qt.png"><action name="Execute"><command>xterm -e /usr/games/pcsx2-qt</command></action></item>
 </menu>
 </openbox_menu>

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="PCSX2" icon="/usr/share/icons/hicolor/256x256/apps/PCSX2.png"><action name="Execute"><command>foot -e /usr/bin/pcsx2-qt</command></action></item>
+<item label="PCSX2" icon="/usr/share/pixmaps/pcsx2-qt.png"><action name="Execute"><command>foot -e /usr/games/pcsx2-qt</command></action></item>
 </menu>
 </openbox_menu>