From cc15bf353aae763d267de20a1d56bf3035cdc6db Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Thu, 14 Aug 2025 13:40:05 -0400
Subject: [PATCH 1/3] rebase to noble, install qt deps

---
 .github/workflows/external_trigger.yml |  2 +-
 Dockerfile                             | 16 +++++++---------
 Jenkinsfile                            |  2 +-
 README.md                              |  1 +
 jenkins-vars.yml                       |  2 +-
 readme-vars.yml                        |  1 +
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index a4a35c1..55bf9c2 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 \`mediaelch_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 -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/jammy/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~jammy//g')
+          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~noble//g')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^mediaelch_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
diff --git a/Dockerfile b/Dockerfile
index 04ca145..5990e95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm
+FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -18,16 +18,14 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mediaelch-logo.png && \
   echo "**** install packages ****" && \
-  curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x604E3CBB4DEF35FBD9D4928220B2163BC4FD788F" | gpg --dearmor | tee /usr/share/keyrings/mediaelch.gpg >/dev/null && \
-  echo "deb [aarch=amd64 signed-by=/usr/share/keyrings/mediaelch.gpg] http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu jammy main" > /etc/apt/sources.list.d/mediaelch.list && \
-  if [ -z ${MEDIAELCH_VERSION+x} ]; then \
-    MEDIAELCH="mediaelch"; \
-  else \
-    MEDIAELCH="mediaelch=${MEDIAELCH_VERSION}~jammy"; \
-  fi && \
+  add-apt-repository ppa:mediaelch/mediaelch-stable && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
-    ${MEDIAELCH} && \
+    libqt6multimedia6 \
+    libqt6sql6-sqlite \
+    libqt6svg6 \
+    mediaelch \
+    qt6-image-formats-plugins && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 6845559..f90836d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,7 +147,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/jammy/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~jammy//g' ''',
+            script: ''' curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~noble//g' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/README.md b/README.md
index e87a702..6e8aeee 100644
--- a/README.md
+++ b/README.md
@@ -425,6 +425,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.08.25:** - Rebase to noble, ingest latest stable version, install qt deps.
 * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED.
 * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
 * **07.12.23:** - Initial release.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index cf0e522..d740cd6 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-mediaelch
 external_type: na
-custom_version_command: "curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/jammy/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~jammy//g'"
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~noble//g'"
 release_type: stable
 release_tag: latest
 ls_branch: master
diff --git a/readme-vars.yml b/readme-vars.yml
index 0993762..ca55ca9 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -99,6 +99,7 @@ init_diagram: |
   "mediaelch:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "14.08.25:", desc: "Rebase to noble, ingest latest stable version, install qt deps."}
   - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."}
   - {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."}
   - {date: "07.12.23:", desc: "Initial release."}

From 53024992cc5aae54d3cdf45544ff863faf8ce481 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sat, 16 Aug 2025 08:50:16 -0400
Subject: [PATCH 2/3] enforce version if set

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5990e95..dfc53cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN \
     libqt6multimedia6 \
     libqt6sql6-sqlite \
     libqt6svg6 \
-    mediaelch \
+    "mediaelch${MEDIAELCH_VERSION:+=$MEDIAELCH_VERSION}" \
     qt6-image-formats-plugins && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \

From a5310b69e6df104ae5d0e249138dab32bcb6b9d5 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sat, 16 Aug 2025 08:53:59 -0400
Subject: [PATCH 3/3] use full version string

---
 .github/workflows/external_trigger.yml | 2 +-
 Jenkinsfile                            | 2 +-
 jenkins-vars.yml                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 55bf9c2..44cfa16 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 \`mediaelch_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 -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~noble//g')
+          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^mediaelch_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
diff --git a/Jenkinsfile b/Jenkinsfile
index f90836d..fb7ca86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,7 +147,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~noble//g' ''',
+            script: ''' curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index d740cd6..a4d60b9 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-mediaelch
 external_type: na
-custom_version_command: "curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/~noble//g'"
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: mediaelch' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: stable
 release_tag: latest
 ls_branch: master