From 0026da228635806f3e562257318c6ac8c43bb5e5 Mon Sep 17 00:00:00 2001 From: Thomas Legay Date: Mon, 14 Apr 2025 18:51:11 +0200 Subject: [PATCH] update 14/04/2025 --- lib/exec_in_chroot.sh | 1 + ressources/adguardhome/debmaker | 2 +- ressources/authelia/debmaker | 6 +++--- ressources/authelia/rootfs/DEBIAN/postinst | 4 +++- ressources/babybuddy/debmaker | 2 +- ressources/bitwarden-desktop/debmaker | 2 +- ressources/budibase/rootfs/DEBIAN/postinst | 12 ++++++------ ressources/claper/debmaker | 2 +- ressources/claper/rootfs/DEBIAN/control | 2 +- ressources/claper/rootfs/DEBIAN/postinst | 7 +++---- ressources/cloudbeaver/rootfs/DEBIAN/postinst | 7 +++---- ressources/clouseau/rootfs/DEBIAN/postinst | 7 +++---- ressources/element-web/debmaker | 2 +- ressources/flame/rootfs/DEBIAN/postinst | 7 +++---- ressources/forgejo/rootfs/DEBIAN/postinst | 9 ++++----- ressources/glpi/debmaker | 2 +- ressources/gotify/rootfs/DEBIAN/postinst | 5 +++-- ressources/grocy/debmaker | 2 +- ressources/guacamole-server/debmaker | 5 ++--- ressources/joplin-desktop/debmaker | 3 ++- ressources/joplin-desktop/rootfs/usr/bin/joplin | 2 +- ressources/joplin-server/debmaker | 2 +- ressources/joplin-server/rootfs/DEBIAN/postinst | 12 +++++++----- ressources/keycloak/debmaker | 2 +- ressources/keycloak/rootfs/DEBIAN/postinst | 8 ++++---- ressources/linkding/rootfs/DEBIAN/postinst | 6 +++--- ressources/mailhog/rootfs/DEBIAN/postinst | 5 +++-- ressources/mautrix-syncproxy/rootfs/DEBIAN/postinst | 5 +++-- ressources/mautrix-whatsapp/debian/postinst | 6 ++++-- ressources/mautrix-whatsapp/debmaker | 2 +- ressources/mautrix-wsproxy/rootfs/DEBIAN/postinst | 5 ++++- ressources/metabase/debmaker | 4 ++-- ressources/metabase/rootfs/DEBIAN/postinst | 6 +++--- ressources/minio/rootfs/DEBIAN/postinst | 5 +++-- ressources/moodle-auth-oidc/debmaker | 4 +++- ressources/paperless-ngx/debmaker | 2 +- ressources/paperless-ngx/prestart.sh | 2 +- ressources/paperless-ngx/rootfs/DEBIAN/control | 2 +- ressources/phpbb-language-fr/debmaker | 4 ++-- ressources/phpbb/debmaker | 2 +- ressources/picapport/rootfs/DEBIAN/postinst | 7 +++---- ressources/roundcubemail/debmaker | 2 +- ressources/rustdesk-server/debmaker | 2 +- .../rustdesk-server-hbbr/DEBIAN/postinst | 7 +++++-- .../rustdesk-server-hbbs/DEBIAN/postinst | 7 +++++-- ressources/sqlpage/rootfs/DEBIAN/postinst | 5 +++-- ressources/umap/debmaker | 6 +++--- ressources/umap/rootfs/DEBIAN/postinst | 2 -- ressources/umap/rootfs/umap.service | 1 + ressources/uptime-kuma/DEBIAN/postinst | 7 +++---- ressources/vaultwarden-web/debmaker | 7 ++++--- ressources/vaultwarden/debmaker | 2 +- ressources/vaultwarden/rootfs/DEBIAN/postinst | 5 +++-- ressources/wallabag/debmaker | 2 +- ressources/zigbee2mqtt/debmaker | 10 +++++----- ressources/zigbee2mqtt/rootfs/DEBIAN/postinst | 5 +++-- 56 files changed, 135 insertions(+), 117 deletions(-) diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh index d857031..d34d7d1 100755 --- a/lib/exec_in_chroot.sh +++ b/lib/exec_in_chroot.sh @@ -21,6 +21,7 @@ get_git_source(){ else git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} ${GIT_PATH} fi + [ "$1" != "noremovegit" ] && find ${GIT_PATH} -name .git -exec rm -fr {} \; } configure_depot_lgy(){ diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index 7a5b486..bb4ecd1 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.62 +VERSION=0.108.0-b.65 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index f45a692..b96562e 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.38.18 +VERSION=4.39.1 APP=authelia DEPOT=https://github.com/authelia/authelia.git GIT_VERSION=v${VERSION} @@ -12,13 +12,13 @@ PACKAGE_DEPENDENCY="build-essential nodejs" main(){ base_package_upgrade envinit - get_git_source + get_git_source noremovegit build makedeb } envinit() { - configure_depot_nodejs + configure_depot_nodejs 22 install_package_dependency install_go wget -qO - https://get.pnpm.io/install.sh | sh - diff --git a/ressources/authelia/rootfs/DEBIAN/postinst b/ressources/authelia/rootfs/DEBIAN/postinst index 67ddffd..e1cd1cb 100755 --- a/ressources/authelia/rootfs/DEBIAN/postinst +++ b/ressources/authelia/rootfs/DEBIAN/postinst @@ -1,5 +1,7 @@ #!/bin/bash -id authelia &> /dev/null || useradd authelia -r -s /bin/false +APP=authelia +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ systemctl | grep authelia | grep -q running && systemctl daemon-reload && systemctl restart authelia diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker index 4ca13d7..e2f807e 100755 --- a/ressources/babybuddy/debmaker +++ b/ressources/babybuddy/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.7.0 +VERSION=2.7.1 APP=babybuddy DEPOT=https://github.com/babybuddy/babybuddy.git GIT_VERSION=v${VERSION} diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index 2f3235f..3cdb705 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2025.1.1 +VERSION=2025.3.0 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} diff --git a/ressources/budibase/rootfs/DEBIAN/postinst b/ressources/budibase/rootfs/DEBIAN/postinst index b29c2bb..78ee217 100755 --- a/ressources/budibase/rootfs/DEBIAN/postinst +++ b/ressources/budibase/rootfs/DEBIAN/postinst @@ -1,9 +1,9 @@ #!/bin/bash -id budibase-server &> /dev/null || useradd budibase-server -r -s /bin/false -md /var/lib/budibase-server +APP=budibase-server +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ -chown -R budibase-server:budibase-server /var/lib/budibase-server - -id budibase-worker &> /dev/null || useradd budibase-worker -r -s /bin/false -md /var/lib/budibase-worker - -chown -R budibase-worker:budibase-worker /var/lib/budibase-worker +APP=budibase-worker +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/claper/debmaker b/ressources/claper/debmaker index f1ddfef..132570e 100755 --- a/ressources/claper/debmaker +++ b/ressources/claper/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.1.1 +VERSION=2.3.1 APP=claper DEPOT=https://github.com/ClaperCo/Claper.git GIT_VERSION=v${VERSION} diff --git a/ressources/claper/rootfs/DEBIAN/control b/ressources/claper/rootfs/DEBIAN/control index 68c81ad..9348e7f 100644 --- a/ressources/claper/rootfs/DEBIAN/control +++ b/ressources/claper/rootfs/DEBIAN/control @@ -3,6 +3,6 @@ Version: %VERSION% Section: contrib Priority: optional Architecture: all -Depends: inotify-tools, erlang-base, erlang-syntax-tools, erlang-xmerl, ghostscript >= 9 , libreoffice >=24 +Depends: inotify-tools, erlang-base, erlang-syntax-tools, erlang-xmerl, ghostscript (>= 9) , libreoffice (>= 24) Maintainer: Thomas Legay Description: claper diff --git a/ressources/claper/rootfs/DEBIAN/postinst b/ressources/claper/rootfs/DEBIAN/postinst index 9b087ea..40bbfb4 100755 --- a/ressources/claper/rootfs/DEBIAN/postinst +++ b/ressources/claper/rootfs/DEBIAN/postinst @@ -1,5 +1,4 @@ #!/bin/bash - -id claper &> /dev/null || useradd claper -r -s /bin/false -d /opt/claper - -chown -R claper:claper /opt/claper +APPclaperumap +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /opt/$APP/ +chown -R $APP:$APP /opt/$APP/ diff --git a/ressources/cloudbeaver/rootfs/DEBIAN/postinst b/ressources/cloudbeaver/rootfs/DEBIAN/postinst index 38afbf0..892a7c3 100755 --- a/ressources/cloudbeaver/rootfs/DEBIAN/postinst +++ b/ressources/cloudbeaver/rootfs/DEBIAN/postinst @@ -1,5 +1,4 @@ #!/bin/bash - -id cloudbeaver &> /dev/null || useradd cloudbeaver -r -s /bin/false -d /var/lib/cloudbeaver - -chown -R cloudbeaver:cloudbeaver /var/lib/cloudbeaver +APP=cloudbeaver +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/clouseau/rootfs/DEBIAN/postinst b/ressources/clouseau/rootfs/DEBIAN/postinst index eb651fe..4369ce3 100755 --- a/ressources/clouseau/rootfs/DEBIAN/postinst +++ b/ressources/clouseau/rootfs/DEBIAN/postinst @@ -1,5 +1,4 @@ #!/bin/bash - -id clouseau &> /dev/null || useradd clouseau -r -s /bin/false -d /var/lib/clouseau -chown -R clouseau:clouseau /var/lib/clouseau - +APP=clouseau +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index 33787cf..d9364bf 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.89 +VERSION=1.11.95 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} diff --git a/ressources/flame/rootfs/DEBIAN/postinst b/ressources/flame/rootfs/DEBIAN/postinst index c22cc6a..af03093 100755 --- a/ressources/flame/rootfs/DEBIAN/postinst +++ b/ressources/flame/rootfs/DEBIAN/postinst @@ -1,5 +1,4 @@ #!/bin/bash - -id flame &> /dev/null || useradd flame -r -s /bin/false - -chown -R flame:flame /var/lib/flame +APP=flame +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/forgejo/rootfs/DEBIAN/postinst b/ressources/forgejo/rootfs/DEBIAN/postinst index 5e42463..a53858c 100755 --- a/ressources/forgejo/rootfs/DEBIAN/postinst +++ b/ressources/forgejo/rootfs/DEBIAN/postinst @@ -1,6 +1,5 @@ #!/bin/bash - -id forgejo &> /dev/null || useradd forgejo -r -s /bin/false -d /var/lib/forgejo/ - -chown -R forgejo:forgejo /var/lib/forgejo/ -chown forgejo:forgejo /etc/forgejo/app.ini +APP=forgejo +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ +chown $APP:$APP /etc/forgejo/app.ini diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker index 29b5b1b..a4829e3 100755 --- a/ressources/glpi/debmaker +++ b/ressources/glpi/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=10.0.17 +VERSION=10.0.18 APP=glpi DEPOT=https://github.com/glpi-project/glpi.git GIT_VERSION=${VERSION} diff --git a/ressources/gotify/rootfs/DEBIAN/postinst b/ressources/gotify/rootfs/DEBIAN/postinst index 7659bf4..21aaf1c 100755 --- a/ressources/gotify/rootfs/DEBIAN/postinst +++ b/ressources/gotify/rootfs/DEBIAN/postinst @@ -1,5 +1,6 @@ #!/bin/bash - -id gotify &> /dev/null || useradd gotify -r -s /bin/false -md /var/lib/gotify +APP=gotify +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP chown -R www-data:www-data /var/lib/gotify/data/ diff --git a/ressources/grocy/debmaker b/ressources/grocy/debmaker index 2303f99..e326e6c 100755 --- a/ressources/grocy/debmaker +++ b/ressources/grocy/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.3.0 +VERSION=4.4.1 APP=grocy DEPOT=https://github.com/grocy/grocy.git GIT_VERSION=v$VERSION diff --git a/ressources/guacamole-server/debmaker b/ressources/guacamole-server/debmaker index 66e7c20..8b4aeb7 100755 --- a/ressources/guacamole-server/debmaker +++ b/ressources/guacamole-server/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=1.5.3 +VERSION=1.5.5 APP=guacamole-server DEPOT=https://github.com/apache/guacamole-server.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=4 PACKAGE_DEPENDENCY="build-essential automake autoconf libjpeg62-turbo-dev libcairo2-dev libpng-dev libtool-bin uuid-dev libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libwebsockets-dev libpulse-dev libssl-dev libvorbis-dev libwebp-dev" @@ -27,7 +27,6 @@ build(){ autoconf ./configure --prefix=/ make DESTDIR=/tmp/src/rootfs install - } makedeb(){ diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index aaf3aa9..b6af66d 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=3.2.6 +VERSION=3.2.13 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) @@ -24,6 +24,7 @@ build() { cd /tmp/${APP}/ BUILD_SEQUENCIAL=1 yarn install cd packages/app-desktop + USE_HARD_LINKS=false yarn dist npm run dist } diff --git a/ressources/joplin-desktop/rootfs/usr/bin/joplin b/ressources/joplin-desktop/rootfs/usr/bin/joplin index 017c79b..7c8e412 100755 --- a/ressources/joplin-desktop/rootfs/usr/bin/joplin +++ b/ressources/joplin-desktop/rootfs/usr/bin/joplin @@ -1,2 +1,2 @@ #!/bin/bash -/usr/share/joplin/Joplin.AppImage +/usr/share/joplin/Joplin.AppImage --no-sandbox diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker index 8c25934..6f062c4 100755 --- a/ressources/joplin-server/debmaker +++ b/ressources/joplin-server/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=3.0.1 +VERSION=3.3.13 APP=joplin-server GIT_VERSION=server-v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/joplin-server/rootfs/DEBIAN/postinst b/ressources/joplin-server/rootfs/DEBIAN/postinst index dabaf66..3e1a869 100755 --- a/ressources/joplin-server/rootfs/DEBIAN/postinst +++ b/ressources/joplin-server/rootfs/DEBIAN/postinst @@ -1,8 +1,10 @@ #!/bin/bash +APP=joplin-server +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ -id joplin-server &> /dev/null || useradd joplin-server -r -s /bin/false -md /var/lib/joplin-server ## issue https://github.com/laurent22/joplin/issues/5980 -[ ! -e /usr/lib/joplin-server/server/temp/ ] && mkdir /usr/lib/joplin-server/server/temp/ -[ ! -e /usr/lib/joplin-server/server/logs/ ] && mkdir /usr/lib/joplin-server/server/logs/ -chown joplin-server:joplin-server /usr/lib/joplin-server/server/temp/ -chown joplin-server:joplin-server /usr/lib/joplin-server/server/logs/ +[ ! -e /usr/lib/$APP/server/temp/ ] && mkdir /usr/lib/$APP/server/temp/ +[ ! -e /usr/lib/$APP/server/logs/ ] && mkdir /usr/lib/$APP/server/logs/ +chown $APP:$APP /usr/lib/$APP/server/temp/ +chown $APP:$APP /usr/lib/$APP/server/logs/ diff --git a/ressources/keycloak/debmaker b/ressources/keycloak/debmaker index 7b2a0f4..135aaaf 100755 --- a/ressources/keycloak/debmaker +++ b/ressources/keycloak/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=26.1.0 +VERSION=26.2.0 APP=keycloak DEPOT=https://github.com/keycloak/keycloak.git GIT_VERSION=${VERSION} diff --git a/ressources/keycloak/rootfs/DEBIAN/postinst b/ressources/keycloak/rootfs/DEBIAN/postinst index b037ac1..c46d0a9 100755 --- a/ressources/keycloak/rootfs/DEBIAN/postinst +++ b/ressources/keycloak/rootfs/DEBIAN/postinst @@ -1,6 +1,6 @@ #!/bin/bash -id keycloak &> /dev/null || useradd keycloak -r -s /bin/false - -chown keycloak:keycloak /var/lib/keycloak/ -R -chown keycloak:keycloak /usr/lib/keycloak/lib/quarkus -R +APP=keycloak +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ +chown $APP:$APP /usr/lib/keycloak/lib/quarkus -R diff --git a/ressources/linkding/rootfs/DEBIAN/postinst b/ressources/linkding/rootfs/DEBIAN/postinst index 87d0fa2..803c7e9 100755 --- a/ressources/linkding/rootfs/DEBIAN/postinst +++ b/ressources/linkding/rootfs/DEBIAN/postinst @@ -1,9 +1,9 @@ #!/bin/bash +APP=linkding #Allready create on package then no -md -id linkding &> /dev/null || useradd linkding -r -s /bin/false -d /var/lib/linkding - -chown linkding:linkding /var/lib/linkding -R +id $APP &> /dev/null || useradd $APP -r -s /bin/false -d /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ #Need to be remove because usr need to be in read only chown linkding:linkding /usr/share/linkding/bookmarks/static -R diff --git a/ressources/mailhog/rootfs/DEBIAN/postinst b/ressources/mailhog/rootfs/DEBIAN/postinst index ab2705c..e55ebd6 100755 --- a/ressources/mailhog/rootfs/DEBIAN/postinst +++ b/ressources/mailhog/rootfs/DEBIAN/postinst @@ -1,4 +1,5 @@ #!/bin/bash -id mailhog &> /dev/null || useradd mailhog -r -s /bin/false -d / - +APP=mailhog +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/mautrix-syncproxy/rootfs/DEBIAN/postinst b/ressources/mautrix-syncproxy/rootfs/DEBIAN/postinst index 80b24b6..ce4bbb7 100755 --- a/ressources/mautrix-syncproxy/rootfs/DEBIAN/postinst +++ b/ressources/mautrix-syncproxy/rootfs/DEBIAN/postinst @@ -1,4 +1,5 @@ #!/bin/bash -id mautrix-syncproxy &> /dev/null || useradd mautrix-syncproxy -r -s /bin/false -d / - +APP=mautrix-syncproxy +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/mautrix-whatsapp/debian/postinst b/ressources/mautrix-whatsapp/debian/postinst index 9aa9e5b..bbcb658 100755 --- a/ressources/mautrix-whatsapp/debian/postinst +++ b/ressources/mautrix-whatsapp/debian/postinst @@ -1,4 +1,6 @@ #!/bin/bash -id mautrix-whatsapp &> /dev/null || useradd mautrix-whatsapp -r -s /bin/false -md /var/lib/mautrix-whatsapp -chown mautrix-whatsapp:mautrix-whatsapp /etc/mautrix-whatsapp/ +APP=mautrix-whatsapp +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ +chown -R $APP:$APP /etc/mautrix-whatsapp/ diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index cab717a..2a54fcb 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.11.2 +VERSION=0.11.4 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} diff --git a/ressources/mautrix-wsproxy/rootfs/DEBIAN/postinst b/ressources/mautrix-wsproxy/rootfs/DEBIAN/postinst index 79145c8..53ff92f 100755 --- a/ressources/mautrix-wsproxy/rootfs/DEBIAN/postinst +++ b/ressources/mautrix-wsproxy/rootfs/DEBIAN/postinst @@ -1,4 +1,7 @@ #!/bin/bash -id mautrix-wsproxy &> /dev/null || useradd mautrix-wsproxy -r -s /bin/false -d / +APP=mautrix-wsproxy +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ + diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 7189f88..5c21c26 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.52.5.4 +VERSION=0.54.2.4 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION @@ -12,7 +12,7 @@ PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" main(){ base_package_upgrade configure_depot_yarn - configure_depot_nodejs 20 + configure_depot_nodejs 22 install_package_dependency install_clojure get_git_source diff --git a/ressources/metabase/rootfs/DEBIAN/postinst b/ressources/metabase/rootfs/DEBIAN/postinst index c727dbe..63188fd 100755 --- a/ressources/metabase/rootfs/DEBIAN/postinst +++ b/ressources/metabase/rootfs/DEBIAN/postinst @@ -1,5 +1,5 @@ #!/bin/bash -id metabase &> /dev/null || useradd metabase -r -s /bin/false -d /var/lib/metabase - -chown -R metabase:metabase /var/lib/metabase +APP=metabase +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/minio/rootfs/DEBIAN/postinst b/ressources/minio/rootfs/DEBIAN/postinst index 55a0faa..51b36fd 100755 --- a/ressources/minio/rootfs/DEBIAN/postinst +++ b/ressources/minio/rootfs/DEBIAN/postinst @@ -1,4 +1,5 @@ #!/bin/bash -id minio&> /dev/null || useradd minio -r -s /bin/false -md /var/lib/minio -chown minio:minio /var/lib/minio +APP=minio +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/moodle-auth-oidc/debmaker b/ressources/moodle-auth-oidc/debmaker index 97a38a0..7b7f954 100755 --- a/ressources/moodle-auth-oidc/debmaker +++ b/ressources/moodle-auth-oidc/debmaker @@ -1,9 +1,11 @@ #!/bin/bash -VERSION=4.4.1 +VERSION=4.5.2 APP=moodle-auth-oidc DEPOT=https://github.com/microsoft/moodle-auth_oidc.git +DEPOT=https://github.com/tomamplius/moodle-auth_oidc.git GIT_VERSION=v$VERSION +GIT_VERSION=last DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=1 diff --git a/ressources/paperless-ngx/debmaker b/ressources/paperless-ngx/debmaker index d8ebdc5..746679f 100755 --- a/ressources/paperless-ngx/debmaker +++ b/ressources/paperless-ngx/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.8.6 +VERSION=2.14.5 APP=paperless-ngx DEPOT=https://github.com/paperless-ngx/paperless-ngx.git GIT_VERSION=v${VERSION} diff --git a/ressources/paperless-ngx/prestart.sh b/ressources/paperless-ngx/prestart.sh index 0b7031d..f9f3982 100755 --- a/ressources/paperless-ngx/prestart.sh +++ b/ressources/paperless-ngx/prestart.sh @@ -9,4 +9,4 @@ else /var/cache/paperless-ngx/python-venv/bin/pip3 install -r /usr/share/paperless-ngx/requirements.txt date +%y%m%d > /var/cache/paperless-ngx/lastcheck fi -) 9>python3 -m venv /tmp/paperless-ngx-python-venv +) 9> /tmp/paperless-ngx-python-venv diff --git a/ressources/paperless-ngx/rootfs/DEBIAN/control b/ressources/paperless-ngx/rootfs/DEBIAN/control index dd24845..d68eb1f 100644 --- a/ressources/paperless-ngx/rootfs/DEBIAN/control +++ b/ressources/paperless-ngx/rootfs/DEBIAN/control @@ -4,5 +4,5 @@ Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay -Depends: python3, python3-pip, python3-dev, imagemagick, fonts-liberation, gnupg, libpq-dev, default-libmysqlclient-dev, pkg-config, libmagic-dev, mime-support, libzbar0, poppler-utils, unpaper, ghostscript, icc-profiles-free, qpdf, liblept5, libxml2, pngquant, zlib1g, tesseract-ocr, gcc +Depends: python3, python3-pip, python3-dev, imagemagick, fonts-liberation, gnupg, libpq-dev, default-libmysqlclient-dev, pkg-config, libmagic-dev, mime-support, libzbar0, poppler-utils, unpaper, ghostscript, icc-profiles-free, qpdf, liblept5, libxml2, pngquant, zlib1g, tesseract-ocr, gcc, python3-venv Description: Paperless-ngx is a document management system that transforms your physical documents into a searchable online archive so you can keep, well, less paper. diff --git a/ressources/phpbb-language-fr/debmaker b/ressources/phpbb-language-fr/debmaker index 129a779..b854900 100755 --- a/ressources/phpbb-language-fr/debmaker +++ b/ressources/phpbb-language-fr/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=4.11.0 +VERSION=4.15.0 APP=phpbb-language-fr DEPOT=https://github.com/qiaeru/phpbb-language-fr.git GIT_VERSION=v$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=1 STEP="base_package_upgrade default_prebuild makedeb" diff --git a/ressources/phpbb/debmaker b/ressources/phpbb/debmaker index 64ebba4..6792bd7 100755 --- a/ressources/phpbb/debmaker +++ b/ressources/phpbb/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=3.3.14 +VERSION=3.3.15 APP=phpbb DEPOT=https://github.com/phpbb/phpbb.git GIT_VERSION=release-$VERSION diff --git a/ressources/picapport/rootfs/DEBIAN/postinst b/ressources/picapport/rootfs/DEBIAN/postinst index a7e100d..7d74664 100755 --- a/ressources/picapport/rootfs/DEBIAN/postinst +++ b/ressources/picapport/rootfs/DEBIAN/postinst @@ -1,9 +1,8 @@ #!/bin/bash + APP=picapport - -id ${APP} &> /dev/null || useradd ${APP} -r -s /bin/false -md /var/lib/${APP} - -chown -R ${APP}:${APP} /var/lib/${APP}/ +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ if [[ $(systemctl list-unit-files | grep ${APP}.services) -eq 0 ]] then diff --git a/ressources/roundcubemail/debmaker b/ressources/roundcubemail/debmaker index 322a1e9..0756854 100755 --- a/ressources/roundcubemail/debmaker +++ b/ressources/roundcubemail/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.6.9 +VERSION=1.6.10 APP=roundcubemail DEPOT=https://github.com/roundcube/roundcubemail.git GIT_VERSION=${VERSION} diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker index 1727401..2d82e9c 100755 --- a/ressources/rustdesk-server/debmaker +++ b/ressources/rustdesk-server/debmaker @@ -1,7 +1,7 @@ #!/bin/bash APP=rustdesk-server -VERSION=1.1.13 +VERSION=1.1.14 GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm diff --git a/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst index c73a6ac..09338a3 100755 --- a/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst +++ b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst @@ -1,4 +1,7 @@ #!/bin/bash -id hbbr &> /dev/null || useradd hbbr -r -s /bin/false -md /var/lib/hbbr -chown hbbr:hbbr /var/lib/hbbr +APP=hbbr +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ + + diff --git a/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst index 5e33810..e2ad3c1 100755 --- a/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst +++ b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst @@ -1,4 +1,7 @@ #!/bin/bash -id hbbs &> /dev/null || useradd hbbs -r -s /bin/false -md /var/lib/hbbs -chown hbbs:hbbs /var/lib/hbbs +APP=hbbs +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ + + diff --git a/ressources/sqlpage/rootfs/DEBIAN/postinst b/ressources/sqlpage/rootfs/DEBIAN/postinst index ed7b997..54b04c5 100755 --- a/ressources/sqlpage/rootfs/DEBIAN/postinst +++ b/ressources/sqlpage/rootfs/DEBIAN/postinst @@ -1,4 +1,5 @@ #!/bin/bash -id vaultwarden&> /dev/null || useradd vaultwarden -r -s /bin/false -md /var/lib/vaultwarden -chown vaultwarden:vaultwarden /var/lib/vaultwarden +APP=vaultwarden +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/umap/debmaker b/ressources/umap/debmaker index 5e5f071..7bafa4f 100755 --- a/ressources/umap/debmaker +++ b/ressources/umap/debmaker @@ -1,9 +1,9 @@ #!/bin/bash -VERSION=2.7.1 +VERSION=2.8.2 APP=umap DEPOT=https://github.com/umap-project/umap.git -GIT_VERSION=${VERSION} +GIT_VERSION=last DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=6 @@ -14,7 +14,7 @@ main(){ install_package_dependency get_git_source build - #makedeb + makedeb } build(){ diff --git a/ressources/umap/rootfs/DEBIAN/postinst b/ressources/umap/rootfs/DEBIAN/postinst index e97feb5..a64686f 100755 --- a/ressources/umap/rootfs/DEBIAN/postinst +++ b/ressources/umap/rootfs/DEBIAN/postinst @@ -3,5 +3,3 @@ APP=umap id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ chown -R $APP:$APP /var/lib/$APP/ - - diff --git a/ressources/umap/rootfs/umap.service b/ressources/umap/rootfs/umap.service index 290c35f..7d092aa 100644 --- a/ressources/umap/rootfs/umap.service +++ b/ressources/umap/rootfs/umap.service @@ -6,6 +6,7 @@ After=network.target User=umap Group=umap #WorkingDirectory=/var/share/umap/ +EnvironmentFile=/etc/default/umap ExecStartPre=/usr/bin/python3 -m venv /var/lib/umap/venv ExecStartPre=/var/lib/umap/venv/bin/pip install /usr/share/umap/.[docker] ExecStartPre=/var/lib/umap/venv/bin/python3 /usr/share/umap/manage.py migrate diff --git a/ressources/uptime-kuma/DEBIAN/postinst b/ressources/uptime-kuma/DEBIAN/postinst index bce7cdb..2629181 100755 --- a/ressources/uptime-kuma/DEBIAN/postinst +++ b/ressources/uptime-kuma/DEBIAN/postinst @@ -1,7 +1,6 @@ #!/bin/bash -APPUSER=uptime-kuma -id $APPUSER &> /dev/null || useradd $APPUSER -r -s /bin/false -md /var/lib/$APPUSER/ - -chown -R $APPUSER:$APPUSER /var/lib/$APPUSER/ +APP=uptime-kuma +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/vaultwarden-web/debmaker b/ressources/vaultwarden-web/debmaker index f2246dd..1f6c135 100755 --- a/ressources/vaultwarden-web/debmaker +++ b/ressources/vaultwarden-web/debmaker @@ -1,9 +1,10 @@ #!/bin/bash -VERSION=2025.1.0 +VERSION=2025.3.1 APP=vaultwarden-web -BITWARDEN_VERSION=v${VERSION} -GIT_VERSION=${BITWARDEN_VERSION} + +BITWARDEN_VERSION=v2025.1.1 +GIT_VERSION=v2025.1.1 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=5 diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker index de1c9b9..ed1277d 100755 --- a/ressources/vaultwarden/debmaker +++ b/ressources/vaultwarden/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.32.7 +VERSION=1.33.2 APP=vaultwarden GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/vaultwarden/rootfs/DEBIAN/postinst b/ressources/vaultwarden/rootfs/DEBIAN/postinst index ed7b997..54b04c5 100755 --- a/ressources/vaultwarden/rootfs/DEBIAN/postinst +++ b/ressources/vaultwarden/rootfs/DEBIAN/postinst @@ -1,4 +1,5 @@ #!/bin/bash -id vaultwarden&> /dev/null || useradd vaultwarden -r -s /bin/false -md /var/lib/vaultwarden -chown vaultwarden:vaultwarden /var/lib/vaultwarden +APP=vaultwarden +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/ diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker index a2e0375..903178a 100755 --- a/ressources/wallabag/debmaker +++ b/ressources/wallabag/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.6.9 +VERSION=2.6.12 APP=wallabag GIT_VERSION=$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker index bb66c32..a441231 100755 --- a/ressources/zigbee2mqtt/debmaker +++ b/ressources/zigbee2mqtt/debmaker @@ -1,17 +1,17 @@ #!/bin/bash -VERSION=1.42.0 +VERSION=2.2.1 APP=zigbee2mqtt DEPOT=https://github.com/Koenkk/zigbee2mqtt.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm -IMAGE_SIZE=2 +IMAGE_SIZE=3 PACKAGE_DEPENDENCY="nodejs make g++ gcc" main(){ base_package_upgrade - configure_depot_nodejs 20 + configure_depot_nodejs 22 install_package_dependency get_git_source build @@ -20,14 +20,14 @@ main(){ build() { cd /tmp/${APP} - npm ci + npm install npm run build } makedeb(){ PATH_DEB=/tmp/src/rootfs - cp -fr /tmp/zigbee2mqtt/data/configuration.yaml ${PATH_DEB}/etc/zigbee2mqtt/configuration.yaml + cp -fr /tmp/zigbee2mqtt/data/configuration.example.yaml ${PATH_DEB}/etc/zigbee2mqtt/configuration.yaml cp -fr /tmp/zigbee2mqtt/* ${PATH_DEB}/usr/lib/zigbee2mqtt/ sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control diff --git a/ressources/zigbee2mqtt/rootfs/DEBIAN/postinst b/ressources/zigbee2mqtt/rootfs/DEBIAN/postinst index 82a657a..fe00cd2 100755 --- a/ressources/zigbee2mqtt/rootfs/DEBIAN/postinst +++ b/ressources/zigbee2mqtt/rootfs/DEBIAN/postinst @@ -1,4 +1,5 @@ #!/bin/bash -id zigbee2mqtt &> /dev/null || useradd zigbee2mqtt -r -s /bin/false -md /var/lib/zigbee2mqtt -chown -R zigbee2mqtt:zigbee2mqtt /var/lib/zigbee2mqtt/ +APP=zigbee2mqtt +id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ +chown -R $APP:$APP /var/lib/$APP/