mirror of
https://github.com/linuxserver/docker-webtop.git
synced 2025-07-07 13:54:57 +02:00
rebase ubuntu-i3 to selkies (#320)
This commit is contained in:
parent
02def43d91
commit
0ff12d84d5
0
.editorconfig
Executable file → Normal file
0
.editorconfig
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.feature.yml
vendored
Executable file → Normal file
0
.github/ISSUE_TEMPLATE/issue.feature.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issue_pr_tracker.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issue_pr_tracker.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issues_cron.yml
vendored
Executable file → Normal file
0
.github/workflows/call_issues_cron.yml
vendored
Executable file → Normal file
0
.github/workflows/permissions.yml
vendored
Executable file → Normal file
0
.github/workflows/permissions.yml
vendored
Executable file → Normal file
19
Dockerfile
19
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 \
|
||||
|
@ -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 \
|
||||
|
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -1,3 +0,0 @@
|
||||
Package: firefox*
|
||||
Pin: release o=Ubuntu*
|
||||
Pin-Priority: -1
|
15
root/usr/bin/chromium
Executable file
15
root/usr/bin/chromium
Executable file
@ -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
|
Loading…
x
Reference in New Issue
Block a user