Skip to content

Commit f075a43

Browse files
committed
rebase ubuntu-kde to selkies setup default settings
1 parent c154155 commit f075a43

14 files changed

Lines changed: 95 additions & 32 deletions

File tree

.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: 13 additions & 8 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
@@ -10,21 +10,23 @@ ARG DEBIAN_FRONTEND="noninteractive"
1010
# title
1111
ENV TITLE="Ubuntu KDE"
1212

13-
# prevent Ubuntu's firefox stub from being installed
14-
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
15-
1613
RUN \
1714
echo "**** add icon ****" && \
1815
curl -o \
19-
/kclient/public/icon.png \
16+
/usr/share/selkies/www/icon.png \
2017
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
2118
echo "**** install packages ****" && \
22-
add-apt-repository -y ppa:mozillateam/ppa && \
19+
apt-key adv \
20+
--keyserver hkp://keyserver.ubuntu.com:80 \
21+
--recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
22+
echo \
23+
"deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
24+
/etc/apt/sources.list.d/xtradeb.list && \
2325
apt-get update && \
2426
DEBIAN_FRONTEND=noninteractive \
2527
apt-get install --no-install-recommends -y \
28+
chromium \
2629
dolphin \
27-
firefox \
2830
gwenview \
2931
kde-config-gtk-style \
3032
kdialog \
@@ -42,9 +44,12 @@ RUN \
4244
kwrite \
4345
plasma-desktop \
4446
plasma-workspace \
45-
plymouth-theme-kubuntu-logo \
4647
qml-module-qt-labs-platform \
4748
systemsettings && \
49+
echo "**** application tweaks ****" && \
50+
sed -i \
51+
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
52+
/usr/share/applications/chromium.desktop && \
4853
echo "**** kde tweaks ****" && \
4954
sed -i \
5055
's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \

Dockerfile.aarch64

Lines changed: 13 additions & 8 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
@@ -10,21 +10,23 @@ ARG DEBIAN_FRONTEND="noninteractive"
1010
# title
1111
ENV TITLE="Ubuntu KDE"
1212

13-
# prevent Ubuntu's firefox stub from being installed
14-
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
15-
1613
RUN \
1714
echo "**** add icon ****" && \
1815
curl -o \
19-
/kclient/public/icon.png \
16+
/usr/share/selkies/www/icon.png \
2017
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
2118
echo "**** install packages ****" && \
22-
add-apt-repository -y ppa:mozillateam/ppa && \
19+
apt-key adv \
20+
--keyserver hkp://keyserver.ubuntu.com:80 \
21+
--recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
22+
echo \
23+
"deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
24+
/etc/apt/sources.list.d/xtradeb.list && \
2325
apt-get update && \
2426
DEBIAN_FRONTEND=noninteractive \
2527
apt-get install --no-install-recommends -y \
28+
chromium \
2629
dolphin \
27-
firefox \
2830
gwenview \
2931
kde-config-gtk-style \
3032
kdialog \
@@ -42,9 +44,12 @@ RUN \
4244
kwrite \
4345
plasma-desktop \
4446
plasma-workspace \
45-
plymouth-theme-kubuntu-logo \
4647
qml-module-qt-labs-platform \
4748
systemsettings && \
49+
echo "**** application tweaks ****" && \
50+
sed -i \
51+
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
52+
/usr/share/applications/chromium.desktop && \
4853
echo "**** kde tweaks ****" && \
4954
sed -i \
5055
's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \

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)