From a7cadb5e4105468c0ca60258639ce4a297efb7d3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 14:50:42 +0200 Subject: [PATCH 01/38] fix: correct badge paths in addon readmes --- navidrome/README.md | 8 ++++---- openproject/README.md | 8 ++++---- whatsapper/README.md | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/navidrome/README.md b/navidrome/README.md index a3e1965df..de9aaed87 100644 --- a/navidrome/README.md +++ b/navidrome/README.md @@ -1,11 +1,11 @@ # Home assistant add-on: Navidrome -[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) +[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) -![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%navidrome%2Fconfig.json) -![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%navidrome%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%navidrome%2Fconfig.json) +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnavidrome%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnavidrome%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fnavidrome%2Fconfig.json) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) [![GitHub Super-Linter](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/weekly-supelinter.yaml?label=Lint%20code%20base)](https://github.com/alexbelgium/hassio-addons/actions/workflows/weekly-supelinter.yaml) diff --git a/openproject/README.md b/openproject/README.md index 64496423d..d32d31346 100644 --- a/openproject/README.md +++ b/openproject/README.md @@ -1,11 +1,11 @@ # Home assistant add-on: Openproject -[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) +[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) -![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%openproject%2Fconfig.json) -![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%openproject%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%openproject%2Fconfig.json) +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fopenproject%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fopenproject%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fopenproject%2Fconfig.json) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) [![GitHub Super-Linter](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/weekly-supelinter.yaml?label=Lint%20code%20base)](https://github.com/alexbelgium/hassio-addons/actions/workflows/weekly-supelinter.yaml) diff --git a/whatsapper/README.md b/whatsapper/README.md index 58ef8a340..0f3d65694 100644 --- a/whatsapper/README.md +++ b/whatsapper/README.md @@ -3,9 +3,9 @@ [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) [![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) -![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%whatsapper%2Fconfig.json) -![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%whatsapper%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%whatsapper%2Fconfig.json) +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fwhatsapper%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fwhatsapper%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fwhatsapper%2Fconfig.json) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) [![GitHub Super-Linter](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/weekly-supelinter.yaml?label=Lint%20code%20base)](https://github.com/alexbelgium/hassio-addons/actions/workflows/weekly-supelinter.yaml) From 2889fa85b87d5f38e1056f098cffa588b2dfaadb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 16:27:08 +0200 Subject: [PATCH 02/38] Update CHANGELOG.md --- birdnet-pi/CHANGELOG.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/birdnet-pi/CHANGELOG.md b/birdnet-pi/CHANGELOG.md index bcd3a449e..00a2623c4 100644 --- a/birdnet-pi/CHANGELOG.md +++ b/birdnet-pi/CHANGELOG.md @@ -1,9 +1,5 @@ -## 2025.07.05 (02-08-2025) -- Minor bugs fixed -## 2025.07.03 (24-07-2025) -- Minor bugs fixed -## 2025.07.02 (24-07-2025) -- Minor bugs fixed +- Use wikipedia for images + ## 2025.07.01 (24-07-2025) - Fix birdweather From 6bc3624c8a25f9702638ddedbd4e13704e3bac74 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 16:27:41 +0200 Subject: [PATCH 03/38] Update config.json --- birdnet-pi/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdnet-pi/config.json b/birdnet-pi/config.json index 15df5b003..eb0a40552 100644 --- a/birdnet-pi/config.json +++ b/birdnet-pi/config.json @@ -121,6 +121,6 @@ "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi", "usb": true, - "version": "2025.07.05", + "version": "2025.07.06", "video": true } From 0e8d1e58815aff104199238833921c2221ccd8f0 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 2 Aug 2025 14:48:13 +0000 Subject: [PATCH 04/38] Revert 'Update config.json' [nobuild] --- birdnet-pi/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdnet-pi/config.json b/birdnet-pi/config.json index eb0a40552..15df5b003 100644 --- a/birdnet-pi/config.json +++ b/birdnet-pi/config.json @@ -121,6 +121,6 @@ "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi", "usb": true, - "version": "2025.07.06", + "version": "2025.07.05", "video": true } From 6d337a05a7e3f63714a47448942c4406b23e4060 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 15:34:27 +0000 Subject: [PATCH 05/38] Github bot : issues linked to readme --- filebrowser/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/filebrowser/README.md b/filebrowser/README.md index 6da58b462..c6a89a41f 100644 --- a/filebrowser/README.md +++ b/filebrowser/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Filebrowser] Crashing on new install (opened 2025-08-02)](https://github.com/alexbelgium/hassio-addons/issues/1993) by [@LivArt01](https://github.com/LivArt01) # Home assistant add-on: Filebrowser [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 8ce2f0bc14e5ce2813edf371c2472d9a9d62d077 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:47:10 +0200 Subject: [PATCH 06/38] Update 01-config_yaml.sh --- .templates/01-config_yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.templates/01-config_yaml.sh b/.templates/01-config_yaml.sh index 080461be4..ec9d69041 100755 --- a/.templates/01-config_yaml.sh +++ b/.templates/01-config_yaml.sh @@ -91,7 +91,7 @@ else bashio::log.green "If accessing the file with filebrowser it should be mapped to $CONFIGSOURCE" fi bashio::log.green "---------------------------------------------------------" -bashio::log.notice "This script is used to run custom commands at start of the addon. Instructions here : https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon" +bashio::log.notice "This script is used to export custom environment variables at start of the addon. Instructions here : https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon" echo "" # Check if config file is there, or create one from template From 1e6b45fd85ce43ab09ccf053d7a61411bcdb35ac Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:47:34 +0200 Subject: [PATCH 07/38] Update config.json --- emby/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emby/config.json b/emby/config.json index 2640469a8..e8277294c 100644 --- a/emby/config.json +++ b/emby/config.json @@ -127,6 +127,6 @@ "slug": "emby", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.11.0", + "version": "4.8.11.0-2", "video": true } From f7d4e8fdee99805120e3a6a67a31fc79b4869bac Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 15:48:21 +0000 Subject: [PATCH 08/38] GitHub bot: sanitize (spaces + LF endings) & chmod --- emby/rootfs/etc/services.d/nginx/run | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 emby/rootfs/etc/services.d/nginx/run diff --git a/emby/rootfs/etc/services.d/nginx/run b/emby/rootfs/etc/services.d/nginx/run old mode 100755 new mode 100644 From 97cef0ced8bd25be853844cce4f5e71fd71a6f57 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:17:58 +0200 Subject: [PATCH 09/38] nobuild --- birdnet-pi/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdnet-pi/config.json b/birdnet-pi/config.json index 15df5b003..eb0a40552 100644 --- a/birdnet-pi/config.json +++ b/birdnet-pi/config.json @@ -121,6 +121,6 @@ "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi", "usb": true, - "version": "2025.07.05", + "version": "2025.07.06", "video": true } From 05632a000afd39a6f6a35f25189fd5286a7d57f0 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:19:06 +0200 Subject: [PATCH 10/38] chore(collabora): remove png assets --- README.md | 11 ++ collabora/CHANGELOG.md | 4 + collabora/Dockerfile | 140 ++++++++++++++++++ collabora/README.md | 46 ++++++ collabora/apparmor.txt | 66 +++++++++ collabora/build.json | 9 ++ collabora/config.json | 106 +++++++++++++ collabora/rootfs/etc/services.d/collabora/run | 21 +++ collabora/updater.json | 8 + 9 files changed, 411 insertions(+) create mode 100644 collabora/CHANGELOG.md create mode 100644 collabora/Dockerfile create mode 100644 collabora/README.md create mode 100644 collabora/apparmor.txt create mode 100644 collabora/build.json create mode 100644 collabora/config.json create mode 100755 collabora/rootfs/etc/services.d/collabora/run create mode 100644 collabora/updater.json diff --git a/README.md b/README.md index 6b3beeb3d..324a1cba8 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,17 @@ If you want to do add the repository manually, please follow the procedure highl ![smb][smb-badge] ![localdisks][localdisks-badge] +✓ ![image](https://api.iconify.design/mdi/file-document-edit-outline.svg) [Collabora](collabora/) : Collaborative office suite + +  ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) +![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fupdater.json) +![aarch64][aarch64-badge] +![amd64][amd64-badge] +![armv7no][armv7no-badge] +![ingress][ingress-badge] +![smb][smb-badge] +![localdisks][localdisks-badge] + ✓ ![image](https://api.iconify.design/mdi/book-open.svg) [Comixed](comixed/) : managing digital comics   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcomixed%2Fconfig.json) diff --git a/collabora/CHANGELOG.md b/collabora/CHANGELOG.md new file mode 100644 index 000000000..d228a3afe --- /dev/null +++ b/collabora/CHANGELOG.md @@ -0,0 +1,4 @@ +## 25.04.4.2.1 (02-08-2025) + +- Initial release +- Start Collabora Online via service and expose domain/credential options for Nextcloud integration diff --git a/collabora/Dockerfile b/collabora/Dockerfile new file mode 100644 index 000000000..aa7cf49a1 --- /dev/null +++ b/collabora/Dockerfile @@ -0,0 +1,140 @@ +#============================# +# ALEXBELGIUM'S DOCKERFILE # +#============================# +# _.------. +# _.-` ('>.-`"""-. +# '.--'` _'` _ .--.) +# -' '-.-';` ` +# ' - _.' ``'--. +# '---` .-'""` +# /` +#=== Home Assistant Addon ===# + +################# +# 1 Build Image # +################# + +ARG BUILD_FROM +ARG BUILD_VERSION +FROM ${BUILD_FROM} + +################## +# 2 Modify Image # +################## + +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ + S6_SERVICES_GRACETIME=0 + +# Global LSIO modifications +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" +ARG CONFIGLOCATION="/data" +RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh + +################## +# 3 Install apps # +################## + +# Copy local files +COPY rootfs/ / + +# Uses /bin for compatibility purposes +# hadolint ignore=DL4005 +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ + if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi + +# Modules +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" + +# Automatic modules download +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" +RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh + +# Manual apps +ENV PACKAGES="" + +# Automatic apps & bashio +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" +RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh + +################ +# 4 Entrypoint # +################ + +# Add entrypoint +ENV S6_STAGE2_HOOK=/ha_entrypoint.sh +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" + +# Entrypoint modifications +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh" +RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh + +# Standalone bashio command +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/.bashio-standalone.sh" +RUN chmod 777 /.bashio-standalone.sh + +# +#WORKDIR / +#ENTRYPOINT [ "/usr/bin/env" ] +#CMD [ "/ha_entrypoint.sh" ] + +############ +# 5 Labels # +############ + +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION +ENV BUILD_VERSION="${BUILD_VERSION}" +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Add-ons" \ + org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://github.com/alexbelgium" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +# Avoid spamming logs +# hadolint ignore=SC2016 +RUN \ + # Handle Apache configuration + if [ -d /etc/apache2/sites-available ]; then \ + for file in /etc/apache2/sites-*/*.conf; do \ + sed -i '/ /etc/nginx/nginx.conf.new && \ + mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \ + fi + +ENV HEALTH_PORT="9980" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/collabora/README.md b/collabora/README.md new file mode 100644 index 000000000..8df514121 --- /dev/null +++ b/collabora/README.md @@ -0,0 +1,46 @@ +# Home assistant add-on: collabora + +[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) +[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) + +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) + +## About + +Collabora Online is a collaborative office suite based on LibreOffice technology. + +## Installation + +1. Click the Home Assistant My add-on store button below. +1. Click the "Install" button to install the add-on. +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. + +Open your Home Assistant instance and show the add add-on repository dialog + +## Configuration + +Webui can be found at or through Ingress. + +### Options + +Configure the add-on to allow access from your Nextcloud instance: + +- `domain`: Regex matching the Nextcloud host (for example `cloud\\.example\\.com`). +- `username` and `password`: Optional credentials for the Collabora admin console. + +### Custom Scripts and Environment Variables + +This addon supports custom scripts and environment variables through the `addon_config` mapping: + +- **Custom scripts**: See [Running Custom Scripts in Addons](https://github.com/alexbelgium/hassio-addons/wiki/Running-custom-scripts-in-Addons) +- **Environment variables**: See [Add Environment Variables to your Addon](https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon) + +## Support + +Create an issue on GitHub + +[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20(no%20paypal)-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white +[paypal-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20with%20Paypal-0070BA?logo=paypal&style=flat&logoColor=white diff --git a/collabora/apparmor.txt b/collabora/apparmor.txt new file mode 100644 index 000000000..ca7141cd2 --- /dev/null +++ b/collabora/apparmor.txt @@ -0,0 +1,66 @@ +#include + +profile collabora_addon flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + signal, + mount, + umount, + remount, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/fuse mrwkl, + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/mmcblk0p1 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/collabora/build.json b/collabora/build.json new file mode 100644 index 000000000..ae8a93664 --- /dev/null +++ b/collabora/build.json @@ -0,0 +1,9 @@ +{ + "build_from": { + "aarch64": "collabora/code:25.04.4.2.1", + "amd64": "collabora/code:25.04.4.2.1" + }, + "codenotary": { + "signer": "alexandrep.github@gmail.com" + } +} diff --git a/collabora/config.json b/collabora/config.json new file mode 100644 index 000000000..01cf93807 --- /dev/null +++ b/collabora/config.json @@ -0,0 +1,106 @@ +{ + "arch": [ + "aarch64", + "amd64" + ], + "codenotary": "alexandrep.github@gmail.com", + "description": "Collabora Online office suite", + "devices": [ + "/dev/dri", + "/dev/dri/card0", + "/dev/dri/card1", + "/dev/dri/renderD128", + "/dev/vchiq", + "/dev/video10", + "/dev/video11", + "/dev/video12", + "/dev/video13", + "/dev/video14", + "/dev/video15", + "/dev/video16", + "/dev/ttyUSB0", + "/dev/sda", + "/dev/sdb", + "/dev/sdc", + "/dev/sdd", + "/dev/sde", + "/dev/sdf", + "/dev/sdg", + "/dev/nvme", + "/dev/nvme0", + "/dev/nvme0n1", + "/dev/nvme0n1p1", + "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme2n3p3", + "/dev/mmcblk", + "/dev/fuse", + "/dev/sda1", + "/dev/sdb1", + "/dev/sdc1", + "/dev/sdd1", + "/dev/sde1", + "/dev/sdf1", + "/dev/sdg1", + "/dev/sda2", + "/dev/sdb2", + "/dev/sdc2", + "/dev/sdd2", + "/dev/sde2", + "/dev/sdf2", + "/dev/sdg2", + "/dev/sda3", + "/dev/sdb3", + "/dev/sda4", + "/dev/sdb4", + "/dev/sda5", + "/dev/sda6", + "/dev/sda7", + "/dev/sda8", + "/dev/nvme0", + "/dev/nvme1", + "/dev/nvme2" + ], + "image": "ghcr.io/alexbelgium/collabora-{arch}", + "ingress": true, + "ingress_port": 9980, + "ingress_stream": true, + "init": false, + "map": [ + "addon_config:rw" + ], + "name": "Collabora", + "options": { + "domain": "", + "username": "", + "password": "", + "PGID": 1000, + "PUID": 1000 + }, + "panel_admin": false, + "panel_icon": "mdi:file-document-edit-outline", + "ports": { + "9980/tcp": 9980 + }, + "ports_description": { + "9980/tcp": "Web interface (Not required for Ingress)" + }, + "schema": { + "domain": "str?", + "username": "str?", + "password": "password?", + "PGID": "int", + "PUID": "int", + "TZ": "str?" + }, + "slug": "collabora", + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "25.04.4.2.1" +} diff --git a/collabora/rootfs/etc/services.d/collabora/run b/collabora/rootfs/etc/services.d/collabora/run new file mode 100755 index 000000000..accc07991 --- /dev/null +++ b/collabora/rootfs/etc/services.d/collabora/run @@ -0,0 +1,21 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e + +if bashio::config.has_value 'domain'; then + domain="$(bashio::config 'domain')" + export domain +fi + +if bashio::config.has_value 'username'; then + username="$(bashio::config 'username')" + export username +fi + +if bashio::config.has_value 'password'; then + password="$(bashio::config 'password')" + export password +fi + +bashio::log.info "Starting Collabora Online..." +exec /usr/bin/entrypoint.sh coolwsd diff --git a/collabora/updater.json b/collabora/updater.json new file mode 100644 index 000000000..4ba7f08f9 --- /dev/null +++ b/collabora/updater.json @@ -0,0 +1,8 @@ +{ + "last_update": "02-08-2025", + "repository": "alexbelgium/hassio-addons", + "slug": "collabora", + "source": "github", + "upstream_repo": "CollaboraOnline/online", + "upstream_version": "25.04.4.2.1" +} From 7428dfecddccaaa53dd4fa9a084a24a52d57168f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 16:20:21 +0000 Subject: [PATCH 11/38] GitHub bot: sanitize (spaces + LF endings) & chmod --- collabora/rootfs/etc/services.d/collabora/run | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 collabora/rootfs/etc/services.d/collabora/run diff --git a/collabora/rootfs/etc/services.d/collabora/run b/collabora/rootfs/etc/services.d/collabora/run old mode 100755 new mode 100644 From 46f921e8e147f87d4190ecda30d58c51ff2e6e77 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:27:35 +0200 Subject: [PATCH 12/38] Update Dockerfile --- collabora/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/collabora/Dockerfile b/collabora/Dockerfile index aa7cf49a1..751f4db3d 100644 --- a/collabora/Dockerfile +++ b/collabora/Dockerfile @@ -32,6 +32,8 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat ARG CONFIGLOCATION="/data" RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh +USER root + ################## # 3 Install apps # ################## From a315e45b6f4bf58775f41452577753ecaa200d5c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:27:38 +0200 Subject: [PATCH 13/38] Update config.json --- collabora/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collabora/config.json b/collabora/config.json index 01cf93807..ab5c02924 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -102,5 +102,5 @@ }, "slug": "collabora", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1" + "version": "25.04.4.2.1-2" } From b43dc92b013807c176dcdfe428bcec35b12aeaaa Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:28:00 +0200 Subject: [PATCH 14/38] Update Dockerfile --- collabora/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collabora/Dockerfile b/collabora/Dockerfile index 751f4db3d..e257f74a5 100644 --- a/collabora/Dockerfile +++ b/collabora/Dockerfile @@ -27,13 +27,13 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +USER root + # Global LSIO modifications ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" ARG CONFIGLOCATION="/data" RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh -USER root - ################## # 3 Install apps # ################## From 04d4a19672d68d5bc403c611b94b62fde5204a8b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:28:10 +0200 Subject: [PATCH 15/38] Update config.json --- collabora/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collabora/config.json b/collabora/config.json index ab5c02924..84705e189 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -102,5 +102,5 @@ }, "slug": "collabora", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1-2" + "version": "25.04.4.2.1-3" } From 76a647cfe8565f7d07a45478f11c6228da1daa0d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 2 Aug 2025 16:30:40 +0000 Subject: [PATCH 16/38] Revert 'Update config.json' [nobuild] --- collabora/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collabora/config.json b/collabora/config.json index 84705e189..ab5c02924 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -102,5 +102,5 @@ }, "slug": "collabora", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1-3" + "version": "25.04.4.2.1-2" } From d94aabcf7b7f5635481f09c03a6729847a377011 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:31:59 +0200 Subject: [PATCH 17/38] Update build.json --- collabora/build.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collabora/build.json b/collabora/build.json index ae8a93664..f955286c9 100644 --- a/collabora/build.json +++ b/collabora/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "collabora/code:25.04.4.2.1", - "amd64": "collabora/code:25.04.4.2.1" + "aarch64": "collabora/code:latest", + "amd64": "collabora/code:latest" }, "codenotary": { "signer": "alexandrep.github@gmail.com" From 250a3ba22456e625e4cc1501236b3388f2d531e4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:33:10 +0200 Subject: [PATCH 18/38] Update build.json --- collabora/build.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collabora/build.json b/collabora/build.json index f955286c9..bdc8661c7 100644 --- a/collabora/build.json +++ b/collabora/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "collabora/code:latest", - "amd64": "collabora/code:latest" + "aarch64": "collabora/code:latest-arm64", + "amd64": "collabora/code:latest-amd64" }, "codenotary": { "signer": "alexandrep.github@gmail.com" From b14bb1538ff93704890b8149740c798136abdaeb Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:35:32 +0200 Subject: [PATCH 19/38] Update config.json --- collabora/config.json | 72 ++----------------------------------------- 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/collabora/config.json b/collabora/config.json index ab5c02924..650f2872f 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -5,73 +5,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Collabora Online office suite", - "devices": [ - "/dev/dri", - "/dev/dri/card0", - "/dev/dri/card1", - "/dev/dri/renderD128", - "/dev/vchiq", - "/dev/video10", - "/dev/video11", - "/dev/video12", - "/dev/video13", - "/dev/video14", - "/dev/video15", - "/dev/video16", - "/dev/ttyUSB0", - "/dev/sda", - "/dev/sdb", - "/dev/sdc", - "/dev/sdd", - "/dev/sde", - "/dev/sdf", - "/dev/sdg", - "/dev/nvme", - "/dev/nvme0", - "/dev/nvme0n1", - "/dev/nvme0n1p1", - "/dev/nvme0n1p2", - "/dev/nvme0n1p3", - "/dev/nvme1n1", - "/dev/nvme1n1p1", - "/dev/nvme1n1p2", - "/dev/nvme1n1p3", - "/dev/nvme2n1", - "/dev/nvme2n1p1", - "/dev/nvme2n1p2", - "/dev/nvme2n3p3", - "/dev/mmcblk", - "/dev/fuse", - "/dev/sda1", - "/dev/sdb1", - "/dev/sdc1", - "/dev/sdd1", - "/dev/sde1", - "/dev/sdf1", - "/dev/sdg1", - "/dev/sda2", - "/dev/sdb2", - "/dev/sdc2", - "/dev/sdd2", - "/dev/sde2", - "/dev/sdf2", - "/dev/sdg2", - "/dev/sda3", - "/dev/sdb3", - "/dev/sda4", - "/dev/sdb4", - "/dev/sda5", - "/dev/sda6", - "/dev/sda7", - "/dev/sda8", - "/dev/nvme0", - "/dev/nvme1", - "/dev/nvme2" - ], "image": "ghcr.io/alexbelgium/collabora-{arch}", - "ingress": true, - "ingress_port": 9980, - "ingress_stream": true, "init": false, "map": [ "addon_config:rw" @@ -81,8 +15,8 @@ "domain": "", "username": "", "password": "", - "PGID": 1000, - "PUID": 1000 + "PGID": 0, + "PUID": 0 }, "panel_admin": false, "panel_icon": "mdi:file-document-edit-outline", @@ -90,7 +24,7 @@ "9980/tcp": 9980 }, "ports_description": { - "9980/tcp": "Web interface (Not required for Ingress)" + "9980/tcp": "Web interface" }, "schema": { "domain": "str?", From 8a6fd2818a77400183943ab0fc8e62c13c856dc8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:35:53 +0200 Subject: [PATCH 20/38] Update Dockerfile --- collabora/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/collabora/Dockerfile b/collabora/Dockerfile index e257f74a5..71bfef789 100644 --- a/collabora/Dockerfile +++ b/collabora/Dockerfile @@ -47,7 +47,7 @@ RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; f if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh" # Automatic modules download ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" @@ -57,8 +57,8 @@ RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_auto ENV PACKAGES="" # Automatic apps & bashio -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" -RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh +#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" +#RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # From 75d0e9f26a47bf99fcbc6f5b0fb17043c497ff5e Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:36:02 +0200 Subject: [PATCH 21/38] Update config.json --- collabora/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collabora/config.json b/collabora/config.json index 650f2872f..b9a4976e5 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -36,5 +36,5 @@ }, "slug": "collabora", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1-2" + "version": "25.04.4.2.1" } From 4bdd8001f6619d62be37ffdcef3b3a9ba439f396 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 2 Aug 2025 16:37:07 +0000 Subject: [PATCH 22/38] Revert 'Update config.json' [nobuild] --- birdnet-pi/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdnet-pi/config.json b/birdnet-pi/config.json index eb0a40552..15df5b003 100644 --- a/birdnet-pi/config.json +++ b/birdnet-pi/config.json @@ -121,6 +121,6 @@ "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi", "usb": true, - "version": "2025.07.06", + "version": "2025.07.05", "video": true } From 90802a7a32b7bbff8c788c69531204adf007b361 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 16:37:29 +0000 Subject: [PATCH 23/38] GitHub bot: changelog --- emby/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index 9853f2730..1afc662a1 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,3 +1,5 @@ +## 4.8.11.0-2 (02-08-2025) +- Minor bugs fixed ## 4.8.11.0 (22-04-2025) - WARNING : migration of config to addon_config instead of homeassistant config folder. Allows automatic backups. The location of the database however is not changed. From 1638e2fa86781dbc5a77818437376a46052fcd29 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 2 Aug 2025 16:38:12 +0000 Subject: [PATCH 24/38] Revert 'Update config.json' [nobuild] --- collabora/config.json | 72 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/collabora/config.json b/collabora/config.json index b9a4976e5..01cf93807 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -5,7 +5,73 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Collabora Online office suite", + "devices": [ + "/dev/dri", + "/dev/dri/card0", + "/dev/dri/card1", + "/dev/dri/renderD128", + "/dev/vchiq", + "/dev/video10", + "/dev/video11", + "/dev/video12", + "/dev/video13", + "/dev/video14", + "/dev/video15", + "/dev/video16", + "/dev/ttyUSB0", + "/dev/sda", + "/dev/sdb", + "/dev/sdc", + "/dev/sdd", + "/dev/sde", + "/dev/sdf", + "/dev/sdg", + "/dev/nvme", + "/dev/nvme0", + "/dev/nvme0n1", + "/dev/nvme0n1p1", + "/dev/nvme0n1p2", + "/dev/nvme0n1p3", + "/dev/nvme1n1", + "/dev/nvme1n1p1", + "/dev/nvme1n1p2", + "/dev/nvme1n1p3", + "/dev/nvme2n1", + "/dev/nvme2n1p1", + "/dev/nvme2n1p2", + "/dev/nvme2n3p3", + "/dev/mmcblk", + "/dev/fuse", + "/dev/sda1", + "/dev/sdb1", + "/dev/sdc1", + "/dev/sdd1", + "/dev/sde1", + "/dev/sdf1", + "/dev/sdg1", + "/dev/sda2", + "/dev/sdb2", + "/dev/sdc2", + "/dev/sdd2", + "/dev/sde2", + "/dev/sdf2", + "/dev/sdg2", + "/dev/sda3", + "/dev/sdb3", + "/dev/sda4", + "/dev/sdb4", + "/dev/sda5", + "/dev/sda6", + "/dev/sda7", + "/dev/sda8", + "/dev/nvme0", + "/dev/nvme1", + "/dev/nvme2" + ], "image": "ghcr.io/alexbelgium/collabora-{arch}", + "ingress": true, + "ingress_port": 9980, + "ingress_stream": true, "init": false, "map": [ "addon_config:rw" @@ -15,8 +81,8 @@ "domain": "", "username": "", "password": "", - "PGID": 0, - "PUID": 0 + "PGID": 1000, + "PUID": 1000 }, "panel_admin": false, "panel_icon": "mdi:file-document-edit-outline", @@ -24,7 +90,7 @@ "9980/tcp": 9980 }, "ports_description": { - "9980/tcp": "Web interface" + "9980/tcp": "Web interface (Not required for Ingress)" }, "schema": { "domain": "str?", From 1f2c8b688da253c635220ed7f92d66638b45b575 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 16:52:42 +0000 Subject: [PATCH 25/38] Github bot : issues linked to readme --- filebrowser/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/filebrowser/README.md b/filebrowser/README.md index c6a89a41f..6da58b462 100644 --- a/filebrowser/README.md +++ b/filebrowser/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Filebrowser] Crashing on new install (opened 2025-08-02)](https://github.com/alexbelgium/hassio-addons/issues/1993) by [@LivArt01](https://github.com/LivArt01) # Home assistant add-on: Filebrowser [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From a10cc80c18af106e142e511e5a947f39ca567ca1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:04:47 +0000 Subject: [PATCH 26/38] GitHub bot : README updated --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 324a1cba8..8b56010b9 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ If you want to do add the repository manually, please follow the procedure highl ### Number of addons -- In the repository : 108 +- In the repository : 109 - Installed : 74436 ### Top 3 @@ -231,7 +231,7 @@ If you want to do add the repository manually, please follow the procedure highl ![smb][smb-badge] ![localdisks][localdisks-badge] -✓ ![image](https://api.iconify.design/mdi/file-document-edit-outline.svg) [Collabora](collabora/) : Collaborative office suite +✓ ![image](https://api.iconify.design/mdi/file-document-edit-outline.svg) [Collabora](collabora/) : Collabora Online office suite   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fupdater.json) @@ -239,8 +239,6 @@ If you want to do add the repository manually, please follow the procedure highl ![amd64][amd64-badge] ![armv7no][armv7no-badge] ![ingress][ingress-badge] -![smb][smb-badge] -![localdisks][localdisks-badge] ✓ ![image](https://api.iconify.design/mdi/book-open.svg) [Comixed](comixed/) : managing digital comics From 8907889e412c48ceaaa6cfe974e06a9272cb2ff3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:10:52 +0000 Subject: [PATCH 27/38] Github bot : issues linked to readme --- filebrowser/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/filebrowser/README.md b/filebrowser/README.md index 6da58b462..c6a89a41f 100644 --- a/filebrowser/README.md +++ b/filebrowser/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [🐛 [Filebrowser] Crashing on new install (opened 2025-08-02)](https://github.com/alexbelgium/hassio-addons/issues/1993) by [@LivArt01](https://github.com/LivArt01) # Home assistant add-on: Filebrowser [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) From 3baf9c97603a29bda6a0c900c95456483009c1cf Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:26:11 +0200 Subject: [PATCH 28/38] Update config.json nobuild --- collabora/config.json | 66 ------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/collabora/config.json b/collabora/config.json index 01cf93807..1bf04c4c8 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -5,73 +5,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Collabora Online office suite", - "devices": [ - "/dev/dri", - "/dev/dri/card0", - "/dev/dri/card1", - "/dev/dri/renderD128", - "/dev/vchiq", - "/dev/video10", - "/dev/video11", - "/dev/video12", - "/dev/video13", - "/dev/video14", - "/dev/video15", - "/dev/video16", - "/dev/ttyUSB0", - "/dev/sda", - "/dev/sdb", - "/dev/sdc", - "/dev/sdd", - "/dev/sde", - "/dev/sdf", - "/dev/sdg", - "/dev/nvme", - "/dev/nvme0", - "/dev/nvme0n1", - "/dev/nvme0n1p1", - "/dev/nvme0n1p2", - "/dev/nvme0n1p3", - "/dev/nvme1n1", - "/dev/nvme1n1p1", - "/dev/nvme1n1p2", - "/dev/nvme1n1p3", - "/dev/nvme2n1", - "/dev/nvme2n1p1", - "/dev/nvme2n1p2", - "/dev/nvme2n3p3", - "/dev/mmcblk", - "/dev/fuse", - "/dev/sda1", - "/dev/sdb1", - "/dev/sdc1", - "/dev/sdd1", - "/dev/sde1", - "/dev/sdf1", - "/dev/sdg1", - "/dev/sda2", - "/dev/sdb2", - "/dev/sdc2", - "/dev/sdd2", - "/dev/sde2", - "/dev/sdf2", - "/dev/sdg2", - "/dev/sda3", - "/dev/sdb3", - "/dev/sda4", - "/dev/sdb4", - "/dev/sda5", - "/dev/sda6", - "/dev/sda7", - "/dev/sda8", - "/dev/nvme0", - "/dev/nvme1", - "/dev/nvme2" - ], "image": "ghcr.io/alexbelgium/collabora-{arch}", - "ingress": true, - "ingress_port": 9980, - "ingress_stream": true, "init": false, "map": [ "addon_config:rw" From 4b3663e35c8f6509b23dbbfa178ec5e37e970059 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:26:25 +0200 Subject: [PATCH 29/38] Update config.json --- collabora/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collabora/config.json b/collabora/config.json index 1bf04c4c8..15d1d1188 100644 --- a/collabora/config.json +++ b/collabora/config.json @@ -36,5 +36,5 @@ }, "slug": "collabora", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1" + "version": "25.04.4.2.1-2" } From 92d274bcad4e675f5f4a1996cddac5dbcc17ef21 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:27:08 +0200 Subject: [PATCH 30/38] chore: use latest tag for tandoor build --- tandoor_recipes/CHANGELOG.md | 4 ++++ tandoor_recipes/DOCS.md | 9 ++------- tandoor_recipes/build.json | 3 +-- tandoor_recipes/config.json | 12 +++++------- tandoor_recipes/updater.json | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index b68551220..530927967 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0 (02-08-2025) + +- Update to latest version from TandoorRecipes/recipes (integrated nginx, removed armv7) + ## 1.5.35 (28-06-2025) - Update to latest version from TandoorRecipes/recipes (changelog : https://github.com/TandoorRecipes/recipes/releases) diff --git a/tandoor_recipes/DOCS.md b/tandoor_recipes/DOCS.md index 0b102f08c..ebb727a19 100644 --- a/tandoor_recipes/DOCS.md +++ b/tandoor_recipes/DOCS.md @@ -7,9 +7,7 @@ Required : "ALLOWED_HOSTS": "your system url", # You need to input your homeassistant urls (comma separated, without space) to allow ingress to work "DB_TYPE": "list(sqlite|postgresql_external)" # Type of database to use. "SECRET_KEY": "str", # Your secret key - "PORT": 9928 # By default, the webui is available on http://HAurl:9928. If you ever need to change the port, you should never do it within the app, but only through this option "Environment": 0|1 # 1 is debug mode, 0 is normal mode. You should run in normal mode unless actively developing. - "GUNICORN_MEDIA": 0|1 # 1 enables gunicorn media hosting. This is not recommended. You should use an nginx server to host your media - see docs. Optional : "POSTGRES_HOST": "str?", # Needed for postgresql_external "POSTGRES_PORT": "str?", # Needed for postgresql_external @@ -18,6 +16,8 @@ Optional : "POSTGRES_DB": "str?" # Needed for postgresql_external "externalfiles_folder": "str?" # a folder that you want to map in to tandoor. Not needed as /share/ and /media/ are mapped. This folder will be created if it doesn't already exist. ``` +This add-on now uses Tandoor's integrated Nginx server and exposes port 80 (mapped to 9928 by default). + ### Mariadb Mariadb is a popular addon in the home assistant community, however it is not supported by the Tandoor Recipes application. @@ -29,11 +29,6 @@ This is the "Environment" setting. ### Authentication using external authentication. Tandoor Recipes supports this, but it is not implemented yet. -### Gunicorn Media -Disabling gunicorn media is a good idea, but needs a webserver running to host the media files. The webserver should map `/media/`. -See https://docs.tandoor.dev/install/docker/#nginx-vs-gunicorn for more information on this. -0 is gunicorn DISABLED - media won't work without an nginx webserver. -1 is gunicorn enabled - mesia will be hosted using gunicorn which is not recommended. ### External Recipe files diff --git a/tandoor_recipes/build.json b/tandoor_recipes/build.json index b1f6c3442..2753b04c0 100644 --- a/tandoor_recipes/build.json +++ b/tandoor_recipes/build.json @@ -1,8 +1,7 @@ { "build_from": { "aarch64": "vabene1111/recipes:latest", - "amd64": "vabene1111/recipes:latest", - "armv7": "vabene1111/recipes:latest" + "amd64": "vabene1111/recipes:latest" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 4c39c5c94..ac72f3f4a 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -1,8 +1,7 @@ { "arch": [ "aarch64", - "amd64", - "armv7" + "amd64" ], "codenotary": "alexandrep.github@gmail.com", "description": "recipe manager", @@ -72,7 +71,6 @@ "environment": { "DB_ENGINE": "django.db.backends.sqlite3", "DISABLE_INGRESS": "true", - "GUNICORN_MEDIA": "1", "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db", "TRUSTED_PROXIES": "**" }, @@ -94,10 +92,10 @@ "panel_icon": "mdi:silverware-fork-knife", "panel_title": "Tandoor Recipes", "ports": { - "8080/tcp": 9928 + "80/tcp": 9928 }, "ports_description": { - "8080/tcp": "Web interface" + "80/tcp": "Web interface" }, "schema": { "ALLOWED_HOSTS": "str?", @@ -117,6 +115,6 @@ "slug": "tandoor_recipes", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.5.35", - "webui": "http://[HOST]:[PORT:8080]" + "version": "2.0.0", + "webui": "http://[HOST]:[PORT:80]" } diff --git a/tandoor_recipes/updater.json b/tandoor_recipes/updater.json index 25907b0e5..9882904de 100644 --- a/tandoor_recipes/updater.json +++ b/tandoor_recipes/updater.json @@ -1,9 +1,9 @@ { "github_beta": false, - "last_update": "28-06-2025", + "last_update": "02-08-2025", "repository": "alexbelgium/hassio-addons", "slug": "tandoor_recipes", "source": "github", "upstream_repo": "TandoorRecipes/recipes", - "upstream_version": "1.5.35" + "upstream_version": "2.0.0" } From 95175f816fb41782795d3cf0c7361927662c6921 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:27:56 +0200 Subject: [PATCH 31/38] Update config.json --- tandoor_recipes/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index ac72f3f4a..5679dfb5e 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -115,6 +115,6 @@ "slug": "tandoor_recipes", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.0.0", + "version": "2.0.1", "webui": "http://[HOST]:[PORT:80]" } From f3ebc66e8ac40f839680847dd5019f91bd115268 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:28:16 +0200 Subject: [PATCH 32/38] Update updater.json --- tandoor_recipes/updater.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/updater.json b/tandoor_recipes/updater.json index 9882904de..c6f261e3e 100644 --- a/tandoor_recipes/updater.json +++ b/tandoor_recipes/updater.json @@ -5,5 +5,5 @@ "slug": "tandoor_recipes", "source": "github", "upstream_repo": "TandoorRecipes/recipes", - "upstream_version": "2.0.0" + "upstream_version": "2.0.1" } From edad76487cac796a0573c15d0c70699ee598f6a8 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:28:32 +0200 Subject: [PATCH 33/38] Update CHANGELOG.md --- tandoor_recipes/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index 530927967..0e5e70a65 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.0 (02-08-2025) +## 2.0.1 (02-08-2025) - Update to latest version from TandoorRecipes/recipes (integrated nginx, removed armv7) From 75d2d1f7b95187d354050b44fd8726d08cf0d7c8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:28:48 +0000 Subject: [PATCH 34/38] GitHub bot: changelog --- collabora/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/collabora/CHANGELOG.md b/collabora/CHANGELOG.md index d228a3afe..070de16c6 100644 --- a/collabora/CHANGELOG.md +++ b/collabora/CHANGELOG.md @@ -1,3 +1,5 @@ +## 25.04.4.2.1-2 (02-08-2025) +- Minor bugs fixed ## 25.04.4.2.1 (02-08-2025) - Initial release From 1c6961635b76ca8b3d8861eb516bb194600ad981 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 20:30:55 +0200 Subject: [PATCH 35/38] Update CHANGELOG.md --- tandoor_recipes/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index 0e5e70a65..48a4774b4 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,5 +1,6 @@ ## 2.0.1 (02-08-2025) +- WARNING : major update, prepare your backup - Update to latest version from TandoorRecipes/recipes (integrated nginx, removed armv7) ## 1.5.35 (28-06-2025) From 938a79f6128577c70bb07f664938dfccbaad8946 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 21:04:00 +0200 Subject: [PATCH 36/38] clean --- collabora/CHANGELOG.md | 6 - collabora/Dockerfile | 142 ------------------ collabora/README.md | 46 ------ collabora/apparmor.txt | 66 -------- collabora/build.json | 9 -- collabora/config.json | 40 ----- collabora/rootfs/etc/services.d/collabora/run | 21 --- collabora/updater.json | 8 - 8 files changed, 338 deletions(-) delete mode 100644 collabora/CHANGELOG.md delete mode 100644 collabora/Dockerfile delete mode 100644 collabora/README.md delete mode 100644 collabora/apparmor.txt delete mode 100644 collabora/build.json delete mode 100644 collabora/config.json delete mode 100644 collabora/rootfs/etc/services.d/collabora/run delete mode 100644 collabora/updater.json diff --git a/collabora/CHANGELOG.md b/collabora/CHANGELOG.md deleted file mode 100644 index 070de16c6..000000000 --- a/collabora/CHANGELOG.md +++ /dev/null @@ -1,6 +0,0 @@ -## 25.04.4.2.1-2 (02-08-2025) -- Minor bugs fixed -## 25.04.4.2.1 (02-08-2025) - -- Initial release -- Start Collabora Online via service and expose domain/credential options for Nextcloud integration diff --git a/collabora/Dockerfile b/collabora/Dockerfile deleted file mode 100644 index 71bfef789..000000000 --- a/collabora/Dockerfile +++ /dev/null @@ -1,142 +0,0 @@ -#============================# -# ALEXBELGIUM'S DOCKERFILE # -#============================# -# _.------. -# _.-` ('>.-`"""-. -# '.--'` _'` _ .--.) -# -' '-.-';` ` -# ' - _.' ``'--. -# '---` .-'""` -# /` -#=== Home Assistant Addon ===# - -################# -# 1 Build Image # -################# - -ARG BUILD_FROM -ARG BUILD_VERSION -FROM ${BUILD_FROM} - -################## -# 2 Modify Image # -################## - -# Set S6 wait time -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ - S6_SERVICES_GRACETIME=0 - -USER root - -# Global LSIO modifications -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" -ARG CONFIGLOCATION="/data" -RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh - -################## -# 3 Install apps # -################## - -# Copy local files -COPY rootfs/ / - -# Uses /bin for compatibility purposes -# hadolint ignore=DL4005 -RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ - if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi - -# Modules -ARG MODULES="00-banner.sh 01-custom_script.sh" - -# Automatic modules download -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" -RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh - -# Manual apps -ENV PACKAGES="" - -# Automatic apps & bashio -#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" -#RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh - -################ -# 4 Entrypoint # -################ - -# Add entrypoint -ENV S6_STAGE2_HOOK=/ha_entrypoint.sh -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" - -# Entrypoint modifications -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh" -RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh - -# Standalone bashio command -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/.bashio-standalone.sh" -RUN chmod 777 /.bashio-standalone.sh - -# -#WORKDIR / -#ENTRYPOINT [ "/usr/bin/env" ] -#CMD [ "/ha_entrypoint.sh" ] - -############ -# 5 Labels # -############ - -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION -ENV BUILD_VERSION="${BUILD_VERSION}" -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="Home Assistant Add-ons" \ - org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.url="https://github.com/alexbelgium" \ - org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ - org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} - -################# -# 6 Healthcheck # -################# - -# Avoid spamming logs -# hadolint ignore=SC2016 -RUN \ - # Handle Apache configuration - if [ -d /etc/apache2/sites-available ]; then \ - for file in /etc/apache2/sites-*/*.conf; do \ - sed -i '/ /etc/nginx/nginx.conf.new && \ - mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \ - fi - -ENV HEALTH_PORT="9980" \ - HEALTH_URL="" -HEALTHCHECK \ - --interval=5s \ - --retries=5 \ - --start-period=30s \ - --timeout=25s \ - CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/collabora/README.md b/collabora/README.md deleted file mode 100644 index 8df514121..000000000 --- a/collabora/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Home assistant add-on: collabora - -[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) -[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) - -![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) -![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) - -## About - -Collabora Online is a collaborative office suite based on LibreOffice technology. - -## Installation - -1. Click the Home Assistant My add-on store button below. -1. Click the "Install" button to install the add-on. -1. Start the add-on. -1. Check the logs of the add-on to see if everything went well. - -Open your Home Assistant instance and show the add add-on repository dialog - -## Configuration - -Webui can be found at or through Ingress. - -### Options - -Configure the add-on to allow access from your Nextcloud instance: - -- `domain`: Regex matching the Nextcloud host (for example `cloud\\.example\\.com`). -- `username` and `password`: Optional credentials for the Collabora admin console. - -### Custom Scripts and Environment Variables - -This addon supports custom scripts and environment variables through the `addon_config` mapping: - -- **Custom scripts**: See [Running Custom Scripts in Addons](https://github.com/alexbelgium/hassio-addons/wiki/Running-custom-scripts-in-Addons) -- **Environment variables**: See [Add Environment Variables to your Addon](https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon) - -## Support - -Create an issue on GitHub - -[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20(no%20paypal)-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white -[paypal-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20with%20Paypal-0070BA?logo=paypal&style=flat&logoColor=white diff --git a/collabora/apparmor.txt b/collabora/apparmor.txt deleted file mode 100644 index ca7141cd2..000000000 --- a/collabora/apparmor.txt +++ /dev/null @@ -1,66 +0,0 @@ -#include - -profile collabora_addon flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - signal, - mount, - umount, - remount, - network udp, - network tcp, - network dgram, - network stream, - network inet, - network inet6, - network netlink raw, - network unix dgram, - - capability setgid, - capability setuid, - capability sys_admin, - capability dac_read_search, - # capability dac_override, - # capability sys_rawio, - -# S6-Overlay - /init ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /run/{,**} rwk, - /dev/tty rw, - /bin/** ix, - /usr/bin/** ix, - /usr/lib/bashio/** ix, - /etc/s6/** rix, - /run/s6/** rix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /init rix, - /var/run/** mrwkl, - /var/run/ mrwkl, - /dev/i2c-1 mrwkl, - # Files required - /dev/fuse mrwkl, - /dev/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/mmcblk0p1 mrwkl, - /dev/* mrwkl, - /tmp/** mrkwl, - - # Data access - /data/** rw, - - # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, - - # docker daemon confinement requires explict allow rule for signal - signal (receive) set=(kill,term) peer=/usr/bin/docker, - -} diff --git a/collabora/build.json b/collabora/build.json deleted file mode 100644 index bdc8661c7..000000000 --- a/collabora/build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "build_from": { - "aarch64": "collabora/code:latest-arm64", - "amd64": "collabora/code:latest-amd64" - }, - "codenotary": { - "signer": "alexandrep.github@gmail.com" - } -} diff --git a/collabora/config.json b/collabora/config.json deleted file mode 100644 index 15d1d1188..000000000 --- a/collabora/config.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "arch": [ - "aarch64", - "amd64" - ], - "codenotary": "alexandrep.github@gmail.com", - "description": "Collabora Online office suite", - "image": "ghcr.io/alexbelgium/collabora-{arch}", - "init": false, - "map": [ - "addon_config:rw" - ], - "name": "Collabora", - "options": { - "domain": "", - "username": "", - "password": "", - "PGID": 1000, - "PUID": 1000 - }, - "panel_admin": false, - "panel_icon": "mdi:file-document-edit-outline", - "ports": { - "9980/tcp": 9980 - }, - "ports_description": { - "9980/tcp": "Web interface (Not required for Ingress)" - }, - "schema": { - "domain": "str?", - "username": "str?", - "password": "password?", - "PGID": "int", - "PUID": "int", - "TZ": "str?" - }, - "slug": "collabora", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1-2" -} diff --git a/collabora/rootfs/etc/services.d/collabora/run b/collabora/rootfs/etc/services.d/collabora/run deleted file mode 100644 index accc07991..000000000 --- a/collabora/rootfs/etc/services.d/collabora/run +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -if bashio::config.has_value 'domain'; then - domain="$(bashio::config 'domain')" - export domain -fi - -if bashio::config.has_value 'username'; then - username="$(bashio::config 'username')" - export username -fi - -if bashio::config.has_value 'password'; then - password="$(bashio::config 'password')" - export password -fi - -bashio::log.info "Starting Collabora Online..." -exec /usr/bin/entrypoint.sh coolwsd diff --git a/collabora/updater.json b/collabora/updater.json deleted file mode 100644 index 4ba7f08f9..000000000 --- a/collabora/updater.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "last_update": "02-08-2025", - "repository": "alexbelgium/hassio-addons", - "slug": "collabora", - "source": "github", - "upstream_repo": "CollaboraOnline/online", - "upstream_version": "25.04.4.2.1" -} From 1ec6ce4b5409ac1c3ef4ba48f2e725712b0b1078 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 2 Aug 2025 19:04:43 +0000 Subject: [PATCH 37/38] Revert 'clean' [nobuild] --- collabora/CHANGELOG.md | 6 + collabora/Dockerfile | 142 ++++++++++++++++++ collabora/README.md | 46 ++++++ collabora/apparmor.txt | 66 ++++++++ collabora/build.json | 9 ++ collabora/config.json | 40 +++++ collabora/rootfs/etc/services.d/collabora/run | 21 +++ collabora/updater.json | 8 + 8 files changed, 338 insertions(+) create mode 100644 collabora/CHANGELOG.md create mode 100644 collabora/Dockerfile create mode 100644 collabora/README.md create mode 100644 collabora/apparmor.txt create mode 100644 collabora/build.json create mode 100644 collabora/config.json create mode 100644 collabora/rootfs/etc/services.d/collabora/run create mode 100644 collabora/updater.json diff --git a/collabora/CHANGELOG.md b/collabora/CHANGELOG.md new file mode 100644 index 000000000..070de16c6 --- /dev/null +++ b/collabora/CHANGELOG.md @@ -0,0 +1,6 @@ +## 25.04.4.2.1-2 (02-08-2025) +- Minor bugs fixed +## 25.04.4.2.1 (02-08-2025) + +- Initial release +- Start Collabora Online via service and expose domain/credential options for Nextcloud integration diff --git a/collabora/Dockerfile b/collabora/Dockerfile new file mode 100644 index 000000000..71bfef789 --- /dev/null +++ b/collabora/Dockerfile @@ -0,0 +1,142 @@ +#============================# +# ALEXBELGIUM'S DOCKERFILE # +#============================# +# _.------. +# _.-` ('>.-`"""-. +# '.--'` _'` _ .--.) +# -' '-.-';` ` +# ' - _.' ``'--. +# '---` .-'""` +# /` +#=== Home Assistant Addon ===# + +################# +# 1 Build Image # +################# + +ARG BUILD_FROM +ARG BUILD_VERSION +FROM ${BUILD_FROM} + +################## +# 2 Modify Image # +################## + +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ + S6_SERVICES_GRACETIME=0 + +USER root + +# Global LSIO modifications +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" +ARG CONFIGLOCATION="/data" +RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh + +################## +# 3 Install apps # +################## + +# Copy local files +COPY rootfs/ / + +# Uses /bin for compatibility purposes +# hadolint ignore=DL4005 +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ + if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi + +# Modules +ARG MODULES="00-banner.sh 01-custom_script.sh" + +# Automatic modules download +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" +RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh + +# Manual apps +ENV PACKAGES="" + +# Automatic apps & bashio +#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" +#RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh + +################ +# 4 Entrypoint # +################ + +# Add entrypoint +ENV S6_STAGE2_HOOK=/ha_entrypoint.sh +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" + +# Entrypoint modifications +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh" +RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh + +# Standalone bashio command +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/.bashio-standalone.sh" +RUN chmod 777 /.bashio-standalone.sh + +# +#WORKDIR / +#ENTRYPOINT [ "/usr/bin/env" ] +#CMD [ "/ha_entrypoint.sh" ] + +############ +# 5 Labels # +############ + +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION +ENV BUILD_VERSION="${BUILD_VERSION}" +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Add-ons" \ + org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://github.com/alexbelgium" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +# Avoid spamming logs +# hadolint ignore=SC2016 +RUN \ + # Handle Apache configuration + if [ -d /etc/apache2/sites-available ]; then \ + for file in /etc/apache2/sites-*/*.conf; do \ + sed -i '/ /etc/nginx/nginx.conf.new && \ + mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \ + fi + +ENV HEALTH_PORT="9980" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/collabora/README.md b/collabora/README.md new file mode 100644 index 000000000..8df514121 --- /dev/null +++ b/collabora/README.md @@ -0,0 +1,46 @@ +# Home assistant add-on: collabora + +[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) +[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) + +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) + +## About + +Collabora Online is a collaborative office suite based on LibreOffice technology. + +## Installation + +1. Click the Home Assistant My add-on store button below. +1. Click the "Install" button to install the add-on. +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. + +Open your Home Assistant instance and show the add add-on repository dialog + +## Configuration + +Webui can be found at or through Ingress. + +### Options + +Configure the add-on to allow access from your Nextcloud instance: + +- `domain`: Regex matching the Nextcloud host (for example `cloud\\.example\\.com`). +- `username` and `password`: Optional credentials for the Collabora admin console. + +### Custom Scripts and Environment Variables + +This addon supports custom scripts and environment variables through the `addon_config` mapping: + +- **Custom scripts**: See [Running Custom Scripts in Addons](https://github.com/alexbelgium/hassio-addons/wiki/Running-custom-scripts-in-Addons) +- **Environment variables**: See [Add Environment Variables to your Addon](https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon) + +## Support + +Create an issue on GitHub + +[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20(no%20paypal)-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white +[paypal-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20with%20Paypal-0070BA?logo=paypal&style=flat&logoColor=white diff --git a/collabora/apparmor.txt b/collabora/apparmor.txt new file mode 100644 index 000000000..ca7141cd2 --- /dev/null +++ b/collabora/apparmor.txt @@ -0,0 +1,66 @@ +#include + +profile collabora_addon flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + signal, + mount, + umount, + remount, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/fuse mrwkl, + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/mmcblk0p1 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/collabora/build.json b/collabora/build.json new file mode 100644 index 000000000..bdc8661c7 --- /dev/null +++ b/collabora/build.json @@ -0,0 +1,9 @@ +{ + "build_from": { + "aarch64": "collabora/code:latest-arm64", + "amd64": "collabora/code:latest-amd64" + }, + "codenotary": { + "signer": "alexandrep.github@gmail.com" + } +} diff --git a/collabora/config.json b/collabora/config.json new file mode 100644 index 000000000..15d1d1188 --- /dev/null +++ b/collabora/config.json @@ -0,0 +1,40 @@ +{ + "arch": [ + "aarch64", + "amd64" + ], + "codenotary": "alexandrep.github@gmail.com", + "description": "Collabora Online office suite", + "image": "ghcr.io/alexbelgium/collabora-{arch}", + "init": false, + "map": [ + "addon_config:rw" + ], + "name": "Collabora", + "options": { + "domain": "", + "username": "", + "password": "", + "PGID": 1000, + "PUID": 1000 + }, + "panel_admin": false, + "panel_icon": "mdi:file-document-edit-outline", + "ports": { + "9980/tcp": 9980 + }, + "ports_description": { + "9980/tcp": "Web interface (Not required for Ingress)" + }, + "schema": { + "domain": "str?", + "username": "str?", + "password": "password?", + "PGID": "int", + "PUID": "int", + "TZ": "str?" + }, + "slug": "collabora", + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "25.04.4.2.1-2" +} diff --git a/collabora/rootfs/etc/services.d/collabora/run b/collabora/rootfs/etc/services.d/collabora/run new file mode 100644 index 000000000..accc07991 --- /dev/null +++ b/collabora/rootfs/etc/services.d/collabora/run @@ -0,0 +1,21 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e + +if bashio::config.has_value 'domain'; then + domain="$(bashio::config 'domain')" + export domain +fi + +if bashio::config.has_value 'username'; then + username="$(bashio::config 'username')" + export username +fi + +if bashio::config.has_value 'password'; then + password="$(bashio::config 'password')" + export password +fi + +bashio::log.info "Starting Collabora Online..." +exec /usr/bin/entrypoint.sh coolwsd diff --git a/collabora/updater.json b/collabora/updater.json new file mode 100644 index 000000000..4ba7f08f9 --- /dev/null +++ b/collabora/updater.json @@ -0,0 +1,8 @@ +{ + "last_update": "02-08-2025", + "repository": "alexbelgium/hassio-addons", + "slug": "collabora", + "source": "github", + "upstream_repo": "CollaboraOnline/online", + "upstream_version": "25.04.4.2.1" +} From 92e24e15ad14a6807dde3f8860a5f99bcf137b9b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 21:07:35 +0200 Subject: [PATCH 38/38] nobuild --- collabora/CHANGELOG.md | 6 - collabora/Dockerfile | 142 ------------------ collabora/README.md | 46 ------ collabora/apparmor.txt | 66 -------- collabora/build.json | 9 -- collabora/config.json | 40 ----- collabora/rootfs/etc/services.d/collabora/run | 21 --- collabora/updater.json | 8 - 8 files changed, 338 deletions(-) delete mode 100644 collabora/CHANGELOG.md delete mode 100644 collabora/Dockerfile delete mode 100644 collabora/README.md delete mode 100644 collabora/apparmor.txt delete mode 100644 collabora/build.json delete mode 100644 collabora/config.json delete mode 100644 collabora/rootfs/etc/services.d/collabora/run delete mode 100644 collabora/updater.json diff --git a/collabora/CHANGELOG.md b/collabora/CHANGELOG.md deleted file mode 100644 index 070de16c6..000000000 --- a/collabora/CHANGELOG.md +++ /dev/null @@ -1,6 +0,0 @@ -## 25.04.4.2.1-2 (02-08-2025) -- Minor bugs fixed -## 25.04.4.2.1 (02-08-2025) - -- Initial release -- Start Collabora Online via service and expose domain/credential options for Nextcloud integration diff --git a/collabora/Dockerfile b/collabora/Dockerfile deleted file mode 100644 index 71bfef789..000000000 --- a/collabora/Dockerfile +++ /dev/null @@ -1,142 +0,0 @@ -#============================# -# ALEXBELGIUM'S DOCKERFILE # -#============================# -# _.------. -# _.-` ('>.-`"""-. -# '.--'` _'` _ .--.) -# -' '-.-';` ` -# ' - _.' ``'--. -# '---` .-'""` -# /` -#=== Home Assistant Addon ===# - -################# -# 1 Build Image # -################# - -ARG BUILD_FROM -ARG BUILD_VERSION -FROM ${BUILD_FROM} - -################## -# 2 Modify Image # -################## - -# Set S6 wait time -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ - S6_SERVICES_GRACETIME=0 - -USER root - -# Global LSIO modifications -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh" -ARG CONFIGLOCATION="/data" -RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh - -################## -# 3 Install apps # -################## - -# Copy local files -COPY rootfs/ / - -# Uses /bin for compatibility purposes -# hadolint ignore=DL4005 -RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ - if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi - -# Modules -ARG MODULES="00-banner.sh 01-custom_script.sh" - -# Automatic modules download -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" -RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh - -# Manual apps -ENV PACKAGES="" - -# Automatic apps & bashio -#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" -#RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh - -################ -# 4 Entrypoint # -################ - -# Add entrypoint -ENV S6_STAGE2_HOOK=/ha_entrypoint.sh -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" - -# Entrypoint modifications -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh" -RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh - -# Standalone bashio command -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/.bashio-standalone.sh" -RUN chmod 777 /.bashio-standalone.sh - -# -#WORKDIR / -#ENTRYPOINT [ "/usr/bin/env" ] -#CMD [ "/ha_entrypoint.sh" ] - -############ -# 5 Labels # -############ - -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION -ENV BUILD_VERSION="${BUILD_VERSION}" -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="Home Assistant Add-ons" \ - org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.url="https://github.com/alexbelgium" \ - org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ - org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} - -################# -# 6 Healthcheck # -################# - -# Avoid spamming logs -# hadolint ignore=SC2016 -RUN \ - # Handle Apache configuration - if [ -d /etc/apache2/sites-available ]; then \ - for file in /etc/apache2/sites-*/*.conf; do \ - sed -i '/ /etc/nginx/nginx.conf.new && \ - mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \ - fi - -ENV HEALTH_PORT="9980" \ - HEALTH_URL="" -HEALTHCHECK \ - --interval=5s \ - --retries=5 \ - --start-period=30s \ - --timeout=25s \ - CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/collabora/README.md b/collabora/README.md deleted file mode 100644 index 8df514121..000000000 --- a/collabora/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Home assistant add-on: collabora - -[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) -[![Donate][paypal-badge]](https://www.paypal.com/donate/?hosted_button_id=DZFULJZTP3UQA) - -![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) -![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) -![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcollabora%2Fconfig.json) - -## About - -Collabora Online is a collaborative office suite based on LibreOffice technology. - -## Installation - -1. Click the Home Assistant My add-on store button below. -1. Click the "Install" button to install the add-on. -1. Start the add-on. -1. Check the logs of the add-on to see if everything went well. - -Open your Home Assistant instance and show the add add-on repository dialog - -## Configuration - -Webui can be found at or through Ingress. - -### Options - -Configure the add-on to allow access from your Nextcloud instance: - -- `domain`: Regex matching the Nextcloud host (for example `cloud\\.example\\.com`). -- `username` and `password`: Optional credentials for the Collabora admin console. - -### Custom Scripts and Environment Variables - -This addon supports custom scripts and environment variables through the `addon_config` mapping: - -- **Custom scripts**: See [Running Custom Scripts in Addons](https://github.com/alexbelgium/hassio-addons/wiki/Running-custom-scripts-in-Addons) -- **Environment variables**: See [Add Environment Variables to your Addon](https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon) - -## Support - -Create an issue on GitHub - -[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20(no%20paypal)-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white -[paypal-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee%20with%20Paypal-0070BA?logo=paypal&style=flat&logoColor=white diff --git a/collabora/apparmor.txt b/collabora/apparmor.txt deleted file mode 100644 index ca7141cd2..000000000 --- a/collabora/apparmor.txt +++ /dev/null @@ -1,66 +0,0 @@ -#include - -profile collabora_addon flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - signal, - mount, - umount, - remount, - network udp, - network tcp, - network dgram, - network stream, - network inet, - network inet6, - network netlink raw, - network unix dgram, - - capability setgid, - capability setuid, - capability sys_admin, - capability dac_read_search, - # capability dac_override, - # capability sys_rawio, - -# S6-Overlay - /init ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /run/{,**} rwk, - /dev/tty rw, - /bin/** ix, - /usr/bin/** ix, - /usr/lib/bashio/** ix, - /etc/s6/** rix, - /run/s6/** rix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /init rix, - /var/run/** mrwkl, - /var/run/ mrwkl, - /dev/i2c-1 mrwkl, - # Files required - /dev/fuse mrwkl, - /dev/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/mmcblk0p1 mrwkl, - /dev/* mrwkl, - /tmp/** mrkwl, - - # Data access - /data/** rw, - - # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, - - # docker daemon confinement requires explict allow rule for signal - signal (receive) set=(kill,term) peer=/usr/bin/docker, - -} diff --git a/collabora/build.json b/collabora/build.json deleted file mode 100644 index bdc8661c7..000000000 --- a/collabora/build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "build_from": { - "aarch64": "collabora/code:latest-arm64", - "amd64": "collabora/code:latest-amd64" - }, - "codenotary": { - "signer": "alexandrep.github@gmail.com" - } -} diff --git a/collabora/config.json b/collabora/config.json deleted file mode 100644 index 15d1d1188..000000000 --- a/collabora/config.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "arch": [ - "aarch64", - "amd64" - ], - "codenotary": "alexandrep.github@gmail.com", - "description": "Collabora Online office suite", - "image": "ghcr.io/alexbelgium/collabora-{arch}", - "init": false, - "map": [ - "addon_config:rw" - ], - "name": "Collabora", - "options": { - "domain": "", - "username": "", - "password": "", - "PGID": 1000, - "PUID": 1000 - }, - "panel_admin": false, - "panel_icon": "mdi:file-document-edit-outline", - "ports": { - "9980/tcp": 9980 - }, - "ports_description": { - "9980/tcp": "Web interface (Not required for Ingress)" - }, - "schema": { - "domain": "str?", - "username": "str?", - "password": "password?", - "PGID": "int", - "PUID": "int", - "TZ": "str?" - }, - "slug": "collabora", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "25.04.4.2.1-2" -} diff --git a/collabora/rootfs/etc/services.d/collabora/run b/collabora/rootfs/etc/services.d/collabora/run deleted file mode 100644 index accc07991..000000000 --- a/collabora/rootfs/etc/services.d/collabora/run +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -if bashio::config.has_value 'domain'; then - domain="$(bashio::config 'domain')" - export domain -fi - -if bashio::config.has_value 'username'; then - username="$(bashio::config 'username')" - export username -fi - -if bashio::config.has_value 'password'; then - password="$(bashio::config 'password')" - export password -fi - -bashio::log.info "Starting Collabora Online..." -exec /usr/bin/entrypoint.sh coolwsd diff --git a/collabora/updater.json b/collabora/updater.json deleted file mode 100644 index 4ba7f08f9..000000000 --- a/collabora/updater.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "last_update": "02-08-2025", - "repository": "alexbelgium/hassio-addons", - "slug": "collabora", - "source": "github", - "upstream_repo": "CollaboraOnline/online", - "upstream_version": "25.04.4.2.1" -}