Skip to content

Commit 4c17f40

Browse files
authored
rebase fedora-xfce to selkies setup default settings (#306)
1 parent 1d4a179 commit 4c17f40

File tree

16 files changed

+225
-29
lines changed

16 files changed

+225
-29
lines changed

.editorconfig

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

100755100644
File mode changed.

.github/workflows/call_issues_cron.yml

100755100644
File mode changed.

.github/workflows/permissions.yml

100755100644
File mode changed.

Dockerfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:fedora41
1+
FROM ghcr.io/linuxserver/baseimage-selkies:fedora42
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,12 +7,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
77
LABEL maintainer="thelamer"
88

99
# title
10-
ENV TITLE="Fedora XFCE"
10+
ENV TITLE="Fedora XFCE" \
11+
NO_GAMEPAD="true"
1112

1213
RUN \
1314
echo "**** add icon ****" && \
1415
curl -o \
15-
/kclient/public/icon.png \
16+
/usr/share/selkies/www/icon.png \
1617
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
1718
echo "**** install packages ****" && \
1819
dnf install -y --setopt=install_weak_deps=False --best \
@@ -36,14 +37,18 @@ RUN \
3637
xfdesktop \
3738
xfwm4 \
3839
xfwm4-themes && \
39-
echo "**** application tweaks ****" && \
40+
echo "**** xfce tweaks ****" && \
4041
sed -i \
4142
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
4243
/usr/share/applications/chromium-browser.desktop && \
43-
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
44-
echo "**** xfce tweaks ****" && \
44+
mv \
45+
/usr/bin/exo-open \
46+
/usr/bin/exo-open-real && \
47+
mv \
48+
/usr/bin/thunar \
49+
/usr/bin/thunar-real && \
4550
rm -f \
46-
/etc/xdg/autostart/xfce-polkit.desktop && \
51+
/etc/xdg/autostart/xscreensaver.desktop && \
4752
echo "**** cleanup ****" && \
4853
dnf autoremove -y && \
4954
dnf clean all && \

Dockerfile.aarch64

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-fedora41
1+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-fedora42
22

33
# set version label
44
ARG BUILD_DATE
@@ -7,12 +7,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
77
LABEL maintainer="thelamer"
88

99
# title
10-
ENV TITLE="Fedora XFCE"
10+
ENV TITLE="Fedora XFCE" \
11+
NO_GAMEPAD="true"
1112

1213
RUN \
1314
echo "**** add icon ****" && \
1415
curl -o \
15-
/kclient/public/icon.png \
16+
/usr/share/selkies/www/icon.png \
1617
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
1718
echo "**** install packages ****" && \
1819
dnf install -y --setopt=install_weak_deps=False --best \
@@ -36,14 +37,18 @@ RUN \
3637
xfdesktop \
3738
xfwm4 \
3839
xfwm4-themes && \
39-
echo "**** application tweaks ****" && \
40+
echo "**** xfce tweaks ****" && \
4041
sed -i \
4142
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
4243
/usr/share/applications/chromium-browser.desktop && \
43-
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
44-
echo "**** xfce tweaks ****" && \
44+
mv \
45+
/usr/bin/exo-open \
46+
/usr/bin/exo-open-real && \
47+
mv \
48+
/usr/bin/thunar \
49+
/usr/bin/thunar-real && \
4550
rm -f \
46-
/etc/xdg/autostart/xfce-polkit.desktop && \
51+
/etc/xdg/autostart/xscreensaver.desktop && \
4752
echo "**** cleanup ****" && \
4853
dnf autoremove -y && \
4954
dnf clean all && \

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ pipeline {
3030
MULTIARCH = 'true'
3131
CI = 'true'
3232
CI_WEB = 'true'
33-
CI_PORT = '3000'
34-
CI_SSL = 'false'
33+
CI_PORT = '3001'
34+
CI_SSL = 'true'
3535
CI_DELAY = '120'
3636
CI_DOCKERENV = 'TZ=US/Pacific'
3737
CI_AUTH = 'user:password'

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ repo_vars:
1919
- MULTIARCH = 'true'
2020
- CI = 'true'
2121
- CI_WEB = 'true'
22-
- CI_PORT = '3000'
23-
- CI_SSL = 'false'
22+
- CI_PORT = '3001'
23+
- CI_SSL = 'true'
2424
- CI_DELAY = '120'
2525
- CI_DOCKERENV = 'TZ=US/Pacific'
2626
- CI_AUTH = 'user:password'

0 commit comments

Comments
 (0)