Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase to (Fedora Mate) #159

Merged
merged 1 commit into from
May 27, 2024
Merged

Rebase to (Fedora Mate) #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -41,6 +41,7 @@ RUN \
'/compositing-manager/{n;s/.*/ <default>false<\/default>/}' \
/usr/share/glib-2.0/schemas/org.mate.marco.gschema.xml && \
glib-compile-schemas /usr/share/glib-2.0/schemas/ && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
dnf autoremove -y && \
dnf clean all && \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -41,6 +41,7 @@ RUN \
'/compositing-manager/{n;s/.*/ <default>false<\/default>/}' \
/usr/share/glib-2.0/schemas/org.mate.marco.gschema.xml && \
glib-compile-schemas /usr/share/glib-2.0/schemas/ && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
dnf autoremove -y && \
dnf clean all && \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions jenkins-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ external_type: os
release_type: prerelease
release_tag: fedora-mate
ls_branch: fedora-mate
build_armhf: false
repo_vars:
- BUILD_VERSION_ARG = 'OS_VERSION'
- LS_USER = 'linuxserver'
Expand All @@ -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 = ''