From 2ac58555d6931d497832f9a074c473ea85d1c030 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 22 Sep 2025 13:48:09 -0400 Subject: [PATCH] rebase to trixie --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 5 +---- readme-vars.yml | 7 +------ root/usr/bin/wrapped-brave | 13 +------------ 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d5bdc9..f775b05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm +FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1b772f1..7bd0bcd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debianbookworm +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debiantrixie # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index e5be7c1..79fc718 100644 --- a/README.md +++ b/README.md @@ -220,8 +220,6 @@ services: brave: image: lscr.io/linuxserver/brave:latest container_name: brave - security_opt: - - seccomp:unconfined #optional environment: - PUID=1000 - PGID=1000 @@ -240,7 +238,6 @@ services: ```bash docker run -d \ --name=brave \ - --security-opt seccomp=unconfined `#optional` \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ @@ -265,7 +262,6 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-v /config` | Users home directory in the container, stores local files and settings | | `--shm-size=` | This is needed for Brave to function. | -| `--security-opt seccomp=unconfined` | For Docker Engine only, many modern gui apps need this to function on older hosts as syscalls are unknown to Docker. | ## Environment variables from files (Docker secrets) @@ -429,4 +425,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **22.09.25:** - Rebase to Debian Trixie. * **06.06.25:** - Initial Version. diff --git a/readme-vars.yml b/readme-vars.yml index c00c517..1f0fb45 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -17,9 +17,6 @@ development_versions: false # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_env: true -param_env_vars: - - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."} param_usage_include_vols: true param_volumes: - {vol_path: "/config", vol_host_path: "/path/to/config", desc: "Users home directory in the container, stores local files and settings"} @@ -29,9 +26,6 @@ param_ports: - {external_port: "3001", internal_port: "3001", port_desc: "Brave desktop gui HTTPS."} custom_params: - {name: "shm-size", name_compose: "shm_size", value: "1gb", desc: "This is needed for Brave to function."} -opt_security_opt_param: true -opt_security_opt_param_vars: - - {run_var: "seccomp=unconfined", compose_var: "seccomp:unconfined", desc: "For Docker Engine only, many modern gui apps need this to function on older hosts as syscalls are unknown to Docker."} # Selkies blurb settings selkies_blurb: true show_nvidia: true @@ -111,4 +105,5 @@ init_diagram: | "brave:latest" <- Base Images # changelog changelogs: + - {date: "22.09.25:", desc: "Rebase to Debian Trixie."} - {date: "06.06.25:", desc: "Initial Version."} diff --git a/root/usr/bin/wrapped-brave b/root/usr/bin/wrapped-brave index d75bc70..85591b3 100755 --- a/root/usr/bin/wrapped-brave +++ b/root/usr/bin/wrapped-brave @@ -7,17 +7,7 @@ if pgrep brave > /dev/null;then rm -f $HOME/.config/BraveSoftware/Brave-Browser/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 \ - --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT' \ - --start-maximized \ - --user-data-dir \ - "$@" > /dev/null 2>&1 -else - ${BIN} \ +${BIN} \ --no-first-run \ --no-sandbox \ --password-store=basic \ @@ -26,4 +16,3 @@ else --test-type \ --user-data-dir \ "$@" > /dev/null 2>&1 -fi