Skip to content

Commit 83d12d7

Browse files
committed
rebase to noble to ingest latest version
1 parent 2dfc7dc commit 83d12d7

6 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2424
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
2525
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
26-
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')
26+
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')
2727
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
2828
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2929
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm
3+
FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
44

55
# set version label
66
ARG BUILD_DATE
@@ -19,11 +19,11 @@ RUN \
1919
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mediaelch-logo.png && \
2020
echo "**** install packages ****" && \
2121
curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x604E3CBB4DEF35FBD9D4928220B2163BC4FD788F" | gpg --dearmor | tee /usr/share/keyrings/mediaelch.gpg >/dev/null && \
22-
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 && \
22+
echo "deb [aarch=amd64 signed-by=/usr/share/keyrings/mediaelch.gpg] http://ppa.launchpad.net/mediaelch/mediaelch-stable/ubuntu noble main" > /etc/apt/sources.list.d/mediaelch.list && \
2323
if [ -z ${MEDIAELCH_VERSION+x} ]; then \
2424
MEDIAELCH="mediaelch"; \
2525
else \
26-
MEDIAELCH="mediaelch=${MEDIAELCH_VERSION}~jammy"; \
26+
MEDIAELCH="mediaelch=${MEDIAELCH_VERSION}~noble"; \
2727
fi && \
2828
apt-get update && \
2929
apt-get install -y --no-install-recommends \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pipeline {
131131
steps{
132132
script{
133133
env.EXT_RELEASE = sh(
134-
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' ''',
134+
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' ''',
135135
returnStdout: true).trim()
136136
env.RELEASE_LINK = 'custom_command'
137137
}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,5 +329,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
329329

330330
## Versions
331331

332+
* **05.11.24:** - Rebase to Ubuntu Noble.
332333
* **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
333334
* **07.12.23:** - Initial release.

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-mediaelch
55
external_type: na
6-
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'"
6+
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'"
77
release_type: stable
88
release_tag: latest
99
ls_branch: master

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,6 @@ app_setup_block: |
8484
8585
# changelog
8686
changelogs:
87+
- { date: "05.11.24:", desc: "Rebase to Ubuntu Noble." }
8788
- { date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon." }
8889
- { date: "07.12.23:", desc: "Initial release." }

0 commit comments

Comments
 (0)