diff --git a/README.MD b/README.MD index 596eb0d..a1a165a 100644 --- a/README.MD +++ b/README.MD @@ -64,7 +64,6 @@ To enter in temporary filesystem - [metabase](./ressources/metabase) - [minio](./ressources/minio) - [phpbb](./ressources/phpbb) - - [picapport](./ressources/picapport) - [roundcubemail](./ressources/roundcubemail) - [rss-bridge](./ressources/rss-bridge) - [rustdesk-server](./ressources/rustdesk-server) diff --git a/ressources/adguardhome/rootfs/DEBIAN/control b/ressources/adguardhome/rootfs/DEBIAN/control index b417ded..a88b0f8 100644 --- a/ressources/adguardhome/rootfs/DEBIAN/control +++ b/ressources/adguardhome/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: adguardhome Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: amd64 Maintainer: Thomas Legay diff --git a/ressources/authelia/rootfs/DEBIAN/control b/ressources/authelia/rootfs/DEBIAN/control index 6570743..ea03afc 100644 --- a/ressources/authelia/rootfs/DEBIAN/control +++ b/ressources/authelia/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: authelia Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/bitwarden-desktop/rootfs/DEBIAN/control b/ressources/bitwarden-desktop/rootfs/DEBIAN/control index ab9848e..8b73baf 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: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index 6e78dea..9e52554 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,9 +1,9 @@ #!/bin/bash -VERSION=2.1.3 +VERSION=2.0.37 APP=budibase DEPOT=https://github.com/Budibase/budibase.git -GIT_VERSION=v${VERSION} +GIT_VERSION=last 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 61d8641..e025575 100644 --- a/ressources/budibase/rootfs/DEBIAN/control +++ b/ressources/budibase/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: budibase Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/cloudbeaver/rootfs/DEBIAN/control b/ressources/cloudbeaver/rootfs/DEBIAN/control index 67e9c3f..30ac3f4 100644 --- a/ressources/cloudbeaver/rootfs/DEBIAN/control +++ b/ressources/cloudbeaver/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: cloudbeaver Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: default-jre-headless diff --git a/ressources/clouseau/rootfs/DEBIAN/control b/ressources/clouseau/rootfs/DEBIAN/control index 4874239..5feb7fb 100644 --- a/ressources/clouseau/rootfs/DEBIAN/control +++ b/ressources/clouseau/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: clouseau Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: zulu-7 diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index cbbb4fb..c9bf179 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.13 +VERSION=1.11.12 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 50ad84d..9c6dcd5 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: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/flame/rootfs/DEBIAN/control b/ressources/flame/rootfs/DEBIAN/control index 5544024..a0723f1 100644 --- a/ressources/flame/rootfs/DEBIAN/control +++ b/ressources/flame/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: flame Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends:nodejs diff --git a/ressources/gitea/rootfs/DEBIAN/control b/ressources/gitea/rootfs/DEBIAN/control index d3ea13c..375fb2b 100644 --- a/ressources/gitea/rootfs/DEBIAN/control +++ b/ressources/gitea/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: gitea Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: git diff --git a/ressources/glpi/rootfs/DEBIAN/control b/ressources/glpi/rootfs/DEBIAN/control index 6a57590..9a6d0a8 100644 --- a/ressources/glpi/rootfs/DEBIAN/control +++ b/ressources/glpi/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: glpi Version: %VERSION% -Section: contrib +Section: base 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 eecb1db..df259d1 100644 --- a/ressources/gotify/rootfs/DEBIAN/control +++ b/ressources/gotify/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: gotify-server Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/grocy/rootfs/DEBIAN/control b/ressources/grocy/rootfs/DEBIAN/control index 2d4bcb6..9fb306e 100644 --- a/ressources/grocy/rootfs/DEBIAN/control +++ b/ressources/grocy/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: grocy Version: %VERSION% -Section: contrib +Section: base 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 c65beae..32da512 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,22 +1,19 @@ #!/bin/bash -VERSION=2.9.12 +VERSION=2.9.11 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" -main(){ - base_package_upgrade +STEP="base_package_upgrade envinit get_git_source build makedeb" + +envinit() { configure_depot_yarn configure_depot_nodejs - install_package_dependency - get_git_source - build - makedeb + apt install -y --no-install-recommends build-essential python nodejs rsync yarn } build() { diff --git a/ressources/joplin-desktop/rootfs/DEBIAN/control b/ressources/joplin-desktop/rootfs/DEBIAN/control index c8e7691..f97c969 100644 --- a/ressources/joplin-desktop/rootfs/DEBIAN/control +++ b/ressources/joplin-desktop/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: joplin Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: nodejs diff --git a/ressources/joplin-server/rootfs/DEBIAN/control b/ressources/joplin-server/rootfs/DEBIAN/control index a999af9..cb07262 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: contrib +Section: base Priority: optional Architecture: all Depends: nodejs diff --git a/ressources/keycloak/rootfs/DEBIAN/control b/ressources/keycloak/rootfs/DEBIAN/control index d51fe3c..4228258 100644 --- a/ressources/keycloak/rootfs/DEBIAN/control +++ b/ressources/keycloak/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: keycloak Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: default-jre diff --git a/ressources/kimai2/rootfs/DEBIAN/control b/ressources/kimai2/rootfs/DEBIAN/control index bc15529..02bf08b 100644 --- a/ressources/kimai2/rootfs/DEBIAN/control +++ b/ressources/kimai2/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: kimai2 Version: %VERSION% -Section: contrib +Section: base 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 a999af9..cb07262 100644 --- a/ressources/libretranslate/rootfs/DEBIAN/control +++ b/ressources/libretranslate/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: joplin-server Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: nodejs diff --git a/ressources/mailhog/rootfs/DEBIAN/control b/ressources/mailhog/rootfs/DEBIAN/control index d1c0f45..0d92373 100644 --- a/ressources/mailhog/rootfs/DEBIAN/control +++ b/ressources/mailhog/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: mailhog Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/mautrix-syncproxy/rootfs/DEBIAN/control b/ressources/mautrix-syncproxy/rootfs/DEBIAN/control index a09cbea..7afe3e0 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: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/mautrix-wsproxy/rootfs/DEBIAN/control b/ressources/mautrix-wsproxy/rootfs/DEBIAN/control index df542a8..8328896 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: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index cc5530b..a14c330 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.44.6 +VERSION=0.44.5 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION @@ -9,15 +9,13 @@ DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=10 PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" -main(){ - base_package_upgrade +STEP="base_package_upgrade envinit get_git_source build makedeb" + +envinit() { 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 40e53f5..ebef3ce 100644 --- a/ressources/metabase/rootfs/DEBIAN/control +++ b/ressources/metabase/rootfs/DEBIAN/control @@ -1,8 +1,7 @@ Package: metabase Version: %VERSION% -Section: contrib +Section: base Priority: optional -Depends: default-jre Architecture: all Maintainer: Thomas Legay Description: metabase diff --git a/ressources/minio/rootfs/DEBIAN/control b/ressources/minio/rootfs/DEBIAN/control index e496fcf..5f33862 100644 --- a/ressources/minio/rootfs/DEBIAN/control +++ b/ressources/minio/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: minio Version: %VERSION% -Section: contrib +Section: base 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 77229d8..def3489 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: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/phpbb/rootfs/DEBIAN/control b/ressources/phpbb/rootfs/DEBIAN/control index 33e730e..0405e1e 100644 --- a/ressources/phpbb/rootfs/DEBIAN/control +++ b/ressources/phpbb/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: phpbb Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/picapport/rootfs/DEBIAN/control b/ressources/picapport/rootfs/DEBIAN/control index 149e447..2b79d7a 100644 --- a/ressources/picapport/rootfs/DEBIAN/control +++ b/ressources/picapport/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: picapport Version: %VERSION% -Section: non-free +Section: base Priority: optional Architecture: all Depends: default-jre diff --git a/ressources/picapport/rootfs/usr/bin/picapport b/ressources/picapport/rootfs/usr/bin/picapport index e53294a..ea9e93c 100755 --- a/ressources/picapport/rootfs/usr/bin/picapport +++ b/ressources/picapport/rootfs/usr/bin/picapport @@ -1,4 +1,4 @@ #!/usr/bin/env bash source /etc/default/picapport -exec /usr/bin/java ${JAVA_ARGS} -jar /usr/lib/picapport/picapport-headless.jar ${PICAPPORT_CONF} +/usr/bin/java ${JAVA_ARGS} -jar /usr/lib/picapport/picapport-headless.jar ${PICAPPORT_CONF} diff --git a/ressources/roundcubemail/rootfs/DEBIAN/control b/ressources/roundcubemail/rootfs/DEBIAN/control index b240d3f..3a3bdca 100644 --- a/ressources/roundcubemail/rootfs/DEBIAN/control +++ b/ressources/roundcubemail/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: roundcubemail Version: %VERSION% -Section: contrib +Section: base 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 39be3eb..64263ab 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: contrib +Section: base 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 27709de..4a6b087 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: contrib +Section: base 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 02aa86d..ed5348a 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: contrib +Section: base 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 b7b626a..9e8d1bf 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: contrib +Section: base Priority: optional Architecture: all Maintainer: Thomas Legay diff --git a/ressources/vaultwarden/rootfs/DEBIAN/control b/ressources/vaultwarden/rootfs/DEBIAN/control index 24ff2bb..5e2919e 100644 --- a/ressources/vaultwarden/rootfs/DEBIAN/control +++ b/ressources/vaultwarden/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: vaultwarden Version: %VERSION% -Section: contrib +Section: base 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 c30e035..30bccf9 100644 --- a/ressources/wallabag/rootfs/DEBIAN/control +++ b/ressources/wallabag/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: wallabag Version: %VERSION% -Section: contrib +Section: base 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 3ccc53d..76f7731 100644 --- a/ressources/zigbee2mqtt/rootfs/DEBIAN/control +++ b/ressources/zigbee2mqtt/rootfs/DEBIAN/control @@ -1,6 +1,6 @@ Package: zigbee2mqtt Version: %VERSION% -Section: contrib +Section: base Priority: optional Architecture: all Depends: nodejs, npm