From 9a733a6499e19d714ac632ad7bd02d59fb1bbe65 Mon Sep 17 00:00:00 2001 From: thomas Date: Tue, 1 Nov 2022 22:14:36 +0100 Subject: [PATCH] update version & section change --- ressources/adguardhome/rootfs/DEBIAN/control | 2 +- ressources/authelia/rootfs/DEBIAN/control | 2 +- ressources/bitwarden-desktop/rootfs/DEBIAN/control | 2 +- ressources/budibase/debmaker | 4 ++-- ressources/budibase/rootfs/DEBIAN/control | 2 +- ressources/cloudbeaver/rootfs/DEBIAN/control | 2 +- ressources/clouseau/rootfs/DEBIAN/control | 2 +- ressources/element-web/debmaker | 2 +- ressources/element-web/rootfs/DEBIAN/control | 2 +- ressources/flame/rootfs/DEBIAN/control | 2 +- ressources/gitea/rootfs/DEBIAN/control | 2 +- ressources/glpi/rootfs/DEBIAN/control | 2 +- ressources/gotify/rootfs/DEBIAN/control | 2 +- ressources/grocy/rootfs/DEBIAN/control | 2 +- ressources/joplin-desktop/debmaker | 13 ++++++++----- ressources/joplin-desktop/rootfs/DEBIAN/control | 2 +- ressources/joplin-server/rootfs/DEBIAN/control | 2 +- ressources/keycloak/rootfs/DEBIAN/control | 2 +- ressources/kimai2/rootfs/DEBIAN/control | 2 +- ressources/libretranslate/rootfs/DEBIAN/control | 2 +- ressources/mailhog/rootfs/DEBIAN/control | 2 +- ressources/mautrix-syncproxy/rootfs/DEBIAN/control | 2 +- ressources/mautrix-wsproxy/rootfs/DEBIAN/control | 2 +- ressources/metabase/debmaker | 10 ++++++---- ressources/metabase/rootfs/DEBIAN/control | 2 +- ressources/minio/rootfs/DEBIAN/control | 2 +- ressources/phpbb-language-fr/rootfs/DEBIAN/control | 2 +- ressources/phpbb/rootfs/DEBIAN/control | 2 +- ressources/picapport/rootfs/DEBIAN/control | 2 +- ressources/roundcubemail/rootfs/DEBIAN/control | 2 +- ressources/rss-bridge/rootfs/DEBIAN/control | 2 +- .../tt-rss-plugin-wallabag/rootfs/DEBIAN/control | 2 +- ressources/tt-rss/rootfs/DEBIAN/control | 2 +- ressources/vaultwarden-web/rootfs/DEBIAN/control | 2 +- ressources/vaultwarden/rootfs/DEBIAN/control | 2 +- ressources/wallabag/rootfs/DEBIAN/control | 2 +- ressources/zigbee2mqtt/rootfs/DEBIAN/control | 2 +- 37 files changed, 50 insertions(+), 45 deletions(-) diff --git a/ressources/adguardhome/rootfs/DEBIAN/control b/ressources/adguardhome/rootfs/DEBIAN/control index a88b0f8..b417ded 100644 --- a/ressources/adguardhome/rootfs/DEBIAN/control +++ b/ressources/adguardhome/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: adguardhome Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: amd64 Maintainer: Thomas Legay diff --git a/ressources/authelia/rootfs/DEBIAN/control b/ressources/authelia/rootfs/DEBIAN/control index ea03afc..6570743 100644 --- a/ressources/authelia/rootfs/DEBIAN/control +++ b/ressources/authelia/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: authelia Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/bitwarden-desktop/rootfs/DEBIAN/control b/ressources/bitwarden-desktop/rootfs/DEBIAN/control index 8b73baf..ab9848e 100644 --- a/ressources/bitwarden-desktop/rootfs/DEBIAN/control +++ b/ressources/bitwarden-desktop/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: bitwarden-desktop Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index 9e52554..6e78dea 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,9 +1,9 @@ #!/bin/bash -VERSION=2.0.37 +VERSION=2.1.3 APP=budibase DEPOT=https://github.com/Budibase/budibase.git -GIT_VERSION=last +GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=20 diff --git a/ressources/budibase/rootfs/DEBIAN/control b/ressources/budibase/rootfs/DEBIAN/control index e025575..61d8641 100644 --- a/ressources/budibase/rootfs/DEBIAN/control +++ b/ressources/budibase/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: budibase Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/cloudbeaver/rootfs/DEBIAN/control b/ressources/cloudbeaver/rootfs/DEBIAN/control index 30ac3f4..67e9c3f 100644 --- a/ressources/cloudbeaver/rootfs/DEBIAN/control +++ b/ressources/cloudbeaver/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: cloudbeaver Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: default-jre-headless diff --git a/ressources/clouseau/rootfs/DEBIAN/control b/ressources/clouseau/rootfs/DEBIAN/control index 5feb7fb..4874239 100644 --- a/ressources/clouseau/rootfs/DEBIAN/control +++ b/ressources/clouseau/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: clouseau Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: zulu-7 diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index c9bf179..cbbb4fb 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.12 +VERSION=1.11.13 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} diff --git a/ressources/element-web/rootfs/DEBIAN/control b/ressources/element-web/rootfs/DEBIAN/control index 9c6dcd5..50ad84d 100644 --- a/ressources/element-web/rootfs/DEBIAN/control +++ b/ressources/element-web/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: element-web Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/flame/rootfs/DEBIAN/control b/ressources/flame/rootfs/DEBIAN/control index a0723f1..5544024 100644 --- a/ressources/flame/rootfs/DEBIAN/control +++ b/ressources/flame/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: flame Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends:nodejs diff --git a/ressources/gitea/rootfs/DEBIAN/control b/ressources/gitea/rootfs/DEBIAN/control index 375fb2b..d3ea13c 100644 --- a/ressources/gitea/rootfs/DEBIAN/control +++ b/ressources/gitea/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: gitea Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: git diff --git a/ressources/glpi/rootfs/DEBIAN/control b/ressources/glpi/rootfs/DEBIAN/control index 9a6d0a8..6a57590 100644 --- a/ressources/glpi/rootfs/DEBIAN/control +++ b/ressources/glpi/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: glpi Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: php-json, php-xml, php-curl, php-gd, php-intl, php-ldap, php-zip, php-mysql, php-bz2, php-mbstring diff --git a/ressources/gotify/rootfs/DEBIAN/control b/ressources/gotify/rootfs/DEBIAN/control index df259d1..eecb1db 100644 --- a/ressources/gotify/rootfs/DEBIAN/control +++ b/ressources/gotify/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: gotify-server Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/grocy/rootfs/DEBIAN/control b/ressources/grocy/rootfs/DEBIAN/control index 9fb306e..2d4bcb6 100644 --- a/ressources/grocy/rootfs/DEBIAN/control +++ b/ressources/grocy/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: grocy Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: php-simplexml, php-gd, php-sqlite3, php-intl, php-mbstring diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index 32da512..c65beae 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,19 +1,22 @@ #!/bin/bash -VERSION=2.9.11 +VERSION=2.9.12 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEPOT=https://github.com/laurent22/joplin.git DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=10 +PACKAGE_DEPENDENCY="build-essential python nodejs rsync yarn" -STEP="base_package_upgrade envinit get_git_source build makedeb" - -envinit() { +main(){ + base_package_upgrade configure_depot_yarn configure_depot_nodejs - apt install -y --no-install-recommends build-essential python nodejs rsync yarn + install_package_dependency + get_git_source + build + makedeb } build() { diff --git a/ressources/joplin-desktop/rootfs/DEBIAN/control b/ressources/joplin-desktop/rootfs/DEBIAN/control index f97c969..c8e7691 100644 --- a/ressources/joplin-desktop/rootfs/DEBIAN/control +++ b/ressources/joplin-desktop/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: joplin Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: nodejs diff --git a/ressources/joplin-server/rootfs/DEBIAN/control b/ressources/joplin-server/rootfs/DEBIAN/control index cb07262..a999af9 100644 --- a/ressources/joplin-server/rootfs/DEBIAN/control +++ b/ressources/joplin-server/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: joplin-server Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: nodejs diff --git a/ressources/keycloak/rootfs/DEBIAN/control b/ressources/keycloak/rootfs/DEBIAN/control index 4228258..d51fe3c 100644 --- a/ressources/keycloak/rootfs/DEBIAN/control +++ b/ressources/keycloak/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: keycloak Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: default-jre diff --git a/ressources/kimai2/rootfs/DEBIAN/control b/ressources/kimai2/rootfs/DEBIAN/control index 02bf08b..bc15529 100644 --- a/ressources/kimai2/rootfs/DEBIAN/control +++ b/ressources/kimai2/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: kimai2 Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: php (>= 7.4), php-gd, php-intl, php-json, php-mbstring, php-pdo, php-xsl, php-zip diff --git a/ressources/libretranslate/rootfs/DEBIAN/control b/ressources/libretranslate/rootfs/DEBIAN/control index cb07262..a999af9 100644 --- a/ressources/libretranslate/rootfs/DEBIAN/control +++ b/ressources/libretranslate/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: joplin-server Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: nodejs diff --git a/ressources/mailhog/rootfs/DEBIAN/control b/ressources/mailhog/rootfs/DEBIAN/control index 0d92373..d1c0f45 100644 --- a/ressources/mailhog/rootfs/DEBIAN/control +++ b/ressources/mailhog/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: mailhog Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/mautrix-syncproxy/rootfs/DEBIAN/control b/ressources/mautrix-syncproxy/rootfs/DEBIAN/control index 7afe3e0..a09cbea 100644 --- a/ressources/mautrix-syncproxy/rootfs/DEBIAN/control +++ b/ressources/mautrix-syncproxy/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: mautrix-syncproxy Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/mautrix-wsproxy/rootfs/DEBIAN/control b/ressources/mautrix-wsproxy/rootfs/DEBIAN/control index 8328896..df542a8 100644 --- a/ressources/mautrix-wsproxy/rootfs/DEBIAN/control +++ b/ressources/mautrix-wsproxy/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: mautrix-wsproxy Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index a14c330..cc5530b 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.44.5 +VERSION=0.44.6 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION @@ -9,13 +9,15 @@ DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=10 PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" -STEP="base_package_upgrade envinit get_git_source build makedeb" - -envinit() { +main(){ + base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency install_clojure + get_git_source + build + makedeb } build() { diff --git a/ressources/metabase/rootfs/DEBIAN/control b/ressources/metabase/rootfs/DEBIAN/control index 310f924..40e53f5 100644 --- a/ressources/metabase/rootfs/DEBIAN/control +++ b/ressources/metabase/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: metabase Version: %VERSION% -Section: base +Section: contrib Priority: optional Depends: default-jre Architecture: all diff --git a/ressources/minio/rootfs/DEBIAN/control b/ressources/minio/rootfs/DEBIAN/control index 5f33862..e496fcf 100644 --- a/ressources/minio/rootfs/DEBIAN/control +++ b/ressources/minio/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: minio Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: amd64 Maintainer: Thomas Legay diff --git a/ressources/phpbb-language-fr/rootfs/DEBIAN/control b/ressources/phpbb-language-fr/rootfs/DEBIAN/control index def3489..77229d8 100644 --- a/ressources/phpbb-language-fr/rootfs/DEBIAN/control +++ b/ressources/phpbb-language-fr/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: phpbb-language-fr Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/phpbb/rootfs/DEBIAN/control b/ressources/phpbb/rootfs/DEBIAN/control index 0405e1e..33e730e 100644 --- a/ressources/phpbb/rootfs/DEBIAN/control +++ b/ressources/phpbb/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: phpbb Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/picapport/rootfs/DEBIAN/control b/ressources/picapport/rootfs/DEBIAN/control index 2b79d7a..149e447 100644 --- a/ressources/picapport/rootfs/DEBIAN/control +++ b/ressources/picapport/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: picapport Version: %VERSION% -Section: base +Section: non-free Priority: optional Architecture: all Depends: default-jre diff --git a/ressources/roundcubemail/rootfs/DEBIAN/control b/ressources/roundcubemail/rootfs/DEBIAN/control index 3a3bdca..b240d3f 100644 --- a/ressources/roundcubemail/rootfs/DEBIAN/control +++ b/ressources/roundcubemail/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: roundcubemail Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: php-common, php-xml, php-json, php-gd, php-mbstring, php-xml, php-tidy, php-curl, php-tokenizer, php-bcmath, php-intl, php-fpm, php-sqlite3, php-pgsql, php-mysql diff --git a/ressources/rss-bridge/rootfs/DEBIAN/control b/ressources/rss-bridge/rootfs/DEBIAN/control index 64263ab..39be3eb 100644 --- a/ressources/rss-bridge/rootfs/DEBIAN/control +++ b/ressources/rss-bridge/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: rss-bridge Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/control b/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/control index 4a6b087..27709de 100644 --- a/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/control +++ b/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: tt-rss-plugin-wallabag Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: tt-rss, php-curl diff --git a/ressources/tt-rss/rootfs/DEBIAN/control b/ressources/tt-rss/rootfs/DEBIAN/control index ed5348a..02aa86d 100644 --- a/ressources/tt-rss/rootfs/DEBIAN/control +++ b/ressources/tt-rss/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: tt-rss Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: php-pgsql, php-mysql, php-intl, php-mbstring, php-xml diff --git a/ressources/vaultwarden-web/rootfs/DEBIAN/control b/ressources/vaultwarden-web/rootfs/DEBIAN/control index 9e8d1bf..b7b626a 100644 --- a/ressources/vaultwarden-web/rootfs/DEBIAN/control +++ b/ressources/vaultwarden-web/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: vaultwarden-web Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/vaultwarden/rootfs/DEBIAN/control b/ressources/vaultwarden/rootfs/DEBIAN/control index 5e2919e..24ff2bb 100644 --- a/ressources/vaultwarden/rootfs/DEBIAN/control +++ b/ressources/vaultwarden/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: vaultwarden Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: libmariadb-dev, libpq-dev, libmysql++-dev diff --git a/ressources/wallabag/rootfs/DEBIAN/control b/ressources/wallabag/rootfs/DEBIAN/control index 30bccf9..c30e035 100644 --- a/ressources/wallabag/rootfs/DEBIAN/control +++ b/ressources/wallabag/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: wallabag Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: php-common, php-xml, php-json, php-gd, php-mbstring, php-xml, php-tidy, php-curl, php-tokenizer, php-bcmath, php-intl, php-fpm, php-sqlite3, php-pgsql, php-mysql diff --git a/ressources/zigbee2mqtt/rootfs/DEBIAN/control b/ressources/zigbee2mqtt/rootfs/DEBIAN/control index 76f7731..3ccc53d 100644 --- a/ressources/zigbee2mqtt/rootfs/DEBIAN/control +++ b/ressources/zigbee2mqtt/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: zigbee2mqtt Version: %VERSION% -Section: base +Section: contrib Priority: optional Architecture: all Depends: nodejs, npm