diff --git a/Dockerfile b/Dockerfile index 92ed69d..eff9852 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie # set version label ARG BUILD_DATE @@ -41,6 +43,6 @@ RUN \ COPY /root / # ports and volumes -EXPOSE 3000 +EXPOSE 3001 VOLUME /config diff --git a/README.md b/README.md index d67c862..870d095 100644 --- a/README.md +++ b/README.md @@ -221,8 +221,6 @@ services: msedge: image: lscr.io/linuxserver/msedge:latest container_name: msedge - security_opt: - - seccomp:unconfined #optional environment: - PUID=1000 - PGID=1000 @@ -242,7 +240,6 @@ services: ```bash docker run -d \ --name=msedge \ - --security-opt seccomp=unconfined `#optional` \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ @@ -269,7 +266,6 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e EDGE_CLI=https://www.linuxserver.io/` | Specify one or multiple Chromium CLI flags, this string will be passed to the application in full. | | `-v /config` | Users home directory in the container, stores local files and settings | | `--shm-size=` | This is required for Edge to launch and 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. Edge runs in no-sandbox mode without it. | ## Environment variables from files (Docker secrets) @@ -433,6 +429,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **22.09.25:** - Rebase to Debian Trixie. * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED. * **04.02.25:** - Clean up Singletons if container is shut down while windows are open. * **25.04.24:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 59032fe..9d5e2f2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -16,9 +16,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"} @@ -32,9 +29,6 @@ custom_params: opt_param_usage_include_env: true opt_param_env_vars: - {env_var: "EDGE_CLI", env_value: "https://www.linuxserver.io/", desc: "Specify one or multiple Chromium CLI flags, this string will be passed to the application in full."} -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. Edge runs in no-sandbox mode without it."} # Selkies blurb settings selkies_blurb: true show_nvidia: true @@ -115,6 +109,7 @@ init_diagram: | "msedge:latest" <- Base Images # changelog changelogs: + - {date: "22.09.25:", desc: "Rebase to Debian Trixie."} - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."} - {date: "04.02.25:", desc: "Clean up Singletons if container is shut down while windows are open."} - {date: "25.04.24:", desc: "Initial release."} diff --git a/root/usr/bin/microsoft-edge b/root/usr/bin/microsoft-edge index 31ef3c3..1acdf05 100755 --- a/root/usr/bin/microsoft-edge +++ b/root/usr/bin/microsoft-edge @@ -7,15 +7,8 @@ if ! pgrep msedge > /dev/null;then rm -f $HOME/.config/microsoft-edge/Singleton* fi -# Run normally on privved containers or modified un non priv -if grep -q 'Seccomp:.0' /proc/1/status; then - ${BIN} \ - --password-store=basic \ - "$@" > /dev/null 2>&1 -else - ${BIN} \ +${BIN} \ --password-store=basic \ --no-sandbox \ --test-type \ "$@" > /dev/null 2>&1 -fi