From 2b032f0da5e38ed8c95f3a1ebf5d2ca77ea6fa77 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 9 May 2023 23:09:23 +0100 Subject: [PATCH 1/3] Add chromium --- Dockerfile | 4 +++- Dockerfile.aarch64 | 4 +++- README.md | 1 + readme-vars.yml | 1 + root/usr/bin/chromium | 24 ++++++++++++++++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100755 root/usr/bin/chromium diff --git a/Dockerfile b/Dockerfile index 0d391b8..ace9728 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # title -ENV TITLE=WebCord +ENV TITLE=WebCord \ +DEBIAN_FRONTEND=noninteractive RUN \ echo "**** install webcord ****" && \ @@ -21,6 +22,7 @@ RUN \ "https://github.com/SpacingBat3/WebCord/releases/download/${WEBCORD_VERSION}/webcord_$(echo ${WEBCORD_VERSION}| cut -c2-)_amd64.deb" && \ apt-get update && \ apt install -y /tmp/webcord.deb && \ + apt install -y --no-install-recommends chromium && \ echo "**** openbox tweaks ****" && \ sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml && \ echo "**** application tweaks ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1bfae6c..7c664db 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # title -ENV TITLE=WebCord +ENV TITLE=WebCord \ +DEBIAN_FRONTEND=noninteractive RUN \ echo "**** install webcord ****" && \ @@ -21,6 +22,7 @@ RUN \ "https://github.com/SpacingBat3/WebCord/releases/download/${WEBCORD_VERSION}/webcord_$(echo ${WEBCORD_VERSION}| cut -c2-)_arm64.deb" && \ apt-get update && \ apt install -y /tmp/webcord.deb && \ + apt install -y --no-install-recommends chromium && \ echo "**** openbox tweaks ****" && \ sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml && \ echo "**** application tweaks ****" && \ diff --git a/README.md b/README.md index 2aa3173..d565797 100644 --- a/README.md +++ b/README.md @@ -265,4 +265,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **09.05.23:** - Bundle Chromium to provide browser for opening links, etc. * **21.04.23:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 6c3e2d5..5899098 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -75,4 +75,5 @@ app_setup_block: | # changelog changelogs: + - { date: "09.05.23:", desc: "Bundle Chromium to provide browser for opening links, etc." } - { date: "21.04.23:", desc: "Initial release." } diff --git a/root/usr/bin/chromium b/root/usr/bin/chromium new file mode 100755 index 0000000..0e19ec7 --- /dev/null +++ b/root/usr/bin/chromium @@ -0,0 +1,24 @@ +#!/bin/bash + +BIN=/usr/lib/chromium/chromium + +# Run normally on privved containers or modified un non priv +if grep -q 'Seccomp: 0' /proc/1/status; then + ${BIN} \ + --ignore-gpu-blocklist \ + --no-first-run \ + --password-store=basic \ + --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' \ + --user-data-dir \ + "$@" > /dev/null 2>&1 +else + ${BIN} \ + --ignore-gpu-blocklist \ + --no-first-run \ + --no-sandbox \ + --password-store=basic \ + --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' \ + --test-type \ + --user-data-dir \ + "$@" > /dev/null 2>&1 +fi From c23961bea41b013e963a009e88001e02486e8651 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 10 May 2023 12:48:50 -0400 Subject: [PATCH 2/3] add chromium launcher to openbox menu --- root/defaults/menu.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index 788a944..9847c63 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -2,6 +2,7 @@ /usr/bin/webcord +/usr/bin/chromium /usr/bin/xterm From 7272ff24c2e10b35466a8b6492fab109b682ec1a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 10 May 2023 20:01:55 +0100 Subject: [PATCH 3/3] Use apt-get everywhere for consistency --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ace9728..6c7a9f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,8 +21,8 @@ RUN \ /tmp/webcord.deb -L \ "https://github.com/SpacingBat3/WebCord/releases/download/${WEBCORD_VERSION}/webcord_$(echo ${WEBCORD_VERSION}| cut -c2-)_amd64.deb" && \ apt-get update && \ - apt install -y /tmp/webcord.deb && \ - apt install -y --no-install-recommends chromium && \ + apt-get install -y /tmp/webcord.deb && \ + apt-get install -y --no-install-recommends chromium && \ echo "**** openbox tweaks ****" && \ sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml && \ echo "**** application tweaks ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7c664db..cef8daa 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -21,8 +21,8 @@ RUN \ /tmp/webcord.deb -L \ "https://github.com/SpacingBat3/WebCord/releases/download/${WEBCORD_VERSION}/webcord_$(echo ${WEBCORD_VERSION}| cut -c2-)_arm64.deb" && \ apt-get update && \ - apt install -y /tmp/webcord.deb && \ - apt install -y --no-install-recommends chromium && \ + apt-get install -y /tmp/webcord.deb && \ + apt-get install -y --no-install-recommends chromium && \ echo "**** openbox tweaks ****" && \ sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml && \ echo "**** application tweaks ****" && \