From 28f8b5e73eab509a0725183584f3328a546d6ca7 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Mon, 27 May 2024 19:38:35 +0100
Subject: [PATCH] Rebase to 40

---
 Dockerfile         | 4 +++-
 Dockerfile.aarch64 | 4 +++-
 Jenkinsfile        | 4 ++--
 jenkins-vars.yml   | 5 ++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c459ef07..c59c2326 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-39
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-40
 
 # set version label
 ARG BUILD_DATE
@@ -25,6 +25,7 @@ RUN \
   ln -s \
     /usr/bin/st-fedora \
     /usr/bin/xterm && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   dnf autoremove -y && \
   dnf clean all && \
@@ -37,4 +38,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2e6332ef..e2ff765a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-39
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-40
 
 # set version label
 ARG BUILD_DATE
@@ -25,6 +25,7 @@ RUN \
   ln -s \
     /usr/bin/st-fedora \
     /usr/bin/xterm && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   dnf autoremove -y && \
   dnf clean all && \
@@ -37,4 +38,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config
diff --git a/Jenkinsfile b/Jenkinsfile
index 309684f8..2e727aa5 100644
--- 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
index 6b43e653..9369a810 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: os
 release_type: prerelease
 release_tag: fedora-icewm
 ls_branch: fedora-icewm
-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 = ''