From 1ba5c25f9ab99189937fb14eb546b1170f0f0b60 Mon Sep 17 00:00:00 2001 From: thomas Date: Sat, 8 Oct 2022 03:58:00 +0200 Subject: [PATCH] update version --- ressources/adguardhome/debmaker | 12 ++++++++++-- ressources/authelia/debmaker | 11 +++++++++-- ressources/bitwarden-desktop/debmaker | 2 -- ressources/budibase/debmaker | 5 +++-- ressources/element-web/debmaker | 12 ++++++++++-- ressources/joplin-server/debmaker | 2 +- ressources/metabase/debmaker | 2 +- 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index 9bc95a6..07a17c1 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.16 +VERSION=0.108.0-b.18 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} @@ -9,7 +9,15 @@ DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 PACKAGE_DEPENDENCY="build-essential nodejs yarn" -STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency install_go get_git_source build makedeb" +main(){ + base_package_upgrade + configure_depot_yarn + configure_depot_nodejs + install_package_dependency + install_go + get_git_source build + makedeb +} build() { cd /tmp/${APP} diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index b00c61e..1e9dc00 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -7,12 +7,19 @@ GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=6 +PACKAGE_DEPENDENCY="build-essential nodejs" -STEP="base_package_upgrade envinit get_git_source build makedeb" +main(){ + base_package_upgrade + envinit + get_git_source + build + makedeb +} envinit() { configure_depot_nodejs - apt install -y --no-install-recommends build-essential nodejs + install_package_dependency install_go wget -qO - https://get.pnpm.io/install.sh | sh - } diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index bcd3f1d..ec66c99 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -27,8 +27,6 @@ build() { electron-builder --linux dir --x64 -p never } - - makedeb(){ PATH_DEB=/tmp/src/rootfs diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index 7d35179..1890a3e 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -25,8 +25,9 @@ envinit() { build() { cd /tmp/${APP} - yarn install - yarn dist + yarn + yarn bootstrap + yarn build } makedeb(){ diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index b6d508e..ac674b0 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -7,13 +7,20 @@ GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 +PACKAGE_DEPENDENCY="yarn nodejs" -STEP="base_package_upgrade envinit get_git_source build makedeb" +main(){ + base_package_upgrade + envinit + get_git_source + build + makedeb +} envinit() { configure_depot_yarn configure_depot_nodejs - apt install -y --no-install-recommends yarn nodejs + install_package_dependency } build() { @@ -27,6 +34,7 @@ makedeb(){ tar -zxf /tmp/${APP}/dist/element-${GIT_VERSION}.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/share/element-web/ cp /tmp/${APP}/config.sample.json ${PATH_DEB}/etc/element-web/config.json + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist } diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker index 6cf4c73..85c6a2b 100755 --- a/ressources/joplin-server/debmaker +++ b/ressources/joplin-server/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.7.4 +VERSION=2.9.1 APP=joplin-server GIT_VERSION=server-v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 853d2c5..20fce80 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -7,7 +7,7 @@ GIT_VERSION=v$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=10 -PACKAGE_DEPENDENCY="build-essential openjdk-17-jdk curl nodejs yarn" +PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" STEP="base_package_upgrade envinit get_git_source build makedeb"