From 92351a4586e3df7bf59caeaa65dff6907f0d5581 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 14 Aug 2025 13:45:46 -0400 Subject: [PATCH 1/3] ingest from ppa --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 24 +++++++++++------------- Dockerfile.aarch64 | 24 +++++++++++------------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 966ada5..5d2af0d 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 \`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}' | awk -F '+' '{print $1}') 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 diff --git a/Dockerfile b/Dockerfile index 1aba56f..4506263 100644 --- a/Dockerfile +++ b/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-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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 17a6016..0251a2a 100644 --- a/Dockerfile.aarch64 +++ b/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-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 && \ diff --git a/Jenkinsfile b/Jenkinsfile index 5235faf..5cd59d0 100644 --- a/Jenkinsfile +++ b/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}' | awk -F '+' '{print $1}' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index d4fa851..aa0deb2 100644 --- a/README.md +++ b/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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f16a817..e4b8d94 100644 --- a/jenkins-vars.yml +++ b/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}' | awk -F '+' '{print $1}'" release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index 278a682..045ecd5 100644 --- a/readme-vars.yml +++ b/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."} From 79517f566e92c0c93a443cb60a3395d0c7785c47 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 16 Aug 2025 08:47:24 -0400 Subject: [PATCH 2/3] enforce version if set --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4506263..0ddaaa3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN \ apt-get update && \ apt-get install -y \ librsvg2-common \ - remmina \ + "remmina${REMMINA_RELEASE:+=$REMMINA_RELEASE}" \ remmina-plugin-exec \ remmina-plugin-kiosk \ remmina-plugin-kwallet \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0251a2a..8227b61 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,7 +22,7 @@ RUN \ apt-get update && \ apt-get install -y \ librsvg2-common \ - remmina \ + "remmina${REMMINA_RELEASE:+=$REMMINA_RELEASE}" \ remmina-plugin-exec \ remmina-plugin-kiosk \ remmina-plugin-kwallet \ From 6b38b2733f1f95c2baeeafbcaed0ef9e5a94d57e Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 16 Aug 2025 08:52:43 -0400 Subject: [PATCH 3/3] use full version tag --- .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 5d2af0d..148a060 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 \`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://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}' | awk -F '+' '{print $1}') + 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 diff --git a/Jenkinsfile b/Jenkinsfile index 5cd59d0..cab0098 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -147,7 +147,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - 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}' | awk -F '+' '{print $1}' ''', + 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' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e4b8d94..95ac149 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-remmina external_type: na -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}' | awk -F '+' '{print $1}'" +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