Merge pull request #16 from linuxserver/selkies

Selkies

Author: thelamer

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -52,7 +52,6 @@ body:
       label: CPU architecture
       options:
         - x86-64
-        - arm64
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/issue.feature.yml

@@ -29,7 +29,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`kdenlive_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/universe/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: kdenlive' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/://g')
+          EXT_RELEASE=$(curl -s 'https://apps.kde.org/kdenlive/index.xml' | awk -F'[<>]' '{for(i=1; i<=NF; i++) if($i=="guid"){split($(i+1), a, "#"); print a[2]; exit}}')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^kdenlive_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

.github/workflows/call_issue_pr_tracker.yml

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -17,27 +17,22 @@ ARG DEBIAN_FRONTEND="noninteractive"
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kdenlive-logo.png && \
   echo "**** install packages ****" && \
-  apt-get update && \
-  apt-get install --no-install-recommends -y \
-    frei0r-plugins \
-    i965-va-driver \
-    kdenlive \
-    mediainfo \
-    python3-venv \
-    va-driver-all \
-    vainfo \
-    vdpau-driver-all && \
-  echo "**** install vosk ****" && \
-  python3 -m venv /lsiopy && \
-  pip install -U --no-cache-dir \
-    pip \
-    wheel && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ \
-    srt \
-    vosk && \
+  if [ -z ${KDENLIVE_VERSION+x} ]; then \
+    KDENLIVE_VERSION=$(curl -s 'https://apps.kde.org/kdenlive/index.xml' \
+    | awk -F'[<>]' '{for(i=1; i<=NF; i++) if($i=="guid"){split($(i+1), a, "#"); print a[2]; exit}}'); \
+  fi && \
+  curl -o \
+    /tmp/kdenlive.app -L \
+    "https://download.kde.org/stable/kdenlive/$(echo "$KDENLIVE_VERSION" | sed 's/\.[^.]*$//')/linux/kdenlive-${KDENLIVE_VERSION}-x86_64.AppImage" && \
+  cd /tmp && \
+  chmod +x kdenlive.app && \
+  ./kdenlive.app --appimage-extract && \
+  mv \
+    squashfs-root \
+    /opt/kdenlive && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \

.github/workflows/call_issues_cron.yml

@@ -27,11 +27,11 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/kdenlive'
     PR_DOCKERHUB_IMAGE = 'lspipepr/kdenlive'
     DIST_IMAGE = 'ubuntu'
-    MULTIARCH = 'true'
+    MULTIARCH = 'false'
     CI = 'true'
     CI_WEB = 'true'
-    CI_PORT = '3000'
-    CI_SSL = 'false'
+    CI_PORT = '3001'
+    CI_SSL = 'true'
     CI_DELAY = '120'
     CI_DOCKERENV = 'TZ=US/Pacific'
     CI_AUTH = 'user:password'
@@ -147,7 +147,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://archive.ubuntu.com/ubuntu/dists/noble/universe/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: kdenlive' | awk -F ': ' '/Version/{print $2;exit}' | sed 's/://g' ''',
+            script: ''' curl -s 'https://apps.kde.org/kdenlive/index.xml' | awk -F'[<>]' '{for(i=1; i<=NF; i++) if($i=="guid"){split($(i+1), a, "#"); print a[2]; exit}}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }