Merge pull request #23 from linuxserver/ppa

ingest from ppa

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 \`remmina_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://archive.ubuntu.com/ubuntu/dists/noble-updates/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}')
+          EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/remmina-ppa-team/remmina-next/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^remmina_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

@@ -18,22 +18,20 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/remmina-logo.png && \
   echo "**** install remmina ****" && \
-  if [ -z "${REMMINA_RELEASE}" ]; then \
-    REMMINA_RELEASE=$(curl -sX GET http://archive.ubuntu.com/ubuntu/dists/noble-updates/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}'); \
-  fi && \
+  apt-add-repository ppa:remmina-ppa-team/remmina-next && \
   apt-get update && \
   apt-get install -y \
     librsvg2-common \
-    remmina="${REMMINA_RELEASE}" \
-    remmina-plugin-exec="${REMMINA_RELEASE}" \
-    remmina-plugin-kiosk="${REMMINA_RELEASE}" \
-    remmina-plugin-kwallet="${REMMINA_RELEASE}" \
-    remmina-plugin-rdp="${REMMINA_RELEASE}" \
-    remmina-plugin-secret="${REMMINA_RELEASE}" \
-    remmina-plugin-spice="${REMMINA_RELEASE}" \
-    remmina-plugin-vnc="${REMMINA_RELEASE}" \
-    remmina-plugin-www="${REMMINA_RELEASE}" \
-    remmina-plugin-x2go="${REMMINA_RELEASE}" && \
+    "remmina${REMMINA_RELEASE:+=$REMMINA_RELEASE}" \
+    remmina-plugin-exec \
+    remmina-plugin-kiosk \
+    remmina-plugin-kwallet \
+    remmina-plugin-rdp \
+    remmina-plugin-secret \
+    remmina-plugin-spice \
+    remmina-plugin-vnc \
+    remmina-plugin-www \
+    remmina-plugin-x2go && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apt-get clean && \

Dockerfile.aarch64

@@ -18,22 +18,20 @@ RUN \
     /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/remmina-logo.png && \
   echo "**** install remmina ****" && \
-  if [ -z "${REMMINA_RELEASE}" ]; then \
-    REMMINA_RELEASE=$(curl -sX GET http://archive.ubuntu.com/ubuntu/dists/noble-updates/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}'); \
-  fi && \
+  apt-add-repository ppa:remmina-ppa-team/remmina-next && \
   apt-get update && \
   apt-get install -y \
     librsvg2-common \
-    remmina="${REMMINA_RELEASE}" \
-    remmina-plugin-exec="${REMMINA_RELEASE}" \
-    remmina-plugin-kiosk="${REMMINA_RELEASE}" \
-    remmina-plugin-kwallet="${REMMINA_RELEASE}" \
-    remmina-plugin-rdp="${REMMINA_RELEASE}" \
-    remmina-plugin-secret="${REMMINA_RELEASE}" \
-    remmina-plugin-spice="${REMMINA_RELEASE}" \
-    remmina-plugin-vnc="${REMMINA_RELEASE}" \
-    remmina-plugin-www="${REMMINA_RELEASE}" \
-    remmina-plugin-x2go="${REMMINA_RELEASE}" && \
+    "remmina${REMMINA_RELEASE:+=$REMMINA_RELEASE}" \
+    remmina-plugin-exec \
+    remmina-plugin-kiosk \
+    remmina-plugin-kwallet \
+    remmina-plugin-rdp \
+    remmina-plugin-secret \
+    remmina-plugin-spice \
+    remmina-plugin-vnc \
+    remmina-plugin-www \
+    remmina-plugin-x2go && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apt-get clean && \

Jenkinsfile

@@ -147,7 +147,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://archive.ubuntu.com/ubuntu/dists/noble-updates/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}' ''',
+            script: ''' curl -sX GET http://ppa.launchpad.net/remmina-ppa-team/remmina-next/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -422,6 +422,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.08.25:** - Ingest from PPA.
 * **11.08.25:** - Install librsvg2 for icons.
 * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED.
 * **28.08.24:** - Rebase to noble.

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-remmina
 external_type: na
-custom_version_command: "curl -sX GET http://archive.ubuntu.com/ubuntu/dists/noble-updates/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}'"
+custom_version_command: "curl -sX GET http://ppa.launchpad.net/remmina-ppa-team/remmina-next/ubuntu/dists/noble/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: remmina' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: stable
 release_tag: latest
 ls_branch: master

readme-vars.yml

@@ -98,6 +98,7 @@ init_diagram: |
   "remmina:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "14.08.25:", desc: "Ingest from PPA."}
   - {date: "11.08.25:", desc: "Install librsvg2 for icons."}
   - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."}
   - {date: "28.08.24:", desc: "Rebase to noble."}