Rebase to 40

This commit is contained in:
thespad 2024-05-27 18:46:20 +01:00
parent dac84a43ab
commit 0fb8a8dc24
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
4 changed files with 8 additions and 7 deletions

View File

@ -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
@ -24,6 +24,7 @@ RUN \
ln -s \
/usr/bin/st-fedora \
/usr/bin/x-terminal-emulator && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
dnf autoremove -y && \
dnf clean all && \

View File

@ -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
@ -24,6 +24,7 @@ RUN \
ln -s \
/usr/bin/st-fedora \
/usr/bin/x-terminal-emulator && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
dnf autoremove -y && \
dnf clean all && \

4
Jenkinsfile vendored
View File

@ -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 {

View File

@ -6,7 +6,6 @@ external_type: os
release_type: prerelease
release_tag: fedora-i3
ls_branch: fedora-i3
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 = ''