tyler.durden/docker-webtop
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-webtop.git synced 2025-07-27 07:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

rebase master to 3.19 swap to firefox (#193)

Browse Source
This commit is contained in:
Ryan Kuba 2023-12-29 15:55:55 -08:00 committed by GitHub
parent 096d3668fe
commit e0a487869f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
# set version label
ARG BUILD_DATE
@ -11,21 +11,16 @@ LABEL maintainer="thelamer"
RUN \
echo "**** install packages ****" && \
apk add --no-cache \
chromium \
faenza-icon-theme \
faenza-icon-theme-xfce4-appfinder \
faenza-icon-theme-xfce4-panel \
firefox \
mousepad \
ristretto \
thunar \
util-linux-misc \
xfce4 \
xfce4-terminal && \
echo "**** application tweaks ****" && \
sed -i \
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
/usr/share/applications/chromium.desktop && \
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
echo "**** cleanup ****" && \
rm -f \
/etc/xdg/autostart/xfce4-power-manager.desktop \

9
Dockerfile.aarch64
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
# set version label
ARG BUILD_DATE
@ -11,21 +11,16 @@ LABEL maintainer="thelamer"
RUN \
echo "**** install packages ****" && \
apk add --no-cache \
chromium \
faenza-icon-theme \
faenza-icon-theme-xfce4-appfinder \
faenza-icon-theme-xfce4-panel \
firefox \
mousepad \
ristretto \
thunar \
util-linux-misc \
xfce4 \
xfce4-terminal && \
echo "**** application tweaks ****" && \
sed -i \
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
/usr/share/applications/chromium.desktop && \
mv /usr/bin/exo-open /usr/bin/exo-open-real && \
echo "**** cleanup ****" && \
rm -f \
/etc/xdg/autostart/xfce4-power-manager.desktop \

1
README.md
View File

@ -399,6 +399,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **29.12.23:** - Rebase Alpine to 3.19 and swap back to Firefox.
* **07.11.23:** - Rebase Fedora to 39.
* **14.06.23:** - Rebase to Debian Bookworm.
* **13.05.23:** - Rebase to Alpine 3.18 and Fedora 38.

1
readme-vars.yml
View File

@ -135,6 +135,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "29.12.23:", desc: "Rebase Alpine to 3.19 and swap back to Firefox." }
- { date: "07.11.23:", desc: "Rebase Fedora to 39." }
- { date: "14.06.23:", desc: "Rebase to Debian Bookworm." }
- { date: "13.05.23:", desc: "Rebase to Alpine 3.18 and Fedora 38." }

7
root/usr/bin/exo-open
View File

@ -1,7 +0,0 @@
#! /bin/bash
if [ "${2}" == "WebBrowser" ]; then
/usr/bin/xdg-open /usr/share/applications/chromium.desktop
else
/usr/bin/exo-open-real "$@"
fi

10
root/usr/local/bin/wrapped-chromium
View File

@ -1,10 +0,0 @@
#! /bin/bash
BIN=/usr/bin/chromium-browser
# Run normally on privved containers or modified un non priv
if grep -q 'Seccomp: 0' /proc/1/status; then
${BIN} --password-store=basic "$@"
else
${BIN} --password-store=basic --no-sandbox --test-type "$@"
fi