From 77af5ecde1879bed5d721368582d1e0d528972be Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 29 Apr 2026 13:10:03 -0400 Subject: [PATCH 1/4] rebase to resolute --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 14 ++++---------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + root/defaults/autostart | 2 +- root/defaults/autostart_wayland | 2 +- root/defaults/menu.xml | 2 +- root/defaults/menu_wayland.xml | 2 +- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index a5bf872..5463be5 100644 --- a/.github/workflows/external_trigger.yml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 006dca6..3c5ea95 100644 --- a/Dockerfile +++ b/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,19 +19,13 @@ 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 \ - /usr/bin/pcsx2-qt && \ + pcsx2 \ + qt6-wayland && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index 5ad3676..974bff7 100644 --- a/Jenkinsfile +++ b/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' } diff --git a/README.md b/README.md index dbbe755..a6e4752 100644 --- a/README.md +++ b/README.md @@ -639,6 +639,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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e2552df..0bfb40f 100644 --- a/jenkins-vars.yml +++ b/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 diff --git a/readme-vars.yml b/readme-vars.yml index f3e7c8b..eb47e88 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -106,6 +106,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."} diff --git a/root/defaults/autostart b/root/defaults/autostart index b0c8569..4862fd8 100644 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -1,4 +1,4 @@ #!/bin/bash # Run pcsx2 -xterm -e /usr/bin/pcsx2-qt +xterm -e /usr/games/pcsx2-qt diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland index 3a7f4d8..fa785c2 100644 --- a/root/defaults/autostart_wayland +++ b/root/defaults/autostart_wayland @@ -1,4 +1,4 @@ #!/bin/bash # Run pcsx2 -foot -e /usr/bin/pcsx2-qt +foot -e /usr/games/pcsx2-qt diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index a5dcd6a..1b58dc2 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -2,6 +2,6 @@ /usr/bin/xterm -xterm -e /usr/bin/pcsx2-qt +xterm -e /usr/games/pcsx2-qt diff --git a/root/defaults/menu_wayland.xml b/root/defaults/menu_wayland.xml index ec608ee..0df1c5e 100644 --- a/root/defaults/menu_wayland.xml +++ b/root/defaults/menu_wayland.xml @@ -2,6 +2,6 @@ /usr/bin/foot -foot -e /usr/bin/pcsx2-qt +foot -e /usr/games/pcsx2-qt From be499508da213ac31f9c3ff58c83ba6bfecacf57 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 29 Apr 2026 13:20:57 -0400 Subject: [PATCH 2/4] add note on setting graphics settings --- README.md | 2 ++ readme-vars.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index a6e4752..5b9db3b 100644 --- a/README.md +++ b/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`. diff --git a/readme-vars.yml b/readme-vars.yml index eb47e88..52dbf81 100644 --- a/readme-vars.yml +++ b/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": { From edda007a44b1cf5c04793751e2ca0739d2f6b646 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 29 Apr 2026 13:23:54 -0400 Subject: [PATCH 3/4] fix icon pathing --- root/defaults/menu.xml | 2 +- root/defaults/menu_wayland.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index 1b58dc2..a7843d6 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -2,6 +2,6 @@ /usr/bin/xterm -xterm -e /usr/games/pcsx2-qt +xterm -e /usr/games/pcsx2-qt diff --git a/root/defaults/menu_wayland.xml b/root/defaults/menu_wayland.xml index 0df1c5e..73ec2d2 100644 --- a/root/defaults/menu_wayland.xml +++ b/root/defaults/menu_wayland.xml @@ -2,6 +2,6 @@ /usr/bin/foot -foot -e /usr/games/pcsx2-qt +foot -e /usr/games/pcsx2-qt From 63c78cd7c10ca24d775123485bb4ae6613f6f2ac Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 29 Apr 2026 13:32:32 -0400 Subject: [PATCH 4/4] add symlink for upgrades --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3c5ea95..5ebd174 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,9 @@ RUN \ libqt6svg6 \ pcsx2 \ qt6-wayland && \ + ln -s \ + /usr/games/pcsx2-qt \ + /usr/bin/pcsx2-qt && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \