Rebase to 3.20

linuxserver · May 27, 2024 · 49c4624 · 49c4624
1 parent d80872b
commit 49c4624
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:3.19
+FROM ghcr.io/linuxserver/baseimage-rdesktop:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -31,6 +31,7 @@ RUN \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -31,6 +31,7 @@ RUN \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,8 +31,8 @@ pipeline {
     CI_PORT = '3000'
     CI_SSL = 'false'
     CI_DELAY = '30'
-    CI_DOCKERENV = 'TZ=US/Pacific'
-    CI_AUTH = 'user:password'
+    CI_DOCKERENV = ''
+    CI_AUTH = ''
     CI_WEBPATH = ''
   }
   stages {

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: os
 release_type: prerelease
 release_tag: alpine-kde
 ls_branch: alpine-kde
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'OS_VERSION'
   - LS_USER = 'linuxserver'
@@ -22,6 +21,6 @@ repo_vars:
   - CI_PORT = '3000'
   - CI_SSL = 'false'
   - CI_DELAY = '30'
-  - CI_DOCKERENV = 'TZ=US/Pacific'
-  - CI_AUTH = 'user:password'
+  - CI_DOCKERENV = ''
+  - CI_AUTH = ''
   - CI_WEBPATH = ''