From 8d41a8923d72eabe3f38659a3867bfb50cfcda25 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 22 Sep 2025 14:01:38 -0400 Subject: [PATCH 1/3] rebase to trixie --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 5 +---- readme-vars.yml | 7 +------ root/defaults/menu.xml | 2 +- root/defaults/tint2rc | 10 +++++----- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ff0711..02eaf4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -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 3f708d5..cea7d09 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -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 74a20f4..e2d8ef6 100644 --- a/README.md +++ b/README.md @@ -220,8 +220,6 @@ services: calligra: image: lscr.io/linuxserver/calligra:latest container_name: calligra - security_opt: - - seccomp:unconfined #optional environment: - PUID=1000 - PGID=1000 @@ -239,7 +237,6 @@ services: ```bash docker run -d \ --name=calligra \ - --security-opt seccomp=unconfined `#optional` \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ @@ -262,7 +259,6 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PGID=1000` | for GroupID - see below for explanation | | `-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 | -| `--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) @@ -426,6 +422,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. * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon. * **07.12.23:** - Initial Release. diff --git a/readme-vars.yml b/readme-vars.yml index 5a34ed9..8879797 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"} @@ -27,9 +24,6 @@ param_usage_include_ports: true param_ports: - {external_port: "3000", internal_port: "3000", port_desc: "Calligra desktop gui HTTP, must be proxied."} - {external_port: "3001", internal_port: "3001", port_desc: "Calligra desktop gui HTTPS."} -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 @@ -109,6 +103,7 @@ init_diagram: | "calligra: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: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."} - {date: "07.12.23:", desc: "Initial Release."} diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index 42d4e62..8894625 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -2,6 +2,6 @@ /usr/bin/st -/usr/bin/thunar +/usr/bin/caja diff --git a/root/defaults/tint2rc b/root/defaults/tint2rc index a948c92..65c3bcc 100644 --- a/root/defaults/tint2rc +++ b/root/defaults/tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf 87ed ---- +#---- Generated by tint2conf beb5 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -161,10 +161,9 @@ launcher_icon_asb = 100 0 0 launcher_icon_theme_override = 0 startup_notifications = 1 launcher_tooltip = 1 -launcher_item_app = /usr/share/applications/org.kde.calligrawords.desktop -launcher_item_app = /usr/share/applications/org.kde.calligrasheets.desktop -launcher_item_app = /usr/share/applications/org.kde.calligrastage.desktop -launcher_item_app = /usr/share/applications/org.kde.karbon.desktop +launcher_item_app = /usr/share/applications/org.kde.calligra.words.desktop +launcher_item_app = /usr/share/applications/org.kde.calligra.sheets.desktop +launcher_item_app = /usr/share/applications/org.kde.calligra.stage.desktop launcher_item_app = /usr/share/applications/org.kde.calligraplan.desktop launcher_item_app = /usr/share/applications/org.kde.kexi-3.2.desktop launcher_item_app = /usr/share/applications/caja-browser.desktop @@ -214,3 +213,4 @@ tooltip_hide_timeout = 0.1 tooltip_padding = 4 4 tooltip_background_id = 5 tooltip_font_color = #dddddd 100 + From da7efdfad21d35ca72c1abca4717e57da5dfcd9a Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 22 Sep 2025 14:04:19 -0400 Subject: [PATCH 2/3] note on shm-size --- README.md | 3 +++ readme-vars.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/README.md b/README.md index e2d8ef6..f217a5f 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ services: ports: - 3000:3000 - 3001:3001 + shm_size: "1gb" restart: unless-stopped ``` @@ -243,6 +244,7 @@ docker run -d \ -p 3000:3000 \ -p 3001:3001 \ -v /path/to/config:/config \ + --shm-size="1gb" \ --restart unless-stopped \ lscr.io/linuxserver/calligra:latest ``` @@ -259,6 +261,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PGID=1000` | for GroupID - see below for explanation | | `-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=` | Recommended for all desktop images. | ## Environment variables from files (Docker secrets) diff --git a/readme-vars.yml b/readme-vars.yml index 8879797..1f694ad 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,6 +24,8 @@ param_usage_include_ports: true param_ports: - {external_port: "3000", internal_port: "3000", port_desc: "Calligra desktop gui HTTP, must be proxied."} - {external_port: "3001", internal_port: "3001", port_desc: "Calligra desktop gui HTTPS."} +custom_params: + - {name: "shm-size", name_compose: "shm_size", value: "1gb", desc: "Recommended for all desktop images."} # Selkies blurb settings selkies_blurb: true show_nvidia: true From 870250cdb96fd8192d52f1530cb94da064f6bf16 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 22 Sep 2025 14:38:56 -0400 Subject: [PATCH 3/3] add syntax --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 02eaf4a..9fd5288 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie # set version label diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index cea7d09..3afa0c5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debiantrixie # set version label