Skip to content

Commit 33d4869

Browse files
authored
ubuntu xfce rebase to selkies, set sane defaults, use chromium (#313)
1 parent 35cef27 commit 33d4869

File tree

19 files changed

+285
-36
lines changed

19 files changed

+285
-36
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: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
1+
FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
22

33
# set version label
44
ARG BUILD_DATE
@@ -9,26 +9,40 @@ LABEL maintainer="thelamer"
99
# title
1010
ENV TITLE="Ubuntu XFCE"
1111

12-
# prevent Ubuntu's firefox stub from being installed
13-
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
14-
1512
RUN \
1613
echo "**** add icon ****" && \
1714
curl -o \
18-
/kclient/public/icon.png \
15+
/usr/share/selkies/www/icon.png \
1916
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
2017
echo "**** install packages ****" && \
21-
add-apt-repository -y ppa:mozillateam/ppa && \
18+
apt-key adv \
19+
--keyserver hkp://keyserver.ubuntu.com:80 \
20+
--recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
21+
echo \
22+
"deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
23+
/etc/apt/sources.list.d/xtradeb.list && \
2224
apt-get update && \
2325
DEBIAN_FRONTEND=noninteractive \
2426
apt-get install --no-install-recommends -y \
25-
firefox \
27+
chromium \
2628
mousepad \
2729
xfce4-terminal \
2830
xfce4 \
2931
xubuntu-default-settings \
3032
xubuntu-icon-theme && \
3133
echo "**** xfce tweaks ****" && \
34+
sed -i \
35+
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
36+
/usr/share/applications/chromium.desktop && \
37+
mv \
38+
/usr/bin/exo-open \
39+
/usr/bin/exo-open-real && \
40+
mv \
41+
/usr/bin/thunar \
42+
/usr/bin/thunar-real && \
43+
mv \
44+
/usr/bin/chromium \
45+
/usr/bin/chromium-browser && \
3246
rm -f \
3347
/etc/xdg/autostart/xscreensaver.desktop && \
3448
echo "**** cleanup ****" && \

Dockerfile.aarch64

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

33
# set version label
44
ARG BUILD_DATE
@@ -9,26 +9,40 @@ LABEL maintainer="thelamer"
99
# title
1010
ENV TITLE="Ubuntu XFCE"
1111

12-
# prevent Ubuntu's firefox stub from being installed
13-
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
14-
1512
RUN \
1613
echo "**** add icon ****" && \
1714
curl -o \
18-
/kclient/public/icon.png \
15+
/usr/share/selkies/www/icon.png \
1916
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
2017
echo "**** install packages ****" && \
21-
add-apt-repository -y ppa:mozillateam/ppa && \
18+
apt-key adv \
19+
--keyserver hkp://keyserver.ubuntu.com:80 \
20+
--recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
21+
echo \
22+
"deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
23+
/etc/apt/sources.list.d/xtradeb.list && \
2224
apt-get update && \
2325
DEBIAN_FRONTEND=noninteractive \
2426
apt-get install --no-install-recommends -y \
25-
firefox \
27+
chromium \
2628
mousepad \
2729
xfce4-terminal \
2830
xfce4 \
2931
xubuntu-default-settings \
3032
xubuntu-icon-theme && \
3133
echo "**** xfce tweaks ****" && \
34+
sed -i \
35+
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
36+
/usr/share/applications/chromium.desktop && \
37+
mv \
38+
/usr/bin/exo-open \
39+
/usr/bin/exo-open-real && \
40+
mv \
41+
/usr/bin/thunar \
42+
/usr/bin/thunar-real && \
43+
mv \
44+
/usr/bin/chromium \
45+
/usr/bin/chromium-browser && \
3246
rm -f \
3347
/etc/xdg/autostart/xscreensaver.desktop && \
3448
echo "**** cleanup ****" && \

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)