From 0ff12d84d56b97cad1d73b49d5c797bbf40b4a07 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Tue, 17 Jun 2025 14:53:03 +0000 Subject: [PATCH] rebase ubuntu-i3 to selkies (#320) --- .editorconfig | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 19 ++++++++++++------- Dockerfile.aarch64 | 19 ++++++++++++------- Jenkinsfile | 4 ++-- jenkins-vars.yml | 4 ++-- root/etc/apt/preferences.d/firefox-no-snap | 3 --- root/usr/bin/chromium | 15 +++++++++++++++ 12 files changed, 43 insertions(+), 21 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/permissions.yml delete mode 100644 root/etc/apt/preferences.d/firefox-no-snap create mode 100755 root/usr/bin/chromium diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 116744ea..8fb1a238 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble +FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble # set version label ARG BUILD_DATE @@ -9,20 +9,22 @@ LABEL maintainer="thelamer" # title ENV TITLE="Ubuntu i3" -# prevent Ubuntu's firefox stub from being installed -COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap - RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ + /usr/share/selkies/www/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \ echo "**** install packages ****" && \ - add-apt-repository -y ppa:mozillateam/ppa && \ + apt-key adv \ + --keyserver hkp://keyserver.ubuntu.com:80 \ + --recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \ + echo \ + "deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \ + /etc/apt/sources.list.d/xtradeb.list && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ - firefox \ + chromium \ i3 \ i3-wm \ stterm && \ @@ -30,6 +32,9 @@ RUN \ update-alternatives --set \ x-terminal-emulator \ /usr/bin/st && \ + mv \ + /usr/bin/chromium \ + /usr/bin/chromium-browser && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f0f892d7..986cbfcc 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble # set version label ARG BUILD_DATE @@ -9,20 +9,22 @@ LABEL maintainer="thelamer" # title ENV TITLE="Ubuntu i3" -# prevent Ubuntu's firefox stub from being installed -COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap - RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ + /usr/share/selkies/www/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \ echo "**** install packages ****" && \ - add-apt-repository -y ppa:mozillateam/ppa && \ + apt-key adv \ + --keyserver hkp://keyserver.ubuntu.com:80 \ + --recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \ + echo \ + "deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \ + /etc/apt/sources.list.d/xtradeb.list && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ - firefox \ + chromium \ i3 \ i3-wm \ stterm && \ @@ -30,6 +32,9 @@ RUN \ update-alternatives --set \ x-terminal-emulator \ /usr/bin/st && \ + mv \ + /usr/bin/chromium \ + /usr/bin/chromium-browser && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index ffc20f69..295b7495 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,8 +30,8 @@ pipeline { MULTIARCH='true' CI='true' CI_WEB='true' - CI_PORT='3000' - CI_SSL='false' + CI_PORT='3001' + CI_SSL='true' CI_DELAY='120' CI_DOCKERENV='TZ=US/Pacific' CI_AUTH='user:password' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 78d87b75..ce68efb5 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -19,8 +19,8 @@ repo_vars: - MULTIARCH='true' - CI='true' - CI_WEB='true' - - CI_PORT='3000' - - CI_SSL='false' + - CI_PORT='3001' + - CI_SSL='true' - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' diff --git a/root/etc/apt/preferences.d/firefox-no-snap b/root/etc/apt/preferences.d/firefox-no-snap deleted file mode 100644 index 9406bcc0..00000000 --- a/root/etc/apt/preferences.d/firefox-no-snap +++ /dev/null @@ -1,3 +0,0 @@ -Package: firefox* -Pin: release o=Ubuntu* -Pin-Priority: -1 diff --git a/root/usr/bin/chromium b/root/usr/bin/chromium new file mode 100755 index 00000000..f4adcab8 --- /dev/null +++ b/root/usr/bin/chromium @@ -0,0 +1,15 @@ +#! /bin/bash + +BIN=/usr/bin/chromium-browser + +# Cleanup +if ! pgrep chromium > /dev/null;then + rm -f $HOME/.config/chromium/Singleton* +fi + +# Run normally on privved containers or modified un non priv +if grep -q 'Seccomp:.0' /proc/1/status; then + ${BIN} --no-first-run --password-store=basic "$@" +else + ${BIN} --no-first-run --password-store=basic --no-sandbox --test-type "$@" +fi