Skip to content

Commit a597d44

Browse files
m1k1oyesBadyesBad
authored
Upgrade to debian trixie (#581)
* move flavored bookworm dockerfile to a new trixie dockerfile. * fix opera openbox selector. * fix remmina dependencies. * remove chromium explicit bookworm source. * Update apps to work with trixie (#624) Co-authored-by: yesBad <me@bad.cash> * remove SYS_ADMIN capability requirement for Chromium-based Docker images and update documentation accordingly. * fix chromium package. * change uBlock Origin to uBlock Origin Lite. * restore waterfox in build matrix for GHCR workflows. --------- Co-authored-by: Bad <87938689+yesBad@users.noreply.github.com> Co-authored-by: yesBad <me@bad.cash>
1 parent a2f5f7e commit a597d44

43 files changed

Lines changed: 129 additions & 709 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ghcr.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ jobs:
2424
include:
2525
- name: firefox
2626
platforms: linux/amd64,linux/arm64,linux/arm/v7
27-
# Temporarily disabled due to Cloudflare blocked download link
28-
#- name: waterfox
29-
# platforms: linux/amd64
27+
- name: waterfox
28+
platforms: linux/amd64
3029
- name: chromium
3130
platforms: linux/amd64,linux/arm64,linux/arm/v7
3231
- name: google-chrome

.github/workflows/ghcr_intel.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
matrix:
2626
include:
2727
- name: firefox
28-
# Temporarily disabled due to Cloudflare blocked download link
29-
#- name: waterfox
28+
- name: waterfox
3029
- name: chromium
3130
- name: google-chrome
3231
- name: ungoogled-chromium

apps/brave/policies.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"chrome://policy"
2727
],
2828
"ExtensionInstallForcelist": [
29-
"cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx",
29+
"ddkjiahejlhfcafbddmgiahcphecmpfh;https://clients2.google.com/service/update2/crx",
3030
"mnjggcdmjocbbbhaepdhchncahnbgone;https://clients2.google.com/service/update2/crx"
3131
],
3232
"ExtensionInstallAllowlist": [
33-
"cjpalhdlnbpafiamejdnhcphjbkeiagm",
33+
"ddkjiahejlhfcafbddmgiahcphecmpfh",
3434
"mnjggcdmjocbbbhaepdhchncahnbgone"
3535
],
3636
"ExtensionInstallBlocklist": [

apps/brave/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[program:brave]
22
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
33
command=/usr/bin/brave-browser
4+
--no-sandbox
45
--window-position=0,0
56
--display=%(ENV_DISPLAY)s
67
--user-data-dir=/home/neko/.config/brave

apps/brave/supervisord.nvidia.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[program:brave]
22
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
33
command=/bin/entrypoint.sh /usr/bin/brave-browser
4+
--no-sandbox
45
--window-position=0,0
56
--display=%(ENV_DISPLAY)s
67
--user-data-dir=/home/neko/.config/brave

apps/chromium/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ COPY ./widevinecdm.sh /widevine.sh
66
#
77
# install neko chromium
88
RUN set -eux; \
9-
echo "deb http://ftp.de.debian.org/debian bookworm main" >> /etc/apt/sources.list; \
109
apt-get update; \
1110
apt-get install -y --no-install-recommends chromium chromium-common chromium-sandbox openbox; \
1211
#

apps/chromium/Dockerfile.nvidia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN set -eux; \
1010
apt-get install -y --no-install-recommends software-properties-common; \
1111
# chromium-browser from default repo needs snap to be installed
1212
# and nvidia base is ubuntu not debian
13-
add-apt-repository ppa:system76/pop; \
13+
add-apt-repository ppa:xtradeb/apps; \
1414
apt-get update; \
1515
apt-get install -y --no-install-recommends xz-utils chromium openbox; \
1616
#

apps/chromium/policies.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"chrome://policy"
2828
],
2929
"ExtensionInstallForcelist": [
30-
"cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx",
30+
"ddkjiahejlhfcafbddmgiahcphecmpfh;https://clients2.google.com/service/update2/crx",
3131
"mnjggcdmjocbbbhaepdhchncahnbgone;https://clients2.google.com/service/update2/crx"
3232
],
3333
"ExtensionInstallAllowlist": [
34-
"cjpalhdlnbpafiamejdnhcphjbkeiagm",
34+
"ddkjiahejlhfcafbddmgiahcphecmpfh",
3535
"mnjggcdmjocbbbhaepdhchncahnbgone"
3636
],
3737
"ExtensionInstallBlocklist": [

apps/chromium/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[program:chromium]
22
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
33
command=/usr/bin/chromium
4+
--no-sandbox
45
--window-position=0,0
56
--display=%(ENV_DISPLAY)s
67
--user-data-dir=/home/neko/.config/chromium

apps/chromium/supervisord.nvidia.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[program:chromium]
22
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
33
command=/bin/entrypoint.sh /usr/bin/chromium
4+
--no-sandbox
45
--window-position=0,0
56
--display=%(ENV_DISPLAY)s
67
--user-data-dir=/home/neko/.config/chromium

0 commit comments

Comments
 (0)